update EMF patterns

Change-Id: I97e5ff9facd8fb87ae18c55f4e1b167c673df381
Signed-off-by: Thomas Guiu <thomas.guiu@soyatec.com>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore
index 91eace8..76aae18 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore
@@ -6,38 +6,38 @@
   <fcore:FactoryComponent xmi:id="_Pcm9sDG0Ed-kc8dEZsdm2w" name="EMF Model Pattern">

     <contractContainer xmi:id="_Prg8ZDG0Ed-kc8dEZsdm2w">

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_Prg8ZTG0Ed-kc8dEZsdm2w"

-          description="EMF Model Pattern" name="genModel" mandatory="true" invocationContracts="#_DU4rQ0LpEei0i9bcSdIGKw">

-        <type xmi:type="domain:TypeDomain" xmi:id="_DU55YULpEei0i9bcSdIGKw"/>

+          description="EMF Model Pattern" name="genModel" mandatory="true" invocationContracts="#_jKmYkCSWEemxeP6B0lLOpA">

+        <type xmi:type="domain:TypeDomain" xmi:id="_jLMOcCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_WRxYEFIIEd-eGOdO3WtsxA"

-          description="EMF Model Pattern" name="pattern.execution.reporter" invocationContracts="#_DU55YkLpEei0i9bcSdIGKw">

-        <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_DU6gckLpEei0i9bcSdIGKw"/>

+          description="EMF Model Pattern" name="pattern.execution.reporter" invocationContracts="#_jLo6YCSWEemxeP6B0lLOpA">

+        <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_jMFmUCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_TxwAHVkTEd-bv5aydwO2Qw"

-          description="EMF Model Pattern" name="pattern.ids" invocationContracts="#_DU7HgELpEei0i9bcSdIGKw">

-        <type xmi:type="pattern:TypePatternList" xmi:id="_DU7Hg0LpEei0i9bcSdIGKw"/>

+          description="EMF Model Pattern" name="pattern.ids" invocationContracts="#_jMYhQCSWEemxeP6B0lLOpA">

+        <type xmi:type="pattern:TypePatternList" xmi:id="_jM1NMCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_OVsagFHVEd-dr9AWwNwIMQ"

-          description="EMF Model Pattern" name="pattern.substitutions" invocationContracts="#_DU7HhELpEei0i9bcSdIGKw">

-        <type xmi:type="pattern:TypePatternSubstitution" xmi:id="_DU7HhkLpEei0i9bcSdIGKw"/>

+          description="EMF Model Pattern" name="pattern.substitutions" invocationContracts="#_jNR5ICSWEemxeP6B0lLOpA">

+        <type xmi:type="pattern:TypePatternSubstitution" xmi:id="_jNulECSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_RcQCMPI7Ed-Pp8S8RvVOuQ"

-          description="EMF Model Pattern" name="usedGenPackages" invocationContracts="#_DU7Hh0LpEei0i9bcSdIGKw">

-        <type xmi:type="domain:TypeGenPackages" xmi:id="_DU7HiULpEei0i9bcSdIGKw"/>

+          description="EMF Model Pattern" name="usedGenPackages" invocationContracts="#_jOLRACSWEemxeP6B0lLOpA">

+        <type xmi:type="domain:TypeGenPackages" xmi:id="_jOeL8CSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_sluXsVLLEd-ZSLMRjxSbVQ"

-          description="EMF Model Pattern" name="mergeRulesURI" invocationContracts="#_DU7HikLpEei0i9bcSdIGKw">

-        <type xmi:type="types:TypeURI" xmi:id="_DU7HjELpEei0i9bcSdIGKw"/>

+          description="EMF Model Pattern" name="mergeRulesURI" invocationContracts="#_jO634CSWEemxeP6B0lLOpA">

+        <type xmi:type="types:TypeURI" xmi:id="_jPXj0CSWEemxeP6B0lLOpA"/>

       </contracts>

     </contractContainer>

     <viewpointContainer xmi:id="_Pcm9sTG0Ed-kc8dEZsdm2w">

       <viewpoints xmi:type="pattern:PatternViewpoint" xmi:id="_Pcm9sjG0Ed-kc8dEZsdm2w">

         <libraries xmi:id="_Pcm9szG0Ed-kc8dEZsdm2w" name="org.eclipse.egf.emf.pattern.model">

-          <elements xmi:id="_Pcm9tDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/build.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

+          <elements xmi:id="_Pcm9tDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/build.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

               name="BuildProperties" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#_Pcm9tjG0Ed-kc8dEZsdm2w" conditionMethod="#_8vBvNHLYEd-09ds9dfYpFw"

               initMethod="#_Pcm9tzG0Ed-kc8dEZsdm2w" footerMethod="#_Pcm9uTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CsICIULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_R_APQCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_Pcm9tjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Pcm9tDG0Ed-kc8dEZsdm2w/method._Pcm9tjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_Pcm9tzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Pcm9tDG0Ed-kc8dEZsdm2w/method._Pcm9tzG0Ed-kc8dEZsdm2w.pt"/>

@@ -48,20 +48,20 @@
             <methods xmi:id="_Sq2-OGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._Pcm9tDG0Ed-kc8dEZsdm2w/method._Sq2-OGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_06ILSWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Pcm9tDG0Ed-kc8dEZsdm2w/method._06ILSWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PcwusjG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Pcm9tDG0Ed-kc8dEZsdm2w/method._PcwusjG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CsICJ0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CsIpM0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_SBY04CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SCSMwCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CsIpNULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SC4CoCSWEemxeP6B0lLOpA"

                 called="#_PcwusjG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CsIpNkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CsIpN0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_SDLkoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SDUukCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PdDpoDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/manifest.mfjet&quot;&#xA;"

+          <elements xmi:id="_PdDpoDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/manifest.mfjet&quot;&#xA;"

               name="ManifestMF" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#_PdDpojG0Ed-kc8dEZsdm2w" conditionMethod="#_8qZt5HLYEd-09ds9dfYpFw"

               initMethod="#_PdDpozG0Ed-kc8dEZsdm2w" footerMethod="#_PdDppTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_Crl2oULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_SI_RsCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PdDpojG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PdDpoDG0Ed-kc8dEZsdm2w/method._PdDpojG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PdDpozG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PdDpoDG0Ed-kc8dEZsdm2w/method._PdDpozG0Ed-kc8dEZsdm2w.pt"/>

@@ -72,20 +72,20 @@
             <methods xmi:id="_SrAvOGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PdDpoDG0Ed-kc8dEZsdm2w/method._SrAvOGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_05rfVmKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PdDpoDG0Ed-kc8dEZsdm2w/method._05rfVmKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PdDpqTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PdDpoDG0Ed-kc8dEZsdm2w/method._PdDpqTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CrmdskLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CrmdtkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_SLhoUCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SMaZICSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CrmduELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SM3FECSWEemxeP6B0lLOpA"

                 called="#_PdDpqTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CrmduULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CrmdukLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_SNdiACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SNmr8CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PdNaoDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/plugin.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

+          <elements xmi:id="_PdNaoDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/plugin.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

               name="PluginXML" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#_PdNaojG0Ed-kc8dEZsdm2w" conditionMethod="#_8mrriXLYEd-09ds9dfYpFw"

               initMethod="#_PdNaozG0Ed-kc8dEZsdm2w" footerMethod="#_PdXLoTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_Cr3jcULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_SEOGcCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PdNaojG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PdNaoDG0Ed-kc8dEZsdm2w/method._PdNaojG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PdNaozG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PdNaoDG0Ed-kc8dEZsdm2w/method._PdNaozG0Ed-kc8dEZsdm2w.pt"/>

@@ -96,20 +96,20 @@
             <methods xmi:id="_SqaSS2KPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PdNaoDG0Ed-kc8dEZsdm2w/method._SqaSS2KPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_06R8SWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PdNaoDG0Ed-kc8dEZsdm2w/method._06R8SWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PdXLpTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PdNaoDG0Ed-kc8dEZsdm2w/method._PdXLpTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Cr3jd0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cr4Kg0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_SGmsECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SHgD8CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cr4KhULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SIF50CSWEemxeP6B0lLOpA"

                 called="#_PdXLpTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_Cr4KhkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cr4Kh0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_SIPq0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SIilwCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PdgVkDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/plugin.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

+          <elements xmi:id="_PdgVkDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/plugin.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

               name="PluginProperties" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_xxtwkCg7Ed-ROrlGa8LEeQ"

               headerMethod="#_PdgVkjG0Ed-kc8dEZsdm2w" conditionMethod="#_8zCshHLYEd-09ds9dfYpFw"

               initMethod="#_PdgVkzG0Ed-kc8dEZsdm2w" footerMethod="#_PdgVlTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CsX5wULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_STt7ACSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PdgVkjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PdgVkDG0Ed-kc8dEZsdm2w/method._PdgVkjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PdgVkzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PdgVkDG0Ed-kc8dEZsdm2w/method._PdgVkzG0Ed-kc8dEZsdm2w.pt"/>

@@ -120,20 +120,20 @@
             <methods xmi:id="_SrTqKGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PdgVkDG0Ed-kc8dEZsdm2w/method._SrTqKGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_06k3OWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PdgVkDG0Ed-kc8dEZsdm2w/method._06k3OWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PdgVmTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PdgVkDG0Ed-kc8dEZsdm2w/method._PdgVmTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CsX5x0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CsYg00LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_SV8voCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SW_4gCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_pQ16sChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CsYg1ULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SXckcCSWEemxeP6B0lLOpA"

                 called="#_PdgVmTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CsYg1kLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CsYg10LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_SXvfYCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SX4pUCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PdzQgDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/PackageClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PdzQgDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/PackageClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="PackageClass" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PdzQgjG0Ed-kc8dEZsdm2w" conditionMethod="#_89Lf9HLYEd-09ds9dfYpFw"

               initMethod="#_PdzQgzG0Ed-kc8dEZsdm2w" footerMethod="#_PdzQhTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CvFPgULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_SyjzICSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PdzQgjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PdzQgDG0Ed-kc8dEZsdm2w/method._PdzQgjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PdzQgzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PdzQgDG0Ed-kc8dEZsdm2w/method._PdzQgzG0Ed-kc8dEZsdm2w.pt"/>

@@ -144,20 +144,20 @@
             <methods xmi:id="_StPj2GKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PdzQgDG0Ed-kc8dEZsdm2w/method._StPj2GKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_09HN2WKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PdzQgDG0Ed-kc8dEZsdm2w/method._09HN2WKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PdzQiTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PdzQgDG0Ed-kc8dEZsdm2w/method._PdzQiTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CvFPh0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CvF2kkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_S0pd0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_S1ZEsCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CvF2lELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_S11woCSWEemxeP6B0lLOpA"

                 called="#_PdzQiTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CvF2lULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CvF2lkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_S1_hoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_S2SckCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PeP8cDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/XMLProcessorClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PeP8cDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/XMLProcessorClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="XMLProcessorClass" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PeP8cjG0Ed-kc8dEZsdm2w" conditionMethod="#_9hr7NHLYEd-09ds9dfYpFw"

               initMethod="#_PeP8czG0Ed-kc8dEZsdm2w" footerMethod="#_PeP8dTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CvVuMULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_TMMbICSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PeP8cjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PeP8cDG0Ed-kc8dEZsdm2w/method._PeP8cjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PeP8czG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PeP8cDG0Ed-kc8dEZsdm2w/method._PeP8czG0Ed-kc8dEZsdm2w.pt"/>

@@ -168,20 +168,20 @@
             <methods xmi:id="_SspG4mKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PeP8cDG0Ed-kc8dEZsdm2w/method._SspG4mKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_0767AmKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PeP8cDG0Ed-kc8dEZsdm2w/method._0767AmKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PeP8eTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PeP8cDG0Ed-kc8dEZsdm2w/method._PeP8eTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CvWVQkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CvWVRkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_TOIU0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TPBssCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CvWVSELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TPUnoCSWEemxeP6B0lLOpA"

                 called="#_PeP8eTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CvWVSULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CvWVSkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_TPnikCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TPxTkCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PejecDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Plugin.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PejecDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Plugin.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="Plugin" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_F0In8Cg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PejecjG0Ed-kc8dEZsdm2w" conditionMethod="#_9fJklHLYEd-09ds9dfYpFw"

               initMethod="#_PejeczG0Ed-kc8dEZsdm2w" footerMethod="#_PejedTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_Cs76cULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_TDsmcCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PejecjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PejecDG0Ed-kc8dEZsdm2w/method._PejecjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PejeczG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PejecDG0Ed-kc8dEZsdm2w/method._PejeczG0Ed-kc8dEZsdm2w.pt"/>

@@ -192,20 +192,20 @@
             <methods xmi:id="_SsWL8WKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PejecDG0Ed-kc8dEZsdm2w/method._SsWL8WKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_07nZCWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PejecDG0Ed-kc8dEZsdm2w/method._07nZCWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PejeeTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PejecDG0Ed-kc8dEZsdm2w/method._PejeeTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Cs8hgULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cs8hhULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_TFpHMCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TGh4ACSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_cjQNwChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cs8hh0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TG1aACSWEemxeP6B0lLOpA"

                 called="#_PejeeTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_Cs8hiELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cs8hiULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_THIU8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_THRe4CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PesoYDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/ResourceFactoryClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.model.call.ResourceFactoryClass.ResourceFactoryClass.createResource.override&#xA;"

+          <elements xmi:id="_PesoYDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/ResourceFactoryClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.model.call.ResourceFactoryClass.ResourceFactoryClass.createResource.override&#xA;"

               name="ResourceFactoryClass" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PesoYjG0Ed-kc8dEZsdm2w" conditionMethod="#_9AAxhHLYEd-09ds9dfYpFw"

               initMethod="#_PesoYzG0Ed-kc8dEZsdm2w" footerMethod="#_PesoZTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CwI_cELpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Sk2uUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PesoYjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PesoYDG0Ed-kc8dEZsdm2w/method._PesoYjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PesoYzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PesoYDG0Ed-kc8dEZsdm2w/method._PesoYzG0Ed-kc8dEZsdm2w.pt"/>

@@ -216,20 +216,20 @@
             <methods xmi:id="_StFy12KPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PesoYDG0Ed-kc8dEZsdm2w/method._StFy12KPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_063yImKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PesoYDG0Ed-kc8dEZsdm2w/method._063yImKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PesoaTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PesoYDG0Ed-kc8dEZsdm2w/method._PesoaTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CwI_dkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CwI_ekLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Sm8ZACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Snr_4CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CwI_fELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SoIr0CSWEemxeP6B0lLOpA"

                 called="#_PesoaTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CwI_fULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CwI_fkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_SoR1wCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SobmwCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_Pe_jUDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.interface.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.declaredFieldGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.reflectiveDelegation.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeatureReified.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.eUnset.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.eIsSet.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.insert&#xA;"

+          <elements xmi:id="_Pe_jUDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.interface.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.declaredFieldGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.egfCustom.constructor.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.dynamicDelegation&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.reflectiveDelegation.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeatureReified.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.eUnset.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.eIsSet.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.insert&#xA;"

               name="Class" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_hYG6UCg6Ed-ROrlGa8LEeQ"

               headerMethod="#_Pe_jUjG0Ed-kc8dEZsdm2w" conditionMethod="#_9DSvBHLYEd-09ds9dfYpFw"

               initMethod="#_Pe_jUzG0Ed-kc8dEZsdm2w" footerMethod="#_Pe_jVTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_Ct_qYULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_SpLNoCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_Pe_jUjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Pe_jUDG0Ed-kc8dEZsdm2w/method._Pe_jUjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_Pe_jUzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Pe_jUDG0Ed-kc8dEZsdm2w/method._Pe_jUzG0Ed-kc8dEZsdm2w.pt"/>

@@ -240,20 +240,20 @@
             <methods xmi:id="_Sr5gCGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._Pe_jUDG0Ed-kc8dEZsdm2w/method._Sr5gCGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_08EE9mKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Pe_jUDG0Ed-kc8dEZsdm2w/method._08EE9mKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_Pe_jWTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Pe_jUDG0Ed-kc8dEZsdm2w/method._Pe_jWTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CuARcULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CuARdULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_SraCQCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SsKQMCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_Chxo4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CuARd0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SsmVECSWEemxeP6B0lLOpA"

                 called="#_Pe_jWTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CuAReELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CuAReULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_SswGECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_StDBACSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PfcPQDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/FactoryClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PfcPQDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/FactoryClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="FactoryClass" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PfcPQjG0Ed-kc8dEZsdm2w" conditionMethod="#_9cLJFHLYEd-09ds9dfYpFw"

               initMethod="#_PfcPQzG0Ed-kc8dEZsdm2w" footerMethod="#_PfcPRTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_Cso_gULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Stpd8CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PfcPQjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PfcPQDG0Ed-kc8dEZsdm2w/method._PfcPQjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PfcPQzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PfcPQDG0Ed-kc8dEZsdm2w/method._PfcPQzG0Ed-kc8dEZsdm2w.pt"/>

@@ -264,20 +264,20 @@
             <methods xmi:id="_StZU2GKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PfcPQDG0Ed-kc8dEZsdm2w/method._StZU2GKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_07LUKWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PfcPQDG0Ed-kc8dEZsdm2w/method._07LUKWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PfmAQTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PfcPQDG0Ed-kc8dEZsdm2w/method._PfmAQTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CspmkkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CspmlkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Sv4SkCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SxElYCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CspmmELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SxhRUCSWEemxeP6B0lLOpA"

                 called="#_PfmAQTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CspmmULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CspmmkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_SxrCUCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Sx99QCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_Pf47MDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/EnumClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_Pf47MDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/EnumClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="EnumClass" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_txlYcCg6Ed-ROrlGa8LEeQ"

               headerMethod="#_Pf47MjG0Ed-kc8dEZsdm2w" conditionMethod="#_9QQM9HLYEd-09ds9dfYpFw"

               initMethod="#_Pf47MzG0Ed-kc8dEZsdm2w" footerMethod="#_Pf47NTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_Cu0w0ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_SdQRgCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_Pf47MjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Pf47MDG0Ed-kc8dEZsdm2w/method._Pf47MjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_Pf47MzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Pf47MDG0Ed-kc8dEZsdm2w/method._Pf47MzG0Ed-kc8dEZsdm2w.pt"/>

@@ -288,20 +288,20 @@
             <methods xmi:id="_SrwWGGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._Pf47MDG0Ed-kc8dEZsdm2w/method._SrwWGGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_07UeGWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Pf47MDG0Ed-kc8dEZsdm2w/method._07UeGWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_Pf47OTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Pf47MDG0Ed-kc8dEZsdm2w/method._Pf47OTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Cu0w10LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cu1X4kLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_SieIsCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SjXgkCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_Chxo4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cu1X5ELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Sj0MgCSWEemxeP6B0lLOpA"

                 called="#_Pf47OTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_Cu1X5ULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cu1X5kLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_Sj9WcCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SkHHcCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PgCsMDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/PackageClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PgCsMDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/PackageClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="PackageInterface" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PgCsMjG0Ed-kc8dEZsdm2w" conditionMethod="#_9S7thHLYEd-09ds9dfYpFw"

               initMethod="#_PgCsMzG0Ed-kc8dEZsdm2w" footerMethod="#_PgCsNTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_Ctde4ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_S_rCECSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PgCsMjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PgCsMDG0Ed-kc8dEZsdm2w/method._PgCsMjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PgCsMzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PgCsMDG0Ed-kc8dEZsdm2w/method._PgCsMzG0Ed-kc8dEZsdm2w.pt"/>

@@ -312,20 +312,20 @@
             <methods xmi:id="_Ssf88WKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PgCsMDG0Ed-kc8dEZsdm2w/method._Ssf88WKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_08zr2WKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PgCsMDG0Ed-kc8dEZsdm2w/method._08zr2WKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PgL2IjG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PgCsMDG0Ed-kc8dEZsdm2w/method._PgL2IjG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CteF8ULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CteF9ULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_TBni0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TCXJsCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CteF90LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TCz1oCSWEemxeP6B0lLOpA"

                 called="#_PgL2IjG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CteF-ELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CteF-ULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_TC8_kCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TDGwkCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PgVnIDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/FactoryClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PgVnIDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/FactoryClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="FactoryInterface" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PgVnIjG0Ed-kc8dEZsdm2w" conditionMethod="#_9HAxZHLYEd-09ds9dfYpFw"

               initMethod="#_PgVnIzG0Ed-kc8dEZsdm2w" footerMethod="#_PgVnJTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CtukoULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_S2vIgCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PgVnIjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PgVnIDG0Ed-kc8dEZsdm2w/method._PgVnIjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PgVnIzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PgVnIDG0Ed-kc8dEZsdm2w/method._PgVnIzG0Ed-kc8dEZsdm2w.pt"/>

@@ -336,20 +336,20 @@
             <methods xmi:id="_StsPyGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PgVnIDG0Ed-kc8dEZsdm2w/method._StsPyGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_08N1-WKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PgVnIDG0Ed-kc8dEZsdm2w/method._08N1-WKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PgVnKTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PgVnIDG0Ed-kc8dEZsdm2w/method._PgVnKTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CtvLtULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CtvLuULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_S499ICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_S53VACSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CtvLu0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_S6UA8CSWEemxeP6B0lLOpA"

                 called="#_PgVnKTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CtvLvELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CtvLvULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_S6dx8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_S6m74CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PgoiEDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/ResourceClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PgoiEDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/ResourceClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="ResourceClass" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PgoiEjG0Ed-kc8dEZsdm2w" conditionMethod="#_85wYhHLYEd-09ds9dfYpFw"

               initMethod="#_PgoiEzG0Ed-kc8dEZsdm2w" footerMethod="#_PgoiFTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_Cv35sULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_TUie0CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PgoiEjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PgoiEDG0Ed-kc8dEZsdm2w/method._PgoiEjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PgoiEzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PgoiEDG0Ed-kc8dEZsdm2w/method._PgoiEzG0Ed-kc8dEZsdm2w.pt"/>

@@ -360,20 +360,20 @@
             <methods xmi:id="_SsDRCGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PgoiEDG0Ed-kc8dEZsdm2w/method._SsDRCGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_08qh6WKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PgoiEDG0Ed-kc8dEZsdm2w/method._08qh6WKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PgoiGTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PgoiEDG0Ed-kc8dEZsdm2w/method._PgoiGTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Cv35t0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cv4gw0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_TWeYgCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TXXwYCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cv4gxULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TX0cUCSWEemxeP6B0lLOpA"

                 called="#_PgoiGTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_Cv4gxkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cv4gx0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_TZAvICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TZJ5ECSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_Pg8EEDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.interface.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.declaredFieldGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.reflectiveDelegation.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeatureReified.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.eUnset.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.eIsSet.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.insert&#xA;"

+          <elements xmi:id="_Pg8EEDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.interface.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.declaredFieldGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.egfCustom.constructor.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.dynamicDelegation&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.reflectiveDelegation.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeatureReified.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.eUnset.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.eIsSet.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.insert&#xA;"

               name="Interface" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_hYG6UCg6Ed-ROrlGa8LEeQ"

               headerMethod="#_Pg8EEjG0Ed-kc8dEZsdm2w" conditionMethod="#_9Kva1HLYEd-09ds9dfYpFw"

               initMethod="#_Pg8EEzG0Ed-kc8dEZsdm2w" footerMethod="#_Pg8EFTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CvmM4ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_S7gTwCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_Pg8EEjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Pg8EEDG0Ed-kc8dEZsdm2w/method._Pg8EEjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_Pg8EEzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Pg8EEDG0Ed-kc8dEZsdm2w/method._Pg8EEzG0Ed-kc8dEZsdm2w.pt"/>

@@ -384,20 +384,20 @@
             <methods xmi:id="_SrmlGGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._Pg8EEDG0Ed-kc8dEZsdm2w/method._SrmlGGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_08Xm-WKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Pg8EEDG0Ed-kc8dEZsdm2w/method._08Xm-WKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_Pg8EGTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Pg8EEDG0Ed-kc8dEZsdm2w/method._Pg8EGTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CvmM50LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CvmM60LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_S9l-cCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_S-VlUCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_Chxo4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cvmz8ELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_S-yRQCSWEemxeP6B0lLOpA"

                 called="#_Pg8EGTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_Cvmz8ULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cvmz8kLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_S-7bMCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_S_O9MCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PhO_ADG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/AdapterFactoryClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PhO_ADG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/AdapterFactoryClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="AdapterFactoryClass" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PhO_AjG0Ed-kc8dEZsdm2w" conditionMethod="#_9Wzg5HLYEd-09ds9dfYpFw"

               initMethod="#_PhO_AzG0Ed-kc8dEZsdm2w" footerMethod="#_PhO_BTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CujrEULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_TIK2wCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PhO_AjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PhO_ADG0Ed-kc8dEZsdm2w/method._PhO_AjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PhO_AzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PhO_ADG0Ed-kc8dEZsdm2w/method._PhO_AzG0Ed-kc8dEZsdm2w.pt"/>

@@ -408,20 +408,20 @@
             <methods xmi:id="_Ssy372KPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PhO_ADG0Ed-kc8dEZsdm2w/method._Ssy372KPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_089c2WKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PhO_ADG0Ed-kc8dEZsdm2w/method._089c2WKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PhO_CTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PhO_ADG0Ed-kc8dEZsdm2w/method._PhO_CTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CukSI0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CukSJ0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_TKGwcCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TK2XUCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CukSKULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TLTDQCSWEemxeP6B0lLOpA"

                 called="#_PhO_CTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CukSKkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CukSK0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_TLc0QCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TLmlQCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_Phh58DG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/SwitchClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_Phh58DG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/SwitchClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="SwitchClass" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_Phh58jG0Ed-kc8dEZsdm2w" conditionMethod="#_82LgFHLYEd-09ds9dfYpFw"

               initMethod="#_Phh58zG0Ed-kc8dEZsdm2w" footerMethod="#_Phh59TG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CuUagELpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_TQXwgCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_Phh58jG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Phh58DG0Ed-kc8dEZsdm2w/method._Phh58jG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_Phh58zG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Phh58DG0Ed-kc8dEZsdm2w/method._Phh58zG0Ed-kc8dEZsdm2w.pt"/>

@@ -432,20 +432,20 @@
             <methods xmi:id="_StieyGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._Phh58DG0Ed-kc8dEZsdm2w/method._StieyGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_07BjKWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Phh58DG0Ed-kc8dEZsdm2w/method._07BjKWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_Phh5-TG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Phh58DG0Ed-kc8dEZsdm2w/method._Phh5-TG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CuUahkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CuUaikLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_TSc0ICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TTMbACSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CuUajELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TTpG8CSWEemxeP6B0lLOpA"

                 called="#_Phh5-TG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CuUajULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CuUajkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_TTy38CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TT8o8CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_Ph004DG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/ValidatorClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.model.call.ValidatorClass.ValidatorClass.insert&#xA;"

+          <elements xmi:id="_Ph004DG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/ValidatorClass.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.model.call.ValidatorClass.ValidatorClass.insert&#xA;"

               name="ValidatorClass" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_Ph004jG0Ed-kc8dEZsdm2w" conditionMethod="#_9Nt2VHLYEd-09ds9dfYpFw"

               initMethod="#_Ph004zG0Ed-kc8dEZsdm2w" footerMethod="#_Ph005TG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CtLyEULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_SYfGQCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_Ph004jG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Ph004DG0Ed-kc8dEZsdm2w/method._Ph004jG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_Ph004zG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Ph004DG0Ed-kc8dEZsdm2w/method._Ph004zG0Ed-kc8dEZsdm2w.pt"/>

@@ -456,20 +456,20 @@
             <methods xmi:id="_SspG8mKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._Ph004DG0Ed-kc8dEZsdm2w/method._SspG8mKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_07ePGWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Ph004DG0Ed-kc8dEZsdm2w/method._07ePGWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_Ph006TG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Ph004DG0Ed-kc8dEZsdm2w/method._Ph006TG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CtMZJELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CtNAMELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Sat64CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SbxDwCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CtNAMkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_ScNvsCSWEemxeP6B0lLOpA"

                 called="#_Ph006TG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CtNAM0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CtNANELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_ScgqoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_ScqboCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_QIGxoH7rEd-W9_ZFSEQEPg" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/module.gwt.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

+          <elements xmi:id="_QIGxoH7rEd-W9_ZFSEQEPg" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/module.gwt.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

               name="ModuleGWTXML" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#_QIGxon7rEd-W9_ZFSEQEPg" conditionMethod="#_QIGxpH7rEd-W9_ZFSEQEPg"

               initMethod="#_QIGxo37rEd-W9_ZFSEQEPg" footerMethod="#_QIGxpn7rEd-W9_ZFSEQEPg">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CrJxwULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_SOWS0CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_QIGxon7rEd-W9_ZFSEQEPg" name="header" patternFilePath="templates/pattern._QIGxoH7rEd-W9_ZFSEQEPg/method._QIGxon7rEd-W9_ZFSEQEPg.pt"/>

             <methods xmi:id="_QIGxo37rEd-W9_ZFSEQEPg" name="init" patternFilePath="templates/pattern._QIGxoH7rEd-W9_ZFSEQEPg/method._QIGxo37rEd-W9_ZFSEQEPg.pt"/>

@@ -480,3628 +480,4058 @@
             <methods xmi:id="_QIGxqX7rEd-W9_ZFSEQEPg" name="setArgument" patternFilePath="templates/pattern._QIGxoH7rEd-W9_ZFSEQEPg/method._QIGxqX7rEd-W9_ZFSEQEPg.pt"/>

             <methods xmi:id="_QIGxqn7rEd-W9_ZFSEQEPg" name="ensureProjectExists" patternFilePath="templates/pattern._QIGxoH7rEd-W9_ZFSEQEPg/method._QIGxqn7rEd-W9_ZFSEQEPg.pt"/>

             <methods xmi:id="_QIGxrH7rEd-W9_ZFSEQEPg" name="doGenerate" patternFilePath="templates/pattern._QIGxoH7rEd-W9_ZFSEQEPg/method._QIGxrH7rEd-W9_ZFSEQEPg.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CrKY1ELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CrK_40LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_SRCacCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SSE8QCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CrK_5ULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SShoMCSWEemxeP6B0lLOpA"

                 called="#_QIGxrH7rEd-W9_ZFSEQEPg"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CrK_5kLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CrK_50LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_SS0jICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_SS-UICSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

         </libraries>

         <libraries xmi:id="_0uqqgGJ-Ed-FqczH3ESmRw" name="org.eclipse.egf.emf.pattern.model.call.ResourceFactoryClass">

-          <elements xmi:id="_0uqqgWJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/ResourceFactoryClass.javajet&quot;&#xA;"

+          <elements xmi:id="_0uqqgWJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/ResourceFactoryClass.javajet&quot;&#xA;"

               name="ResourceFactoryClass.createResource.override" headerMethod="#_0uqqg2J-Ed-FqczH3ESmRw"

               conditionMethod="#_--X7pXLYEd-09ds9dfYpFw" initMethod="#_0uqqhGJ-Ed-FqczH3ESmRw"

               footerMethod="#_0uqqhmJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DO9CYkLpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_V6i3wCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0uqqg2J-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0uqqgWJ-Ed-FqczH3ESmRw/method._0uqqg2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0uqqhGJ-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0uqqgWJ-Ed-FqczH3ESmRw/method._0uqqhGJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_--X7pXLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0uqqgWJ-Ed-FqczH3ESmRw/method._--X7pXLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0uqqhmJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0uqqgWJ-Ed-FqczH3ESmRw/method._0uqqhmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0uqqimJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0uqqgWJ-Ed-FqczH3ESmRw/method._0uqqimJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DO9pdELpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DO9pdULpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DO9pdkLpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DO9pc0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DO9peELpEei0i9bcSdIGKw"

+            <parameters xmi:id="_V8oicCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_V8xsYCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_V87dYCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_V8VAcCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_V9YJUCSWEemxeP6B0lLOpA"

                 called="#_0uqqimJ-Ed-FqczH3ESmRw"/>

           </elements>

         </libraries>

         <libraries xmi:id="_0jpGTWJ-Ed-FqczH3ESmRw" name="org.eclipse.egf.emf.pattern.model.call.Class">

-          <elements xmi:id="_0jpGTmJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.declaredFieldGenFeature.insert&#xA;"

+          <elements xmi:id="_0jpGTmJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.declaredFieldGenFeature.insert&#xA;"

               name="Class.declaredFieldGenFeature.override" headerMethod="#_0jpGUGJ-Ed-FqczH3ESmRw"

               conditionMethod="#__Dly1XLYEd-09ds9dfYpFw" initMethod="#_0jpGUWJ-Ed-FqczH3ESmRw"

               footerMethod="#_0jpGU2J-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C6GzwULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_WDoiUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0jpGUGJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0jpGTmJ-Ed-FqczH3ESmRw/method._0jpGUGJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0jpGUWJ-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0jpGTmJ-Ed-FqczH3ESmRw/method._0jpGUWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__Dly1XLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0jpGTmJ-Ed-FqczH3ESmRw/method.__Dly1XLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0jpGU2J-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0jpGTmJ-Ed-FqczH3ESmRw/method._0jpGU2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0jpGYGJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0jpGTmJ-Ed-FqczH3ESmRw/method._0jpGYGJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C6Ha00LpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C6Ha1ELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C6Ha1ULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C6Ha1kLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C6Ha10LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6Ha2ELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6Ha2ULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6Ha2kLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6Ha20LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_WF3W8CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_WGBH8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_WGK48CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_WGdz4CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_WGnk4CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WGwu0CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WHDpwCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WHNawCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_WHXLwCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WHgVsCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6Ha3ELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C6Ha3ULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_WHz3sCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_WH9BoCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6Ha3kLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_WIP8kCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6Ha30LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_WIZtkCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6Ha4ELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_WIjekCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C6Ha0kLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C6Ha4kLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_WFkcACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_WJAKgCSWEemxeP6B0lLOpA"

                 called="#_0jpGYGJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0jyQMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0jyQMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.declaredFieldGenFeature.insert" headerMethod="#_0jyQMmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__Fq2dHLYEd-09ds9dfYpFw" initMethod="#_0jyQM2J-Ed-FqczH3ESmRw"

               footerMethod="#_0jyQNWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C6a80ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_WJcPYCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0jyQMmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0jyQMGJ-Ed-FqczH3ESmRw/method._0jyQMmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0jyQM2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0jyQMGJ-Ed-FqczH3ESmRw/method._0jyQM2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__Fq2dHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0jyQMGJ-Ed-FqczH3ESmRw/method.__Fq2dHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0jyQNWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0jyQMGJ-Ed-FqczH3ESmRw/method._0jyQNWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0jyQQmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0jyQMGJ-Ed-FqczH3ESmRw/method._0jyQQmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C6a82ELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C6a82ULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C6a82kLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C6a820LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C6a83ELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6a83ULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6a83kLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6a830LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6a84ELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_WLh6ECSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_WLrrECSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_WL-mACSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_WMIXACSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_WMRg8CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WMlC8CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WMuM4CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WM394CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_WNK40CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WNUp0CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6a84ULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C6a84kLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_WNdzwCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_WNxVwCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6a840LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_WN6fsCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6a85ELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_WOEQsCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6a85ULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_WONaoCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C6a810LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C6a850LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_WLYwICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_WOqGkCSWEemxeP6B0lLOpA"

                 called="#_0jyQQmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0kFyMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0kFyMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.reflectiveDelegation.override" headerMethod="#_0kFyMmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__IDcFHLYEd-09ds9dfYpFw" initMethod="#_0kFyM2J-Ed-FqczH3ESmRw"

               footerMethod="#_0kFyNWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C6l78ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_WaSHwCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0kFyMmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0kFyMGJ-Ed-FqczH3ESmRw/method._0kFyMmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0kFyM2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0kFyMGJ-Ed-FqczH3ESmRw/method._0kFyM2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__IDcFHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0kFyMGJ-Ed-FqczH3ESmRw/method.__IDcFHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0kFyNWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0kFyMGJ-Ed-FqczH3ESmRw/method._0kFyNWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0kFyQWJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0kFyMGJ-Ed-FqczH3ESmRw/method._0kFyQWJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C6mjBULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C6mjBkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C6mjB0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C6mjCELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6mjCULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6mjCkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6mjC0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6mjDELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_WchjcCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_WcqtYCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_Wc9oUCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_WdHZUCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WdaUQCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WeddICSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WewYECSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_We6JECSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WfNEACSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6mjDULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C6mjDkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_WfWN8CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_Wfpv8CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6mjD0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_Wfy54CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6mjEELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_Wf8q4CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6mjEULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_WgPl0CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C6mjBELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C6mjE0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_WcXycCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_WgigwCSWEemxeP6B0lLOpA"

                 called="#_0kFyQWJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0kO8IGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeature.insert&#xA;"

+          <elements xmi:id="_0kO8IGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeature.insert&#xA;"

               name="Class.genFeature.override" headerMethod="#_0kO8ImJ-Ed-FqczH3ESmRw"

               conditionMethod="#__LCepHLYEd-09ds9dfYpFw" initMethod="#_0kO8I2J-Ed-FqczH3ESmRw"

               footerMethod="#_0kO8JWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C7tWQULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_W95yMCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0kO8ImJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0kO8IGJ-Ed-FqczH3ESmRw/method._0kO8ImJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0kO8I2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0kO8IGJ-Ed-FqczH3ESmRw/method._0kO8I2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__LCepHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0kO8IGJ-Ed-FqczH3ESmRw/method.__LCepHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0kO8JWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0kO8IGJ-Ed-FqczH3ESmRw/method._0kO8JWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0kO8MmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0kO8IGJ-Ed-FqczH3ESmRw/method._0kO8MmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C7tWSELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C7tWSULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C7tWSkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C7tWS0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C7tWTELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7tWTULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7tWTkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7tWT0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7tWUELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_W_-10CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_XASX0CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_XAbhwCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_XAlSwCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_XA4NsCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XBB-sCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XBLIoCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XBU5oCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_XBn0kCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XBxlkCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7tWUULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C7tWUkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_XB7WkCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_XCORgCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7tWU0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_XCXbcCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7tWVELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_XChMcCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7tWVULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_XCq9cCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C7tWR0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C7tWV0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_W_1r4CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_XDHpYCSWEemxeP6B0lLOpA"

                 called="#_0kO8MmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0kh3EGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0kh3EGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.TODO.override&#xA;"

               name="Class.getGenFeature.override" headerMethod="#_0kh3EmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__MrdZHLYEd-09ds9dfYpFw" initMethod="#_0kh3E2J-Ed-FqczH3ESmRw"

               footerMethod="#_0kh3FWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C74VYULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_XDjuQCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0kh3EmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0kh3EGJ-Ed-FqczH3ESmRw/method._0kh3EmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0kh3E2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0kh3EGJ-Ed-FqczH3ESmRw/method._0kh3E2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__MrdZHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0kh3EGJ-Ed-FqczH3ESmRw/method.__MrdZHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0kh3FWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0kh3EGJ-Ed-FqczH3ESmRw/method._0kh3FWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0kh3ImJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0kh3EGJ-Ed-FqczH3ESmRw/method._0kh3ImJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C74VaELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C74VaULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C74VakLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C74Va0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C74VbELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C74VbULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C74VbkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C74Vb0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C74VcELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_XFpY8CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_XF8T4CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_XGGE4CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_XGP14CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_XGY_0CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XGsh0CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XG1rwCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XG_cwCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_XHSXsCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XSwn4CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C74VcULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C74VckLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_XTDi0CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_XTNT0CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C74Vc0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_XTXE0CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C74VdELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_XTp_wCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C74VdULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_XTzwwCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C74VZ0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C748cELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_XFgPACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_XUGrsCSWEemxeP6B0lLOpA"

                 called="#_0kh3ImJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0kroEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.javadoc.insert&#xA;"

+          <elements xmi:id="_0kroEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.javadoc.insert&#xA;"

               name="Class.getGenFeature.javadoc.override" headerMethod="#_0kroEmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__Nt_NHLYEd-09ds9dfYpFw" initMethod="#_0kroE2J-Ed-FqczH3ESmRw"

               footerMethod="#_0kroFWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C8FJsULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_XUjXoCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0kroEmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0kroEGJ-Ed-FqczH3ESmRw/method._0kroEmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0kroE2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0kroEGJ-Ed-FqczH3ESmRw/method._0kroE2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__Nt_NHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0kroEGJ-Ed-FqczH3ESmRw/method.__Nt_NHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0kroFWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0kroEGJ-Ed-FqczH3ESmRw/method._0kroFWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0kroImJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0kroEGJ-Ed-FqczH3ESmRw/method._0kroImJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C8FJuELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C8FJuULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C8FJukLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C8FJu0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C8FJvELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8FJvULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8FJvkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8FJv0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8FJwELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_XWpCUCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_XW79QCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_XXFHMCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_XXO4MCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_XXYpMCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XXrkICSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XX0uECSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XX-fECSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_XYIQECSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XYbLACSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8FJwULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C8FJwkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_XYk8ACSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_XYuF8CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8FJw0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_XY328CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8FJxELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_XZKx4CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8FJxULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_XZUi4CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C8FJt0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C8FJx0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_XWfRUCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_XZxO0CSWEemxeP6B0lLOpA"

                 called="#_0kroImJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0lIUAGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0lIUAGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.getGenFeature.javadoc.insert" headerMethod="#_0lIUAmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__O6SBHLYEd-09ds9dfYpFw" initMethod="#_0lIUA2J-Ed-FqczH3ESmRw"

               footerMethod="#_0lIUBWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C8SlEULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_XaNTsCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0lIUAmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0lIUAGJ-Ed-FqczH3ESmRw/method._0lIUAmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0lIUA2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0lIUAGJ-Ed-FqczH3ESmRw/method._0lIUA2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__O6SBHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0lIUAGJ-Ed-FqczH3ESmRw/method.__O6SBHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0lIUBWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0lIUAGJ-Ed-FqczH3ESmRw/method._0lIUBWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0lIUEmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0lIUAGJ-Ed-FqczH3ESmRw/method._0lIUEmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C8SlGELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C8SlGULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C8SlGkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C8SlG0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C8SlHELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8SlHULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8SlHkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8SlH0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8SlIELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_XcS-YCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_XccvYCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_XcvqUCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_Xc5bUCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_XdClQCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XdMWQCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XdfRMCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XdpCMCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_XdyzMCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Xd79ICSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8SlIULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C8SlIkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_XeO4ECSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_XeYpECSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8SlI0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_XeiaECSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8SlJELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_Xe1VACSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8SlJULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_Xe_GACSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C8SlF0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C8SlJ0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_XcJ0cCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_XfbK4CSWEemxeP6B0lLOpA"

                 called="#_0lIUEmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0lIUFGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0lIUFGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.getGenFeature.annotations.insert" headerMethod="#_0lIUFmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__P9a5HLYEd-09ds9dfYpFw" initMethod="#_0lIUF2J-Ed-FqczH3ESmRw"

               footerMethod="#_0lIUGWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C6-WcULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_WnQMwCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0lIUFmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0lIUFGJ-Ed-FqczH3ESmRw/method._0lIUFmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0lIUF2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0lIUFGJ-Ed-FqczH3ESmRw/method._0lIUF2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__P9a5HLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0lIUFGJ-Ed-FqczH3ESmRw/method.__P9a5HLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0lIUGWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0lIUFGJ-Ed-FqczH3ESmRw/method._0lIUGWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0lSFCmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0lIUFGJ-Ed-FqczH3ESmRw/method._0lSFCmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C6-9hULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C6-9hkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C6-9h0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C6-9iELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C6-9iULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6-9ikLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6-9i0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6-9jELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6-9jULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_WpVQYCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_WpfBYCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_WpoyYCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_Wp7tUCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_WqE3QCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WqOoQCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WqYZQCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WqrUMCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_Wq1FMCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Wq-PICSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6-9jkLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C6-9j0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_WrIAICSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_Wra7ECSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6-9kELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_WrksECSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6-9kULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_Wrt2ACSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6-9kkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_Wr3nACSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C6-9hELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C6-9lELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_WpCVcCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_WsUS8CSWEemxeP6B0lLOpA"

                 called="#_0lSFCmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0lSFDGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0lSFDGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.getGenFeature.pre.insert" headerMethod="#_0lSFDmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__RvjlHLYEd-09ds9dfYpFw" initMethod="#_0lbO8GJ-Ed-FqczH3ESmRw"

               footerMethod="#_0lbO8mJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C7LKwULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Wsw-4CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0lSFDmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0lSFDGJ-Ed-FqczH3ESmRw/method._0lSFDmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0lbO8GJ-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0lSFDGJ-Ed-FqczH3ESmRw/method._0lbO8GJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__RvjlHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0lSFDGJ-Ed-FqczH3ESmRw/method.__RvjlHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0lbO8mJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0lSFDGJ-Ed-FqczH3ESmRw/method._0lbO8mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0lbO_2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0lSFDGJ-Ed-FqczH3ESmRw/method._0lbO_2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C7LKyELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C7LKyULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C7LKykLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C7LKy0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C7LKzELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7LKzULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7LKzkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7LKz0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7LK0ELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_Wu_zgCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_WvJkgCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_WvSucCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_WvmQcCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_WvvaYCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WwCVUCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WwMGUCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WwV3UCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_WwoyQCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WwyjQCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7LK0ULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C7LK0kLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_Ww7tMCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_WxOoICSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7LK00LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_WxYZICSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7LK1ELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_WxiKICSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7LK1ULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_WxrUECSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C7LKx0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C7LK10LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Wus4kCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_WyIAACSWEemxeP6B0lLOpA"

                 called="#_0lbO_2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0lbPAWJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0lbPAWJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.getGenFeature.TODO.override" headerMethod="#_0lbPA2J-Ed-FqczH3ESmRw"

               conditionMethod="#__TiTVHLYEd-09ds9dfYpFw" initMethod="#_0lbPBGJ-Ed-FqczH3ESmRw"

               footerMethod="#_0lbPBmJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C8c9IULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Xf320CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0lbPA2J-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0lbPAWJ-Ed-FqczH3ESmRw/method._0lbPA2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0lbPBGJ-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0lbPAWJ-Ed-FqczH3ESmRw/method._0lbPBGJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__TiTVHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0lbPAWJ-Ed-FqczH3ESmRw/method.__TiTVHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0lbPBmJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0lbPAWJ-Ed-FqczH3ESmRw/method._0lbPBmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0lbPE2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0lbPAWJ-Ed-FqczH3ESmRw/method._0lbPE2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C8c9KELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C8c9KULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C8c9KkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C8c9K0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C8c9LELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8c9LULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8c9LkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8c9L0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8c9MELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_Xh9hgCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_XiHSgCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_XiQccCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_Xij-cCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_XitIYCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Xi25YCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XjJ0UCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XjTlUCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_XjcvQCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XjmgQCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8c9MULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C8c9MkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_Xj5bMCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_XkDMMCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8c9M0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_XkMWICSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8c9NELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_Xkf4ICSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8c9NULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_XkpCECSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C8c9J0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C8c9N0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_XhzwgCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_XlFuACSWEemxeP6B0lLOpA"

                 called="#_0lbPE2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0lk_8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0lk_8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.TODO.override&#xA;"

               name="Class.basicGetGenFeature.override" headerMethod="#_0lk_8mJ-Ed-FqczH3ESmRw"

               conditionMethod="#__VBhFHLYEd-09ds9dfYpFw" initMethod="#_0lk_82J-Ed-FqczH3ESmRw"

               footerMethod="#_0lk_9WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C8nVMULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_XliZ8CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0lk_8mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0lk_8GJ-Ed-FqczH3ESmRw/method._0lk_8mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0lk_82J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0lk_8GJ-Ed-FqczH3ESmRw/method._0lk_82J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__VBhFHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0lk_8GJ-Ed-FqczH3ESmRw/method.__VBhFHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0lk_9WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0lk_8GJ-Ed-FqczH3ESmRw/method._0lk_9WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0llAAmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0lk_8GJ-Ed-FqczH3ESmRw/method._0llAAmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C8nVOELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C8nVOULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C8nVOkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C8nVO0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C8nVPELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8nVPULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8nVPkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8nVP0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8nVQELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_XnoEoCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_Xn6_kCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_XoEwkCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_XoN6gCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_XohcgCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XoqmcCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Xo0XcCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Xo9hYCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_XpRDYCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_XpaNUCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8nVQULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C8nVQkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_Xpj-UCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_Xp25QCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8nVQ0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_XqAqQCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8nVRELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_XqJ0MCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8n8QELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_XqdWMCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C8nVN0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C8n8QkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_XneToCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_X2OhUCSWEemxeP6B0lLOpA"

                 called="#_0llAAmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0l364GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0l364GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.basicGetGenFeature.annotations.insert" headerMethod="#_0l364mJ-Ed-FqczH3ESmRw"

               conditionMethod="#__XjQpHLYEd-09ds9dfYpFw" initMethod="#_0l3642J-Ed-FqczH3ESmRw"

               footerMethod="#_0l365WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C8xtQULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_X2rNQCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0l364mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0l364GJ-Ed-FqczH3ESmRw/method._0l364mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0l3642J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0l364GJ-Ed-FqczH3ESmRw/method._0l3642J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__XjQpHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0l364GJ-Ed-FqczH3ESmRw/method.__XjQpHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0l365WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0l364GJ-Ed-FqczH3ESmRw/method._0l365WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0l368mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0l364GJ-Ed-FqczH3ESmRw/method._0l368mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C8xtSELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C8xtSULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C8xtSkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C8xtS0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C8xtTELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8xtTULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8xtTkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8xtT0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C8xtUELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_X4w38CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_X46B4CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_X5Nj4CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_X5Wt0CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_X5ge0CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_X5powCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_X59KwCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_X6GUsCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_X6QFsCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_X6jAoCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8xtUULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C8xtUkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_X6sxoCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_X617kCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8xtU0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_X6_skCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8xtVELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_X7SngCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C8xtVULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_X7cYgCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C8xtR0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C8xtV0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_X4nG8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_X75EcCSWEemxeP6B0lLOpA"

                 called="#_0l368mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0mBr4GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0mBr4GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.basicGetGenFeature.pre.insert" headerMethod="#_0mBr4mJ-Ed-FqczH3ESmRw"

               conditionMethod="#__ZDFdHLYEd-09ds9dfYpFw" initMethod="#_0mBr42J-Ed-FqczH3ESmRw"

               footerMethod="#_0mBr5WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C88sYULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_X8VwYCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0mBr4mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0mBr4GJ-Ed-FqczH3ESmRw/method._0mBr4mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0mBr42J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0mBr4GJ-Ed-FqczH3ESmRw/method._0mBr42J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__ZDFdHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0mBr4GJ-Ed-FqczH3ESmRw/method.__ZDFdHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0mBr5WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0mBr4GJ-Ed-FqczH3ESmRw/method._0mBr5WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0mBr8mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0mBr4GJ-Ed-FqczH3ESmRw/method._0mBr8mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C88saELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C88saULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C89TcELpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C89TcULpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C89TckLpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C89Tc0LpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C89TdELpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C89TdULpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C89TdkLpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_X-a0ACSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_X-klACSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_X-uWACSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_X_BQ8CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_X_LB8CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_X_UL4CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_X_d84CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_X_w30CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_X_6o0CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YADywCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C89Td0LpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C89TeELpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_YANjwCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_YAgesCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C89TeULpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_YAqPsCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C89TekLpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_YA0AsCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C89Te0LpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_YBG7oCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C88sZ0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C89TfULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_X-RqECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_YBZ2kCSWEemxeP6B0lLOpA"

                 called="#_0mBr8mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0mK10GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0mK10GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.basicGetGenFeature.TODO.override" headerMethod="#_0mK10mJ-Ed-FqczH3ESmRw"

               conditionMethod="#__a1OJHLYEd-09ds9dfYpFw" initMethod="#_0mK102J-Ed-FqczH3ESmRw"

               footerMethod="#_0mK11WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C9I5oULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_YB2igCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0mK10mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0mK10GJ-Ed-FqczH3ESmRw/method._0mK10mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0mK102J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0mK10GJ-Ed-FqczH3ESmRw/method._0mK102J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__a1OJHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0mK10GJ-Ed-FqczH3ESmRw/method.__a1OJHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0mK11WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0mK10GJ-Ed-FqczH3ESmRw/method._0mK11WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0mK14mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0mK10GJ-Ed-FqczH3ESmRw/method._0mK14mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C9JgtULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C9JgtkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C9Jgt0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C9JguELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C9JguULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9JgukLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9Jgu0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9JgvELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9JgvULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_YEFXICSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_YEPIICSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_YEY5ICSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_YEr0ECSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_YE0-ACSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YE-vACSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YFIgACSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YFba8CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_YFlL8CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YFuV4CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9JgvkLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C9Jgv0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_YGBQ0CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_YGLB0CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9JgwELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_YGUy0CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9JgwULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_YGd8wCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9JgwkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_YGxewCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C9JgtELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C9JgxELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_YDycMCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_YHEZsCSWEemxeP6B0lLOpA"

                 called="#_0mK14mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0mUm0GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0mUm0GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.TODO.override&#xA;"

               name="Class.basicSetGenFeature.override" headerMethod="#_0mUm0mJ-Ed-FqczH3ESmRw"

               conditionMethod="#__d9apHLYEd-09ds9dfYpFw" initMethod="#_0mUm02J-Ed-FqczH3ESmRw"

               footerMethod="#_0mUm1WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C9WVAULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_YHhFoCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0mUm0mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0mUm0GJ-Ed-FqczH3ESmRw/method._0mUm0mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0mUm02J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0mUm0GJ-Ed-FqczH3ESmRw/method._0mUm02J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__d9apHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0mUm0GJ-Ed-FqczH3ESmRw/method.__d9apHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0mUm1WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0mUm0GJ-Ed-FqczH3ESmRw/method._0mUm1WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0mUm4mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0mUm0GJ-Ed-FqczH3ESmRw/method._0mUm4mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C9WVCELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C9WVCULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C9WVCkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C9WVC0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C9WVDELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9WVDULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9WVDkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9WVD0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9WVEELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_YJmJQCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_YJv6QCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_YKC1MCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_YKMmMCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_YKWXMCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YKpSICSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YKycECSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YK8NECSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_YLF-ECSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YLY5ACSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9WVEULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C9WVEkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_YLiqACSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_YLrz8CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9WVE0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_YL-u4CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9WVFELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_YMIf4CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9WVFULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_YMSQ4CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C9WVB0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C9WVF0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_YJc_UCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_YMu80CSWEemxeP6B0lLOpA"

                 called="#_0mUm4mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0mnhwGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0mnhwGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.basicSetGenFeature.annotations.insert" headerMethod="#_0mnhwmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__fJtdHLYEd-09ds9dfYpFw" initMethod="#_0mnhw2J-Ed-FqczH3ESmRw"

               footerMethod="#_0mnhxWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C7WJ4ELpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Wykr8CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0mnhwmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0mnhwGJ-Ed-FqczH3ESmRw/method._0mnhwmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0mnhw2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0mnhwGJ-Ed-FqczH3ESmRw/method._0mnhw2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__fJtdHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0mnhwGJ-Ed-FqczH3ESmRw/method.__fJtdHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0mnhxWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0mnhwGJ-Ed-FqczH3ESmRw/method._0mnhxWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0mnh0mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0mnhwGJ-Ed-FqczH3ESmRw/method._0mnh0mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C7WJ50LpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C7WJ6ELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C7WJ6ULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C7WJ6kLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C7WJ60LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7WJ7ELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7WJ7ULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7WJ7kLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7WJ70LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_W0qWoCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_W09RkCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_W1HCkCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_W1QMgCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_W1jugCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_W1s4cCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_W12pcCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_W1_zYCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_W2TVYCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_W2cfUCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7WJ8ELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C7WJ8ULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_W2mQUCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_W2wBUCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7WJ8kLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_W3C8QCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7WJ80LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_W3MGMCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7WJ9ELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_W3V3MCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C7WJ5kLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C7WJ9kLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_W0gloCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_W3yjICSWEemxeP6B0lLOpA"

                 called="#_0mnh0mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0mxSwGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0mxSwGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.basicSetGenFeature.pre.insert" headerMethod="#_0mxSwmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__gDFVHLYEd-09ds9dfYpFw" initMethod="#_0mxSw2J-Ed-FqczH3ESmRw"

               footerMethod="#_0mxSxWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C9jJUULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_YVOKcCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0mxSwmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0mxSwGJ-Ed-FqczH3ESmRw/method._0mxSwmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0mxSw2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0mxSwGJ-Ed-FqczH3ESmRw/method._0mxSw2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__gDFVHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0mxSwGJ-Ed-FqczH3ESmRw/method.__gDFVHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0mxSxWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0mxSwGJ-Ed-FqczH3ESmRw/method._0mxSxWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0mxS0mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0mxSwGJ-Ed-FqczH3ESmRw/method._0mxS0mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C9jJWELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C9jJWULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C9jJWkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C9jJW0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C9jJXELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9jJXULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9jJXkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9jJX0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9jJYELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_YXdmICSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_YXmwECSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_YXwhECSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_YYDcACSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_YYNNACSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YYWW8CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YYgH8CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YYzC4CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_YY8z4CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YZF90CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9jJYULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C9jJYkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_YZZf0CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_YZipwCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9jJY0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_YZsawCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9jJZELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_YZ_VsCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9jJZULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_YaJGsCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C9jJV0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C9jJZ0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_YXT1ICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_YacBoCSWEemxeP6B0lLOpA"

                 called="#_0mxS0mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0mxS1GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0mxS1GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.basicSetGenFeature.post.insert" headerMethod="#_0mxS1mJ-Ed-FqczH3ESmRw"

               conditionMethod="#__gysNHLYEd-09ds9dfYpFw" initMethod="#_0mxS12J-Ed-FqczH3ESmRw"

               footerMethod="#_0m6csWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C9v9oULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_YbCekCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0mxS1mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0mxS1GJ-Ed-FqczH3ESmRw/method._0mxS1mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0mxS12J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0mxS1GJ-Ed-FqczH3ESmRw/method._0mxS12J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__gysNHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0mxS1GJ-Ed-FqczH3ESmRw/method.__gysNHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0m6csWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0mxS1GJ-Ed-FqczH3ESmRw/method._0m6csWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0m6cvmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0mxS1GJ-Ed-FqczH3ESmRw/method._0m6cvmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C9wksELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C9wksULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C9wkskLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C9wks0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C9wktELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9wktULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9wktkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9wkt0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C9wkuELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_YdHiMCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_YdRTMCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_YdbEMCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_Ydt_ICSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_Yd3wICSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YeA6ECSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YeKrECSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YedmACSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_YenXACSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Yewg8CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9wkuULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C9wkukLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_YfDb4CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_YfNM4CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9wku0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_YfW94CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9wkvELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_Yfp40CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9wkvULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_Yfzp0CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C9v9p0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C9wkv0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Yc0nQCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_YgQVwCSWEemxeP6B0lLOpA"

                 called="#_0m6cvmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0m6cwGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0m6cwGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.basicSetGenFeature.TODO.override" headerMethod="#_0m6cwmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__hsEFHLYEd-09ds9dfYpFw" initMethod="#_0m6cw2J-Ed-FqczH3ESmRw"

               footerMethod="#_0m6cxWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C96VsULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_YgsaoCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0m6cwmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0m6cwGJ-Ed-FqczH3ESmRw/method._0m6cwmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0m6cw2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0m6cwGJ-Ed-FqczH3ESmRw/method._0m6cw2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__hsEFHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0m6cwGJ-Ed-FqczH3ESmRw/method.__hsEFHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0m6cxWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0m6cwGJ-Ed-FqczH3ESmRw/method._0m6cxWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0m6c0mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0m6cwGJ-Ed-FqczH3ESmRw/method._0m6c0mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C968w0LpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C968xELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C968xULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C968xkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C968x0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C968yELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C968yULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C968ykLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C968y0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_YiyFUCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_YjFAQCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_YjOxQCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_YjYiQCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_YjhsMCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Yj1OMCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Yj-YICSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YkIJICSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_YkbEECSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Ykk1ECSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C968zELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C968zULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_Ykt_ACSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_YlBhACSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C968zkLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_YlKq8CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C968z0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_YlUb8CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C9680ELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_YlnW4CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C968wkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C9680kLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Yio7YCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Yl6R0CSWEemxeP6B0lLOpA"

                 called="#_0m6c0mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0nN-sGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0nN-sGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.dynamicSetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.dynamicSetGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.TODO.override&#xA;"

               name="Class.setGenFeature.override" headerMethod="#_0nN-smJ-Ed-FqczH3ESmRw"

               conditionMethod="#__jLR1HLYEd-09ds9dfYpFw" initMethod="#_0nN-s2J-Ed-FqczH3ESmRw"

               footerMethod="#_0nN-tWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C-IYIULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_YmzpsCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0nN-smJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0nN-sGJ-Ed-FqczH3ESmRw/method._0nN-smJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0nN-s2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0nN-sGJ-Ed-FqczH3ESmRw/method._0nN-s2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__jLR1HLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0nN-sGJ-Ed-FqczH3ESmRw/method.__jLR1HLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0nN-tWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0nN-sGJ-Ed-FqczH3ESmRw/method._0nN-tWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0nN-wmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0nN-sGJ-Ed-FqczH3ESmRw/method._0nN-wmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C-I_M0LpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C-I_NELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C-I_NULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C-I_NkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C-I_N0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-I_OELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-I_OULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-I_OkLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-I_O0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_YpCeUCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_YpMPUCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_YpWAUCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_Ypo7QCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_YpysQCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YqFnMCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YqOxICSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YqYiICSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_YqrdECSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Yq1OECSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-I_PELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C-I_PULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_YrIJACSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_YrR6ACSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-I_PkLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_Yrk08CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-I_P0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_Yrul8CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-I_QELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_Yr3v4CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C-I_MkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C-I_QkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_YovjYCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_YsUb0CSWEemxeP6B0lLOpA"

                 called="#_0nN-wmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0nXIoGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.javadoc.insert&#xA;"

+          <elements xmi:id="_0nXIoGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.javadoc.insert&#xA;"

               name="Class.setGenFeature.javadoc.override" headerMethod="#_0nXIomJ-Ed-FqczH3ESmRw"

               conditionMethod="#__m57RHLYEd-09ds9dfYpFw" initMethod="#_0nXIo2J-Ed-FqczH3ESmRw"

               footerMethod="#_0nXIpWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C-TXQULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_YsxHwCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0nXIomJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0nXIoGJ-Ed-FqczH3ESmRw/method._0nXIomJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0nXIo2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0nXIoGJ-Ed-FqczH3ESmRw/method._0nXIo2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__m57RHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0nXIoGJ-Ed-FqczH3ESmRw/method.__m57RHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0nXIpWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0nXIoGJ-Ed-FqczH3ESmRw/method._0nXIpWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0nXIsmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0nXIoGJ-Ed-FqczH3ESmRw/method._0nXIsmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C-TXSELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C-TXSULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C-TXSkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C-TXS0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C-TXTELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-TXTULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-TXTkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-TXT0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-TXUELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_Yu_8YCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_YvJtYCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_YvTeYCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_YvmZUCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_YvwKUCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Yv5UQCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YwMPMCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_YwWAMCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_YwfxMCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Ywo7ICSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-TXUULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C-TXUkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_Yw8dICSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_YxFnECSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-TXU0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_YzBgwCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-TXVELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_YzLRwCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-TXVULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_YzeMsCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C-TXR0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C-TXV0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_YutBcCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_YzxHoCSWEemxeP6B0lLOpA"

                 called="#_0nXIsmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0ng5oGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0ng5oGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.setGenFeature.javadoc.insert" headerMethod="#_0ng5omJ-Ed-FqczH3ESmRw"

               conditionMethod="#__oi6BHLYEd-09ds9dfYpFw" initMethod="#_0ng5o2J-Ed-FqczH3ESmRw"

               footerMethod="#_0ng5pWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C-iAwULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Y0XkkCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0ng5omJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0ng5oGJ-Ed-FqczH3ESmRw/method._0ng5omJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0ng5o2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0ng5oGJ-Ed-FqczH3ESmRw/method._0ng5o2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__oi6BHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0ng5oGJ-Ed-FqczH3ESmRw/method.__oi6BHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0ng5pWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0ng5oGJ-Ed-FqczH3ESmRw/method._0ng5pWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0ng5smJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0ng5oGJ-Ed-FqczH3ESmRw/method._0ng5smJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C-in1ULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C-in1kLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C-in10LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C-in2ELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C-in2ULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-in2kLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-in20LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-in3ELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-in3ULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_Y2dPQCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_Y2mZMCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_Y2wKMCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_Y3DFICSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_Y3M2ICSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Y3WAECSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Y3piECSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Y3ysACSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_Y38dACSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Y4GOACSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-in3kLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C-in30LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_Y4ZI8CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_Y4iS4CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-in4ELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_Y4sD4CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-in4ULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_Y4--0CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-in4kLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_Y5Iv0CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C-in1ELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C-in5ELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Y2TeQCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Y5lbwCSWEemxeP6B0lLOpA"

                 called="#_0ng5smJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0nqqoGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0nqqoGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.setGenFeature.annotations.insert" headerMethod="#_0nqqomJ-Ed-FqczH3ESmRw"

               conditionMethod="#__pvM1HLYEd-09ds9dfYpFw" initMethod="#_0nqqo2J-Ed-FqczH3ESmRw"

               footerMethod="#_0nqqpWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C7iXIULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_W4PPECSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0nqqomJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0nqqoGJ-Ed-FqczH3ESmRw/method._0nqqomJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0nqqo2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0nqqoGJ-Ed-FqczH3ESmRw/method._0nqqo2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__pvM1HLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0nqqoGJ-Ed-FqczH3ESmRw/method.__pvM1HLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0nqqpWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0nqqoGJ-Ed-FqczH3ESmRw/method._0nqqpWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0nqqsmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0nqqoGJ-Ed-FqczH3ESmRw/method._0nqqsmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C7iXKELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C7iXKULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C7iXKkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C7iXK0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C7iXLELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7i-MELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7i-MULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7i-MkLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C7i-M0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_W6U5wCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_W6eDsCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_W6xlsCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_W66voCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_W7EgoCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_W7NqkCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_W7hMkCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_W7qWgCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_W70HgCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_W794gCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7i-NELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C7i-NULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_W8QzcCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_W8Z9YCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7i-NkLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_W8tfYCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7i-N0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_W82pUCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C7i-OELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_W9AaUCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C7iXJ0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C7i-OkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_W6LIwCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_W9dGQCSWEemxeP6B0lLOpA"

                 called="#_0nqqsmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0nz0kGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0nz0kGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.setGenFeature.pre.insert" headerMethod="#_0nz0kmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__rEplHLYEd-09ds9dfYpFw" initMethod="#_0nz0k2J-Ed-FqczH3ESmRw"

               footerMethod="#_0nz0lWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C-vcIULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Y6CHsCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0nz0kmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0nz0kGJ-Ed-FqczH3ESmRw/method._0nz0kmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0nz0k2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0nz0kGJ-Ed-FqczH3ESmRw/method._0nz0k2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__rEplHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0nz0kGJ-Ed-FqczH3ESmRw/method.__rEplHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0nz0lWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0nz0kGJ-Ed-FqczH3ESmRw/method._0nz0lWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0nz0o2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0nz0kGJ-Ed-FqczH3ESmRw/method._0nz0o2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C-vcKELpEei0i9bcSdIGKw" name="setAccessorOperation"

+            <parameters xmi:id="_Y8Q8UCSWEemxeP6B0lLOpA" name="setAccessorOperation"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_C-vcKULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C-vcKkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C-vcK0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C-vcLELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C-vcLULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-vcLkLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-vcL0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-vcMELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-vcMULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_Y8atUCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_Y8toQCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_Y83ZQCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_Y9AjMCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_Y9TeICSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Y9dPICSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Y9nAICSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Y957ECSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_Y-DsECSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Y-M2ACSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-vcMkLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C-vcM0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_Y-fw8CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_Y-ph8CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-vcNELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_Y-zS8CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-vcNULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_Y_GN4CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-vcNkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_Y_P-4CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C-vcJ0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C-vcOELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Y8HLUCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Y_sDwCSWEemxeP6B0lLOpA"

                 called="#_0nz0o2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0qMaMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0qMaMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.setGenFeature.post.insert" headerMethod="#_0qMaMmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__sQ8ZHLYEd-09ds9dfYpFw" initMethod="#_0qMaM2J-Ed-FqczH3ESmRw"

               footerMethod="#_0qMaNWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C-6bQULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_ZMDr0CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0qMaMmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0qMaMGJ-Ed-FqczH3ESmRw/method._0qMaMmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0qMaM2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0qMaMGJ-Ed-FqczH3ESmRw/method._0qMaM2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__sQ8ZHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0qMaMGJ-Ed-FqczH3ESmRw/method.__sQ8ZHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0qMaNWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0qMaMGJ-Ed-FqczH3ESmRw/method._0qMaNWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0qMaQ2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0qMaMGJ-Ed-FqczH3ESmRw/method._0qMaQ2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C-6bSELpEei0i9bcSdIGKw" name="setAccessorOperation"

+            <parameters xmi:id="_ZOTHgCSWEemxeP6B0lLOpA" name="setAccessorOperation"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_C-6bSULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C-6bSkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C-6bS0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C-6bTELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C-6bTULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-6bTkLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-6bT0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-6bUELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C-6bUULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_ZOcRcCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ZOmCcCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ZOvzcCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_ZPCuYCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_ZPMfYCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZPVpUCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZPokQCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZPyVQCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZP8GQCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZQFQMCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-6bUkLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C-6bU0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_ZQYyMCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_ZQh8ICSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-6bVELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_ZQrtICSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-6bVULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_ZQ03ECSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C-6bVkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_ZRIZECSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C-6bR0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C-6bWELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ZOAMkCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_ZRbUACSWEemxeP6B0lLOpA"

                 called="#_0qMaQ2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0qMaRWJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0qMaRWJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.setGenFeature.TODO.override" headerMethod="#_0qMaR2J-Ed-FqczH3ESmRw"

               conditionMethod="#__tAjRHLYEd-09ds9dfYpFw" initMethod="#_0qMaSGJ-Ed-FqczH3ESmRw"

               footerMethod="#_0qWLMWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C_GBcULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_ZSBJ4CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0qMaR2J-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0qMaRWJ-Ed-FqczH3ESmRw/method._0qMaR2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0qMaSGJ-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0qMaRWJ-Ed-FqczH3ESmRw/method._0qMaSGJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__tAjRHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0qMaRWJ-Ed-FqczH3ESmRw/method.__tAjRHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0qWLMWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0qMaRWJ-Ed-FqczH3ESmRw/method._0qWLMWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0qWLP2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0qMaRWJ-Ed-FqczH3ESmRw/method._0qWLP2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C_GBeELpEei0i9bcSdIGKw" name="setAccessorOperation"

+            <parameters xmi:id="_ZUG0kCSWEemxeP6B0lLOpA" name="setAccessorOperation"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_C_GBeULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C_GBekLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C_GBe0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C_GBfELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C_GBfULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_GBfkLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_GBf0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_GBgELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_GBgULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_ZUQlkCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ZUjggCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ZUtRgCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_ZVAMcCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_ZVJ9cCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZVTHYCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZVmCUCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZVvzUCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZWCuQCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZWMfQCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_GBgkLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C_GBg0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_ZWWQQCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_ZWpLMCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_GBhELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_ZWyVICSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_GBhULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_ZXF3ICSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_GBhkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_ZdWQICSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C_GBd0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C_GBiELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ZT9qoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Zdy8ECSWEemxeP6B0lLOpA"

                 called="#_0qWLP2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0qfVIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0qfVIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.TODO.override&#xA;"

               name="Class.basicUnsetGenFeature.override" headerMethod="#_0qfVImJ-Ed-FqczH3ESmRw"

               conditionMethod="#__v101HLYEd-09ds9dfYpFw" initMethod="#_0qfVI2J-Ed-FqczH3ESmRw"

               footerMethod="#_0qfVJWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C_Uq8ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_ZePoACSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0qfVImJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0qfVIGJ-Ed-FqczH3ESmRw/method._0qfVImJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0qfVI2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0qfVIGJ-Ed-FqczH3ESmRw/method._0qfVI2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__v101HLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0qfVIGJ-Ed-FqczH3ESmRw/method.__v101HLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0qfVJWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0qfVIGJ-Ed-FqczH3ESmRw/method._0qfVJWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0qfVMmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0qfVIGJ-Ed-FqczH3ESmRw/method._0qfVMmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C_Uq-ELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C_Uq-ULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C_Uq-kLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C_Uq-0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C_Uq_ELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_Uq_ULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_Uq_kLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_Uq_0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_UrAELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_ZgUroCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ZgecoCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ZgoNoCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_Zg7IkCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_ZhE5kCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZhODgCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZhhlgCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZhqvcCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_Zh9qYCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZiHbYCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_UrAULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C_UrAkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_ZiRMYCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_ZiaWUCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_UrA0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_ZitRQCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_UrBELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_Zi3CQCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_UrBULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_ZjJ9MCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C_Uq90LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C_UrB0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ZgLhsCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_ZjdfMCSWEemxeP6B0lLOpA"

                 called="#_0qfVMmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0qpGIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0qpGIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.basicUnsetGenFeature.annotations.insert" headerMethod="#_0qpGImJ-Ed-FqczH3ESmRw"

               conditionMethod="#__xezlHLYEd-09ds9dfYpFw" initMethod="#_0qpGI2J-Ed-FqczH3ESmRw"

               footerMethod="#_0qpGJWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C_fDAULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Zj5kECSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0qpGImJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0qpGIGJ-Ed-FqczH3ESmRw/method._0qpGImJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0qpGI2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0qpGIGJ-Ed-FqczH3ESmRw/method._0qpGI2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__xezlHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0qpGIGJ-Ed-FqczH3ESmRw/method.__xezlHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0qpGJWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0qpGIGJ-Ed-FqczH3ESmRw/method._0qpGJWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0qpGMmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0qpGIGJ-Ed-FqczH3ESmRw/method._0qpGMmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C_fDCELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C_fDCULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C_fDCkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C_fDC0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C_fDDELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_fDDULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_fDDkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_fDD0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_fDEELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_ZmI_wCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ZmSwwCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ZmlrsCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_Zmu1oCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_Zm4moCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZnLhkCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZnVSkCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZnfDkCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZnoNgCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Zn7IcCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_fDEULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C_fDEkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_ZoE5cCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_ZoOqcCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_fDE0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_ZohlYCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_fDFELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_ZorWYCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_fDFULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_Zo0gUCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C_fDB0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C_fDF0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Zl_OwCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_ZpRMQCSWEemxeP6B0lLOpA"

                 called="#_0qpGMmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0qy3IGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0qy3IGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.basicUnsetGenFeature.TODO.override" headerMethod="#_0qy3ImJ-Ed-FqczH3ESmRw"

               conditionMethod="#__yrGZHLYEd-09ds9dfYpFw" initMethod="#_0qy3I2J-Ed-FqczH3ESmRw"

               footerMethod="#_0qy3JWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C_qpMULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Zpt4MCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0qy3ImJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0qy3IGJ-Ed-FqczH3ESmRw/method._0qy3ImJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0qy3I2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0qy3IGJ-Ed-FqczH3ESmRw/method._0qy3I2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__yrGZHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0qy3IGJ-Ed-FqczH3ESmRw/method.__yrGZHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0qy3JWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0qy3IGJ-Ed-FqczH3ESmRw/method._0qy3JWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0qy3MmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0qy3IGJ-Ed-FqczH3ESmRw/method._0qy3MmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C_qpOELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C_qpOULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C_qpOkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C_qpO0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C_qpPELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_qpPULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_qpPkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_qpP0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_qpQELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_Zrzi4CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_Zr8s0CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ZsGd0CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_ZsZYwCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_ZsjJwCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZssTsCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Zs_1sCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZtI_oCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZtSwoCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZtchoCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_qpQULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C_qpQkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_ZtvckCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_Zt4mgCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_qpQ0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_ZuCXgCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_qpRELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_ZuMIgCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_qpRULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_ZufDcCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C_qpN0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C_qpR0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ZrgA4CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Zux-YCSWEemxeP6B0lLOpA"

                 called="#_0qy3MmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0q8BEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0q8BEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.TODO.override&#xA;"

               name="Class.unsetGenFeature.override" headerMethod="#_0q8BEmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__0BKNHLYEd-09ds9dfYpFw" initMethod="#_0q8BE2J-Ed-FqczH3ESmRw"

               footerMethod="#_0q8BFWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C_2PYULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_ZvOqUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0q8BEmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0q8BEGJ-Ed-FqczH3ESmRw/method._0q8BEmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0q8BE2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0q8BEGJ-Ed-FqczH3ESmRw/method._0q8BE2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__0BKNHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0q8BEGJ-Ed-FqczH3ESmRw/method.__0BKNHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0q8BFWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0q8BEGJ-Ed-FqczH3ESmRw/method._0q8BFWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0q8BImJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0q8BEGJ-Ed-FqczH3ESmRw/method._0q8BImJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_C_22dkLpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C_22d0LpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C_22eELpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C_22eULpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C_22ekLpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_22e0LpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_22fELpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_22fULpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C_22fkLpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_ZxUVACSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ZxnP8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ZxxA8CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_Zx6K4CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_ZyD74CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZyW20CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Zygn0CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZypxwCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_Zy9TwCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZzGdsCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_22f0LpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C_22gELpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_ZzQOsCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_ZzZ_sCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_22gULpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_Zzs6oCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_22gkLpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_Zz2EkCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C_22g0LpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_Zz_1kCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C_22dULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C_22hULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ZxKkACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Z0chgCSWEemxeP6B0lLOpA"

                 called="#_0q8BImJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0rPjEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.javadoc.insert&#xA;"

+          <elements xmi:id="_0rPjEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.javadoc.insert&#xA;"

               name="Class.unsetGenFeature.javadoc.override" headerMethod="#_0rPjEmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__1gX9HLYEd-09ds9dfYpFw" initMethod="#_0rPjE2J-Ed-FqczH3ESmRw"

               footerMethod="#_0rPjFWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DACcoULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Z05NcCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0rPjEmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0rPjEGJ-Ed-FqczH3ESmRw/method._0rPjEmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0rPjE2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0rPjEGJ-Ed-FqczH3ESmRw/method._0rPjE2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__1gX9HLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0rPjEGJ-Ed-FqczH3ESmRw/method.__1gX9HLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0rPjFWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0rPjEGJ-Ed-FqczH3ESmRw/method._0rPjFWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0rPjImJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0rPjEGJ-Ed-FqczH3ESmRw/method._0rPjImJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DACcqELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DACcqULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DACcqkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DACcq0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DACcrELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DACcrULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DACcrkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DACcr0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DACcsELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_Z3ICECSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_Z3RzECSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_Z3a9ACSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_Z3ufACSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_Z33o8CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Z4BZ8CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Z4UU4CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Z4eF4CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_Z4nP0CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Z4xA0CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DACcsULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DACcskLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_Z5D7wCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_Z5NswCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DACcs0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_Z5gnsCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DACctELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_Z5qYsCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DACctULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_Z5zioCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DACcp0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DACct0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Z21HICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Z6QOkCSWEemxeP6B0lLOpA"

                 called="#_0rPjImJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0rieAGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0rieAGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.unsetGenFeature.javadoc.insert" headerMethod="#_0rieAmJ-Ed-FqczH3ESmRw"

               conditionMethod="#__349lHLYEd-09ds9dfYpFw" initMethod="#_0rieA2J-Ed-FqczH3ESmRw"

               footerMethod="#_0rieBWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DAOC0ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Z6s6gCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0rieAmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0rieAGJ-Ed-FqczH3ESmRw/method._0rieAmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0rieA2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0rieAGJ-Ed-FqczH3ESmRw/method._0rieA2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__349lHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0rieAGJ-Ed-FqczH3ESmRw/method.__349lHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0rieBWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0rieAGJ-Ed-FqczH3ESmRw/method._0rieBWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0rieEmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0rieAGJ-Ed-FqczH3ESmRw/method._0rieEmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DAOC2ELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DAOC2ULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DAOC2kLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DAOC20LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DAOC3ELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DAOC3ULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DAOC3kLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DAOC30LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DAOC4ELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_Z91HACSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_Z9-4ACSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_Z-IpACSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_Z-bj8CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_Z-kt4CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Z-ue4CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Z_BZ0CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Z_LK0CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_Z_U70CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Z_n2wCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DAOC4ULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DAOC4kLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_Z_xAsCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_aAEisCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DAOC40LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_aANsoCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DAOC5ELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_aAXdoCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DAOC5ULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_aAhOoCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DAOC10LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DAOC50LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Z9iMECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_aA9TgCSWEemxeP6B0lLOpA"

                 called="#_0rieEmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0rrn8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0rrn8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.unsetGenFeature.annotations.insert" headerMethod="#_0rrn8mJ-Ed-FqczH3ESmRw"

               conditionMethod="#__5rtVHLYEd-09ds9dfYpFw" initMethod="#_0rrn82J-Ed-FqczH3ESmRw"

               footerMethod="#_0rrn9WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DAYa4ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_aBZ_cCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0rrn8mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0rrn8GJ-Ed-FqczH3ESmRw/method._0rrn8mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0rrn82J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0rrn8GJ-Ed-FqczH3ESmRw/method._0rrn82J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__5rtVHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0rrn8GJ-Ed-FqczH3ESmRw/method.__5rtVHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0rrn9WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0rrn8GJ-Ed-FqczH3ESmRw/method._0rrn9WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0rroAmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0rrn8GJ-Ed-FqczH3ESmRw/method._0rroAmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DAZB80LpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DAZB9ELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DAZB9ULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DAZB9kLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DAZB90LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DAZB-ELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DAZB-ULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DAZB-kLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DAZB-0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_aDfqICSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_aDylECSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_aD8WECSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_aEGHECSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_aEZCACSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aEiL8CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aEr88CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aE-34CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_aFIo4CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aFSZ4CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DAZB_ELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DAZB_ULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_aFbj0CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_aFuewCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DAZB_kLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_aF4PwCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DAZB_0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_aGCAwCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DAZCAELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_aGU7sCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DAZB8kLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DAZCAkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_aDV5ICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_aGn2oCSWEemxeP6B0lLOpA"

                 called="#_0rroAmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0r_J8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0r_J8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.unsetGenFeature.TODO.override" headerMethod="#_0r_J8mJ-Ed-FqczH3ESmRw"

               conditionMethod="#__6keJHLYEd-09ds9dfYpFw" initMethod="#_0r_J82J-Ed-FqczH3ESmRw"

               footerMethod="#_0r_J9WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DAquwULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_aHOTkCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0r_J8mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0r_J8GJ-Ed-FqczH3ESmRw/method._0r_J8mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0r_J82J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0r_J8GJ-Ed-FqczH3ESmRw/method._0r_J82J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__6keJHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0r_J8GJ-Ed-FqczH3ESmRw/method.__6keJHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0r_J9WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0r_J8GJ-Ed-FqczH3ESmRw/method._0r_J9WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0r_KAmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0r_J8GJ-Ed-FqczH3ESmRw/method._0r_KAmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DAquyELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DAquyULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DAquykLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DAquy0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DAquzELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DAquzULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DAquzkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DAquz0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DAqu0ELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_aJT-QCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_aJdIMCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_aJm5MCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_aJ50ICSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_aKDlICSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aKWgECSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aKgRECSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aKzMACSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_aK8V8CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aLGG8CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DAqu0ULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DAqu0kLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_aLP38CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_aLiy4CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DAqu00LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_aLsj4CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DAqu1ELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_aL1t0CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DAqu1ULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_aMIowCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DAqux0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DAqu10LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_aJKNQCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_aMlUsCSWEemxeP6B0lLOpA"

                 called="#_0r_KAmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0sIT4GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0sIT4GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.TODO.override&#xA;"

               name="Class.isSetGenFeature.override" headerMethod="#_0sIT4mJ-Ed-FqczH3ESmRw"

               conditionMethod="#__8ES9HLYEd-09ds9dfYpFw" initMethod="#_0sIT42J-Ed-FqczH3ESmRw"

               footerMethod="#_0sIT5WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DA1G0ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_aNU7kCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0sIT4mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0sIT4GJ-Ed-FqczH3ESmRw/method._0sIT4mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0sIT42J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0sIT4GJ-Ed-FqczH3ESmRw/method._0sIT42J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__8ES9HLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0sIT4GJ-Ed-FqczH3ESmRw/method.__8ES9HLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0sIT5WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0sIT4GJ-Ed-FqczH3ESmRw/method._0sIT5WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0sIT8mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0sIT4GJ-Ed-FqczH3ESmRw/method._0sIT8mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DA1G2ELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DA1G2ULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DA1G2kLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DA1G20LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DA1G3ELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DA1G3ULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DA1G3kLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DA1G30LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DA1G4ELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_aPamQCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_aPkXQCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_aPthMCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_aQBDMCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_aQKNICSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aQT-ICSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aQdvICSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aQwqECSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_aQ50ACSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aRDlACSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DA1G4ULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DA1G4kLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_aRWf8CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_aRgQ8CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DA1G40LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_aRqB8CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DA1G5ELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_aRzL4CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DA1G5ULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_aSGG0CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DA1G10LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DA1G50LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_aPHrUCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_aSZo0CSWEemxeP6B0lLOpA"

                 called="#_0sIT8mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0sSE4GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.javadoc.insert&#xA;"

+          <elements xmi:id="_0sSE4GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.javadoc.insert&#xA;"

               name="Class.isSetGenFeature.javadoc.override" headerMethod="#_0sSE4mJ-Ed-FqczH3ESmRw"

               conditionMethod="#__9sqpHLYEd-09ds9dfYpFw" initMethod="#_0sSE42J-Ed-FqczH3ESmRw"

               footerMethod="#_0sSE5WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DBAF8ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_aS2UwCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0sSE4mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0sSE4GJ-Ed-FqczH3ESmRw/method._0sSE4mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0sSE42J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0sSE4GJ-Ed-FqczH3ESmRw/method._0sSE42J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__9sqpHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0sSE4GJ-Ed-FqczH3ESmRw/method.__9sqpHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0sSE5WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0sSE4GJ-Ed-FqczH3ESmRw/method._0sSE5WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0sSE8mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0sSE4GJ-Ed-FqczH3ESmRw/method._0sSE8mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DBAF-ELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DBAF-ULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DBAF-kLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DBAF-0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DBAF_ELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBAF_ULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBAF_kLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBAF_0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBAGAELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_aVFJYCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_aVO6YCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_aVYEUCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_aVq_QCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_aV0wQCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aV-hQCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aWRcMCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aWbNMCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_aWkXICSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aW3SECSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBAGAULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DBAGAkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_aXBDECSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_aXK0ECSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBAGA0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_aXdvACSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBAGBELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_aXngACSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBAGBULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_aXwp8CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DBAF90LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DBAGB0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_aUyOcCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_aYNV4CSWEemxeP6B0lLOpA"

                 called="#_0sSE8mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0sb14GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0sb14GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.isSetGenFeature.javadoc.insert" headerMethod="#_0sb14mJ-Ed-FqczH3ESmRw"

               conditionMethod="#__-mChHLYEd-09ds9dfYpFw" initMethod="#_0sb142J-Ed-FqczH3ESmRw"

               footerMethod="#_0sb15WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DBJ28ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_aYqB0CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0sb14mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0sb14GJ-Ed-FqczH3ESmRw/method._0sb14mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0sb142J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0sb14GJ-Ed-FqczH3ESmRw/method._0sb142J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="__-mChHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0sb14GJ-Ed-FqczH3ESmRw/method.__-mChHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0sb15WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0sb14GJ-Ed-FqczH3ESmRw/method._0sb15WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0sb18mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0sb14GJ-Ed-FqczH3ESmRw/method._0sb18mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DBKeBULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DBKeBkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DBKeB0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DBKeCELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DBKeCULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBKeCkLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBKeC0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBKeDELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBKeDULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_aa42cCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_abCncCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_abMYcCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_abfTYCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_abodUCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aby1YCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_acFJQCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_acO6QCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_ach1MCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_acrmMCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBKeDkLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DBKeD0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_ac0wICSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_adISICSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBKeEELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_adRcECSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBKeEULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_adbNECSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBKeEkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_aduIACSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DBKeBELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DBKeFELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_aal7gCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_aeBC8CSWEemxeP6B0lLOpA"

                 called="#_0sb18mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0sk_0GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0sk_0GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.isSetGenFeature.annotations.insert" headerMethod="#_0sk_0mJ-Ed-FqczH3ESmRw"

               conditionMethod="#___faZHLYEd-09ds9dfYpFw" initMethod="#_0sk_02J-Ed-FqczH3ESmRw"

               footerMethod="#_0sk_1WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DBXSUULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_aedu4CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0sk_0mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0sk_0GJ-Ed-FqczH3ESmRw/method._0sk_0mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0sk_02J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0sk_0GJ-Ed-FqczH3ESmRw/method._0sk_02J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="___faZHLYEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0sk_0GJ-Ed-FqczH3ESmRw/method.___faZHLYEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0sk_1WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0sk_0GJ-Ed-FqczH3ESmRw/method._0sk_1WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0sk_4mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0sk_0GJ-Ed-FqczH3ESmRw/method._0sk_4mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DBXSWELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DBXSWULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DBXSWkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DBXSW0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DBXSXELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBXSXULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBXSXkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBXSX0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBXSYELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_ahcxcCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ahvsYCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ah5dYCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_aiCnUCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_aiWJUCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aifTQCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aipEQCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ai7_MCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_ajFwMCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ajO6ICSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBXSYULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DBXSYkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_ajicICSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_ajrmECSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBXSY0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_aj1XECSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBXSZELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_akISACSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBXSZULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_akSDACSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DBXSV0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DBXSZ0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ahTAcCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_akk98CSWEemxeP6B0lLOpA"

                 called="#_0sk_4mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0suw0GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0suw0GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.isSetGenFeature.TODO.override" headerMethod="#_0suw0mJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AAYyRHLZEd-09ds9dfYpFw" initMethod="#_0suw02J-Ed-FqczH3ESmRw"

               footerMethod="#_0suw1WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DBhqYULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_alKz0CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0suw0mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0suw0GJ-Ed-FqczH3ESmRw/method._0suw0mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0suw02J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0suw0GJ-Ed-FqczH3ESmRw/method._0suw02J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AAYyRHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0suw0GJ-Ed-FqczH3ESmRw/method._AAYyRHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0suw1WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0suw0GJ-Ed-FqczH3ESmRw/method._0suw1WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0suw4mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0suw0GJ-Ed-FqczH3ESmRw/method._0suw4mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DBiRc0LpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DBiRdELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DBiRdULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DBiRdkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DBiRd0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBiReELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBiReULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBiRekLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBiRe0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_anQegCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_anjZcCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_antKcCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_an27cCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_aoAFYCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aoTnYCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aocxUCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_aomiUCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_aovsQCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_apDOQCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBiRfELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DBiRfULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_apMYMCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_apWJMCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBiRfkLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_appEICSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBiRf0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_apy1ICSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBiRgELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_ap7_ECSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DBiRckLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DBiRgkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_anHUkCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_aqYrACSWEemxeP6B0lLOpA"

                 called="#_0suw4mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0s36wGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0s36wGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.genFeature.insert" headerMethod="#_0s36wmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_ADOD1HLZEd-09ds9dfYpFw" initMethod="#_0s36w2J-Ed-FqczH3ESmRw"

               footerMethod="#_0s36xWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DBspgULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_aq1W8CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0s36wmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0s36wGJ-Ed-FqczH3ESmRw/method._0s36wmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0s36w2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0s36wGJ-Ed-FqczH3ESmRw/method._0s36w2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_ADOD1HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0s36wGJ-Ed-FqczH3ESmRw/method._ADOD1HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0s36xWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0s36wGJ-Ed-FqczH3ESmRw/method._0s36xWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0s360mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0s36wGJ-Ed-FqczH3ESmRw/method._0s360mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DBspiELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DBspiULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DBspikLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DBspi0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DBspjELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBspjULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBspjkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBspj0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DBspkELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_as7BoCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_atEyoCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_atXtkCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_atg3gCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_atqogCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_at0ZgCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_auHUcCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_auRFcCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_auaPYCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_autxYCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBspkULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DBspkkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_au27UCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_avAsUCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBspk0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_avTnQCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBsplELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_avdYQCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DBsplULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_avmiMCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DBsph0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DBspl0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_asxQoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_awDOICSWEemxeP6B0lLOpA"

                 called="#_0s360mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0tBrwGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.implementedGenOperation.TODO.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.insert&#xA;"

+          <elements xmi:id="_0tBrwGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.implementedGenOperation.TODO.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.insert&#xA;"

               name="Class.genOperation.override" headerMethod="#_0tLcwGJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AD9qtHLZEd-09ds9dfYpFw" initMethod="#_0tLcwWJ-Ed-FqczH3ESmRw"

               footerMethod="#_0tLcw2J-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DB3BkULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_awf6ECSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0tLcwGJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0tBrwGJ-Ed-FqczH3ESmRw/method._0tLcwGJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0tLcwWJ-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0tBrwGJ-Ed-FqczH3ESmRw/method._0tLcwWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AD9qtHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0tBrwGJ-Ed-FqczH3ESmRw/method._AD9qtHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0tLcw2J-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0tBrwGJ-Ed-FqczH3ESmRw/method._0tLcw2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0tLc0GJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0tBrwGJ-Ed-FqczH3ESmRw/method._0tLc0GJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DB3BmELpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DB3BmULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DB3BmkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DB3Bm0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DB3BnELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DB3BnULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DB3BnkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DB3Bn0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DB3BoELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_ayuusCSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_ay4fsCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_azCQsCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_azLaoCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_aze8oCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_azoGkCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_azx3kCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_a0EygCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_a0OjgCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_a0XtcCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DB3BoULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DB3BokLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_a0rPcCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_a00ZYCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DB3Bo0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_a0-KYCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DB3BpELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_a1HUUCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DB3BpULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_a1a2UCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DB3Bl0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DB3Bp0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_aybzwCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_a1txQCSWEemxeP6B0lLOpA"

                 called="#_0tLc0GJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0tUmsGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.javadoc.insert&#xA;"

+          <elements xmi:id="_0tUmsGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.javadoc.insert&#xA;"

               name="Class.genOperation.javadoc.override" headerMethod="#_0tUmsmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AFJ9hHLZEd-09ds9dfYpFw" initMethod="#_0tUms2J-Ed-FqczH3ESmRw"

               footerMethod="#_0tUmtWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DCBZoULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_a2TnICSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0tUmsmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0tUmsGJ-Ed-FqczH3ESmRw/method._0tUmsmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0tUms2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0tUmsGJ-Ed-FqczH3ESmRw/method._0tUms2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AFJ9hHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0tUmsGJ-Ed-FqczH3ESmRw/method._AFJ9hHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0tUmtWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0tUmsGJ-Ed-FqczH3ESmRw/method._0tUmtWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0tUmwmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0tUmsGJ-Ed-FqczH3ESmRw/method._0tUmwmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DCBZqELpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DCBZqULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DCBZqkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DCBZq0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DCBZrELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DCCAsELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DCCAsULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DCCAskLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DCCAs0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_a4ZR0CSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_a4sMwCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_a419wCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_a4_uwCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_a5SpsCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_a5casCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_a5lkoCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_a5vVoCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_a6CQkCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_a6MBkCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DCCAtELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DCCAtULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_a6e8gCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_a6otgCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DCCAtkLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_a6x3cCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DCCAt0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_a67ocCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DCCAuELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_a7OjYCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DCBZp0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DCCAukLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_a4QH4CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_a7heUCSWEemxeP6B0lLOpA"

                 called="#_0tUmwmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0toIsGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0toIsGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.genOperation.javadoc.insert" headerMethod="#_0toIsmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AG8GNHLZEd-09ds9dfYpFw" initMethod="#_0toIs2J-Ed-FqczH3ESmRw"

               footerMethod="#_0toItWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DDL3QULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_a8H7QCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0toIsmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0toIsGJ-Ed-FqczH3ESmRw/method._0toIsmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0toIs2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0toIsGJ-Ed-FqczH3ESmRw/method._0toIs2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AG8GNHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0toIsGJ-Ed-FqczH3ESmRw/method._AG8GNHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0toItWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0toIsGJ-Ed-FqczH3ESmRw/method._0toItWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0toIwmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0toIsGJ-Ed-FqczH3ESmRw/method._0toIwmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DDL3SELpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DDL3SULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DDL3SkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DDL3S0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DDL3TELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDL3TULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDL3TkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDL3T0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDL3UELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_a-Nl8CSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_a-gg4CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_a-pq0CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_a-zb0CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_a_GWwCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_a_QHwCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_a_Z4wCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_a_jCsCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_a_19oCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_a__uoCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDL3UULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DDL3UkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_bAJfoCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_bAcakCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDL3U0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_bAmLkCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDL3VELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_bA5GgCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDL3VULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_bBCQcCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DDL3R0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DDL3V0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_a-D08CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_bBVycCSWEemxeP6B0lLOpA"

                 called="#_0toIwmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0txSoGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0txSoGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.genOperation.annotations.insert" headerMethod="#_0txSomJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AIbT9HLZEd-09ds9dfYpFw" initMethod="#_0txSo2J-Ed-FqczH3ESmRw"

               footerMethod="#_0txSpWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DDW2YULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_bB7oUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0txSomJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0txSoGJ-Ed-FqczH3ESmRw/method._0txSomJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0txSo2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0txSoGJ-Ed-FqczH3ESmRw/method._0txSo2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AIbT9HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0txSoGJ-Ed-FqczH3ESmRw/method._AIbT9HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0txSpWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0txSoGJ-Ed-FqczH3ESmRw/method._0txSpWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0txSsmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0txSoGJ-Ed-FqczH3ESmRw/method._0txSsmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DDXdcULpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DDXdckLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DDXdc0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DDXddELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DDXddULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDXddkLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDXdd0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDXdeELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDXdeULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_bEBTACSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_bELEACSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_bEd-8CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_bEnI4CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_bGszkCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bG2kkCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bG_ugCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bHTQgCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_bHcacCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bHmLcCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDXdekLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DDXde0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_bH5GYCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_bIC3YCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDXdfELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_bIMBUCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDXdfULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_bIfjUCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDXdfkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_bIotQCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DDXdcELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DDXdgELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_bD3iACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_bJFZMCSWEemxeP6B0lLOpA"

                 called="#_0txSsmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0t7DoGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0t7DoGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.implementedGenOperation.TODO.override" headerMethod="#_0t7DomJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AKODtHLZEd-09ds9dfYpFw" initMethod="#_0t7Do2J-Ed-FqczH3ESmRw"

               footerMethod="#_0t7DpWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DDgnYULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_bJiFICSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0t7DomJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0t7DoGJ-Ed-FqczH3ESmRw/method._0t7DomJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0t7Do2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0t7DoGJ-Ed-FqczH3ESmRw/method._0t7Do2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AKODtHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0t7DoGJ-Ed-FqczH3ESmRw/method._AKODtHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0t7DpWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0t7DoGJ-Ed-FqczH3ESmRw/method._0t7DpWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0t7DsmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0t7DoGJ-Ed-FqczH3ESmRw/method._0t7DsmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DDhOdULpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DDhOdkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DDhOd0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DDhOeELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DDhOeULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDhOekLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDhOe0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDhOfELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDhOfULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_bLw5wCSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_bL6qwCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_bMEbwCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_bMXWsCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_bMhHsCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bMqRoCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bM0CoCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bNG9kCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_bNQukCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bNjpgCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDhOfkLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DDhOf0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_bNtagCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_bOAVcCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDhOgELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_bOKGcCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDhOgULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_bOTQYCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDhOgkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_bOmLUCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DDhOdELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DDhOhELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_bLd-0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_bPC3QCSWEemxeP6B0lLOpA"

                 called="#_0t7DsmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0uENkGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0uENkGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.genOperation.insert" headerMethod="#_0uENkmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_ALaWhHLZEd-09ds9dfYpFw" initMethod="#_0uENk2J-Ed-FqczH3ESmRw"

               footerMethod="#_0uENlWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DDrmgULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_bQGAICSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0uENkmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0uENkGJ-Ed-FqczH3ESmRw/method._0uENkmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0uENk2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0uENkGJ-Ed-FqczH3ESmRw/method._0uENk2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_ALaWhHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0uENkGJ-Ed-FqczH3ESmRw/method._ALaWhHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0uENlWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0uENkGJ-Ed-FqczH3ESmRw/method._0uENlWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0uENomJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0uENkGJ-Ed-FqczH3ESmRw/method._0uENomJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DDrmiELpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DDsNkELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DDsNkULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DDsNkkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DDsNk0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDsNlELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDsNlULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDsNlkLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DDsNl0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_bSelwCSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_bSnvsCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_bS7RsCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_bTEboCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_bTOMoCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bThHkCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bTq4kCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bT9zgCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_bUHkgCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bUafcCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDsNmELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DDsNmULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_bUjpYCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_bU3LYCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDsNmkLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_bVAVUCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDsNm0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_bVKGUCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DDsNnELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_bVdBQCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DDrmh0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DDsNnkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_bSLDwCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_bVv8MCSWEemxeP6B0lLOpA"

                 called="#_0uENomJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0uN-kGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0uN-kGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.eUnset.override" headerMethod="#_0uN-kmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AMmpVHLZEd-09ds9dfYpFw" initMethod="#_0uN-k2J-Ed-FqczH3ESmRw"

               footerMethod="#_0uN-lWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DD5B4ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_bWWZICSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0uN-kmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0uN-kGJ-Ed-FqczH3ESmRw/method._0uN-kmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0uN-k2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0uN-kGJ-Ed-FqczH3ESmRw/method._0uN-k2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AMmpVHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0uN-kGJ-Ed-FqczH3ESmRw/method._AMmpVHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0uN-lWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0uN-kGJ-Ed-FqczH3ESmRw/method._0uN-lWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0uN-oWJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0uN-kGJ-Ed-FqczH3ESmRw/method._0uN-oWJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DD5B6ELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DD5B6ULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DD5B6kLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DD5B60LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DD5B7ELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DD5B7ULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DD5B7kLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DD5B70LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_bYlNwCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_bYu-wCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_bZB5sCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_bZLqsCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bZU0oCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bZoWoCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bZxgkCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_bZ7RkCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_baOMgCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DD5o8ELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DD5o8ULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_baX9gCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_bahHcCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DD5o8kLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_ba9zYCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DD5o80LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_bbHkYCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DD5o9ELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_bbafUCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DD5B50LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DD5o9kLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_bYcD0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_bbtaQCSWEemxeP6B0lLOpA"

                 called="#_0uN-oWJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0uXvkGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0uXvkGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.eIsSet.override" headerMethod="#_0uXvkmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AN8tJHLZEd-09ds9dfYpFw" initMethod="#_0uXvk2J-Ed-FqczH3ESmRw"

               footerMethod="#_0uXvlWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DENyAULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_bcT3MCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0uXvkmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0uXvkGJ-Ed-FqczH3ESmRw/method._0uXvkmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0uXvk2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0uXvkGJ-Ed-FqczH3ESmRw/method._0uXvk2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AN8tJHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0uXvkGJ-Ed-FqczH3ESmRw/method._AN8tJHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0uXvlWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0uXvkGJ-Ed-FqczH3ESmRw/method._0uXvlWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0uXvoWJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0uXvkGJ-Ed-FqczH3ESmRw/method._0uXvoWJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DEOZEELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DEOZEULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DEOZEkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DEOZE0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DEOZFELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DEOZFULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DEOZFkLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DEOZF0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_beir0CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_be2N0CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_be_XwCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_bfJIwCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bfcDsCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bfl0sCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bfu-oCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_bgCgoCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bgLqkCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DEOZGELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DEOZGULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_bgVbkCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_bgoWgCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DEOZGkLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_bgyHgCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DEOZG0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_bg7RcCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DEOZHELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_bhOzcCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DENyB0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DEOZHkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_beZh4CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_bhhuYCSWEemxeP6B0lLOpA"

                 called="#_0uXvoWJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0ug5gGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0ug5gGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.insert" headerMethod="#_0ug5gmJ-Ed-FqczH3ESmRw" conditionMethod="#_AO_O9HLZEd-09ds9dfYpFw"

               initMethod="#_0ug5g2J-Ed-FqczH3ESmRw" footerMethod="#_0ug5hWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DEbNYULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_bh-aUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0ug5gmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0ug5gGJ-Ed-FqczH3ESmRw/method._0ug5gmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0ug5g2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0ug5gGJ-Ed-FqczH3ESmRw/method._0ug5g2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AO_O9HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0ug5gGJ-Ed-FqczH3ESmRw/method._AO_O9HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0ug5hWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0ug5gGJ-Ed-FqczH3ESmRw/method._0ug5hWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0ug5kWJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0ug5gGJ-Ed-FqczH3ESmRw/method._0ug5kWJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DEbNaELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DEbNaULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DEbNakLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DEbNa0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DEbNbELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DEbNbULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DEb0cELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DEb0cULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_bkNO8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_bkW_8CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_bkp64CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_bkzr4CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bk810CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_blPwwCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_blZhwCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_bljSwCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_blscsCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DEb0ckLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DEb0c0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_bl_-sCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_bmJIoCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DEb0dELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_bmcDkCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DEb0dULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_bml0kCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DEb0dkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_bmvlkCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DEbNZ0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DEb0eELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_bkDd8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_bnMRgCSWEemxeP6B0lLOpA"

                 called="#_0ug5kWJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_JLBM0HroEeC0XN9kbwkPYQ" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.qualifier from EMF org.e&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_JLBM0HroEeC0XN9kbwkPYQ" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.egfCustom.constructor.override" headerMethod="#_JLBM0nroEeC0XN9kbwkPYQ"

               conditionMethod="#_JLBM1HroEeC0XN9kbwkPYQ" initMethod="#_JLBM03roEeC0XN9kbwkPYQ"

               footerMethod="#_JLBM1nroEeC0XN9kbwkPYQ">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_tlIVMbBcEeSqLfQ0kalDug"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_WPQjgCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_JLBM0nroEeC0XN9kbwkPYQ" name="header" patternFilePath="templates/pattern._JLBM0HroEeC0XN9kbwkPYQ/method._JLBM0nroEeC0XN9kbwkPYQ.pt"/>

             <methods xmi:id="_JLBM03roEeC0XN9kbwkPYQ" name="init" patternFilePath="templates/pattern._JLBM0HroEeC0XN9kbwkPYQ/method._JLBM03roEeC0XN9kbwkPYQ.pt"/>

             <methods xmi:id="_JLBM1HroEeC0XN9kbwkPYQ" name="preCondition" patternFilePath="templates/pattern._JLBM0HroEeC0XN9kbwkPYQ/method._JLBM1HroEeC0XN9kbwkPYQ.pt"/>

             <methods xmi:id="_JLBM1nroEeC0XN9kbwkPYQ" name="footer" patternFilePath="templates/pattern._JLBM0HroEeC0XN9kbwkPYQ/method._JLBM1nroEeC0XN9kbwkPYQ.pt"/>

             <methods xmi:id="_JLBM4XroEeC0XN9kbwkPYQ" name="doGenerate" patternFilePath="templates/pattern._JLBM0HroEeC0XN9kbwkPYQ/method._JLBM4XroEeC0XN9kbwkPYQ.pt"/>

-            <parameters xmi:id="_tlIVOLBcEeSqLfQ0kalDug" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_tlIVObBcEeSqLfQ0kalDug" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_tlIVOrBcEeSqLfQ0kalDug" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_tlIVO7BcEeSqLfQ0kalDug" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_tlIVPLBcEeSqLfQ0kalDug" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_tlIVPbBcEeSqLfQ0kalDug" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_tlIVPrBcEeSqLfQ0kalDug" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_tlIVP7BcEeSqLfQ0kalDug" name="publicStaticFinalFlag"

+            <parameters xmi:id="_WRWOMCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_WRfYICSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_WRpJICSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_WRy6ICSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WSF1ECSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WSO_ACSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WSYwACSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_WSihACSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WS1b8CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_tlIVQLBcEeSqLfQ0kalDug" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_tlIVQbBcEeSqLfQ0kalDug" name="negativeOffsetCorrection"

+            <parameters xmi:id="_WS-l4CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_WTIW4CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_tlIVQrBcEeSqLfQ0kalDug" name="positiveOffsetCorrection"

+            <parameters xmi:id="_WTbR0CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_tlIVQ7BcEeSqLfQ0kalDug" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_WTlC0CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_tlIVRLBcEeSqLfQ0kalDug" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_WTuz0CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_tlIVN7BcEeSqLfQ0kalDug"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_tlIVRrBcEeSqLfQ0kalDug"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_WRCsMCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_WULfwCSWEemxeP6B0lLOpA"

                 called="#_JLBM4XroEeC0XN9kbwkPYQ"/>

           </elements>

-          <elements xmi:id="_C2iO4eXDEeCxnsoQRwU99Q" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.11.0.qualifier from EMF org.e&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_C2iO4eXDEeCxnsoQRwU99Q" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Class.interface.javadoc.override" headerMethod="#_C2iO4-XDEeCxnsoQRwU99Q"

               conditionMethod="#_C2iO5eXDEeCxnsoQRwU99Q" initMethod="#_C2iO5OXDEeCxnsoQRwU99Q"

               footerMethod="#_C2iO5-XDEeCxnsoQRwU99Q">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C58bskLpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_V99_MCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_C2iO4-XDEeCxnsoQRwU99Q" name="header" patternFilePath="templates/pattern._C2iO4eXDEeCxnsoQRwU99Q/method._C2iO4-XDEeCxnsoQRwU99Q.pt"/>

             <methods xmi:id="_C2iO5OXDEeCxnsoQRwU99Q" name="init" patternFilePath="templates/pattern._C2iO4eXDEeCxnsoQRwU99Q/method._C2iO5OXDEeCxnsoQRwU99Q.pt"/>

             <methods xmi:id="_C2iO5eXDEeCxnsoQRwU99Q" name="preCondition" patternFilePath="templates/pattern._C2iO4eXDEeCxnsoQRwU99Q/method._C2iO5eXDEeCxnsoQRwU99Q.pt"/>

             <methods xmi:id="_C2iO5-XDEeCxnsoQRwU99Q" name="footer" patternFilePath="templates/pattern._C2iO4eXDEeCxnsoQRwU99Q/method._C2iO5-XDEeCxnsoQRwU99Q.pt"/>

             <methods xmi:id="_C2iO9uXDEeCxnsoQRwU99Q" name="doGenerate" patternFilePath="templates/pattern._C2iO4eXDEeCxnsoQRwU99Q/method._C2iO9uXDEeCxnsoQRwU99Q.pt"/>

-            <parameters xmi:id="_C58buULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C58bukLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C58bu0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C58bvELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C58bvULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C58bvkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C58bv0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C58bwELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_WANa4CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_WAWk0CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_WAqG0CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_WAzQwCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WA9BwCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WBP8sCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WBZtsCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_WBi3oCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WBsooCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C58bwULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C58bwkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_WB_jkCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_WCJUkCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C58bw0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_WCSegCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C58bxELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_WCmAgCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C58bxULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_WCvKcCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C58buELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C58bx0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_WADp4CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_WDL2YCSWEemxeP6B0lLOpA"

                 called="#_C2iO9uXDEeCxnsoQRwU99Q"/>

           </elements>

-          <elements xmi:id="_odzp0LM-EeKd56X4hcZPSw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.annotations.insert&#xA;"

+          <elements xmi:id="_odzp0LM-EeKd56X4hcZPSw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.annotations.insert&#xA;"

               name="Class.genFeatureReified.override" headerMethod="#_odzp0rM-EeKd56X4hcZPSw"

               conditionMethod="#_odzp1LM-EeKd56X4hcZPSw" initMethod="#_odzp07M-EeKd56X4hcZPSw"

               footerMethod="#_odzp1rM-EeKd56X4hcZPSw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C6w7EULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Wg_MsCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_odzp0rM-EeKd56X4hcZPSw" name="header" patternFilePath="templates/pattern._odzp0LM-EeKd56X4hcZPSw/method._odzp0rM-EeKd56X4hcZPSw.pt"/>

             <methods xmi:id="_odzp07M-EeKd56X4hcZPSw" name="init" patternFilePath="templates/pattern._odzp0LM-EeKd56X4hcZPSw/method._odzp07M-EeKd56X4hcZPSw.pt"/>

             <methods xmi:id="_odzp1LM-EeKd56X4hcZPSw" name="preCondition" patternFilePath="templates/pattern._odzp0LM-EeKd56X4hcZPSw/method._odzp1LM-EeKd56X4hcZPSw.pt"/>

             <methods xmi:id="_odzp1rM-EeKd56X4hcZPSw" name="footer" patternFilePath="templates/pattern._odzp0LM-EeKd56X4hcZPSw/method._odzp1rM-EeKd56X4hcZPSw.pt"/>

             <methods xmi:id="_odzp6LM-EeKd56X4hcZPSw" name="doGenerate" patternFilePath="templates/pattern._odzp0LM-EeKd56X4hcZPSw/method._odzp6LM-EeKd56X4hcZPSw.pt"/>

-            <parameters xmi:id="_C6w7GELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_C6w7GULpEei0i9bcSdIGKw" name="classExtendsGenClass"

+            <parameters xmi:id="_WjOoYCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_WjhjUCSWEemxeP6B0lLOpA" name="classExtendsGenClass"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C6w7GkLpEei0i9bcSdIGKw" name="classExtendsAllGenFeatures"

+            <parameters xmi:id="_WjrUUCSWEemxeP6B0lLOpA" name="classExtendsAllGenFeatures"

                 type="java.util.List"/>

-            <parameters xmi:id="_C6w7G0LpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_C6w7HELpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C6w7HULpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C6w7HkLpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6w7H0LpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6w7IELpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6w7IULpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C6w7IkLpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_Wj0eQCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_WkHZMCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_WkRKMCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_Wka7MCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Wkt2ICSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_Wk3nICSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WlAxECSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_WlTsACSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WlddACSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6w7I0LpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C6w7JELpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_WlnOACSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_WlwX8CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6w7JULpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_WmD58CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6w7JkLpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_WmND4CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_C6w7J0LpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_WmW04CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C6w7F0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C6w7KULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_WjE3YCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Wmzg0CSWEemxeP6B0lLOpA"

                 called="#_odzp6LM-EeKd56X4hcZPSw"/>

           </elements>

+          <elements xmi:id="_WUeasCSWEemxeP6B0lLOpA" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+              name="Class.dynamicDelegation" headerMethod="#_WU7GoCSWEemxeP6B0lLOpA"

+              conditionMethod="#_WVqtgCSWEemxeP6B0lLOpA" initMethod="#_WVOBkCSWEemxeP6B0lLOpA"

+              footerMethod="#_WWQjYCSWEemxeP6B0lLOpA">

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_WUnkoCSWEemxeP6B0lLOpA"

+                name="JET"/>

+            <methods xmi:id="_WU7GoCSWEemxeP6B0lLOpA" name="header" patternFilePath="templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WU7GoCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_WVOBkCSWEemxeP6B0lLOpA" name="init" patternFilePath="templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WVOBkCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_WVqtgCSWEemxeP6B0lLOpA" name="preCondition" patternFilePath="templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WVqtgCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_WWQjYCSWEemxeP6B0lLOpA" name="footer" patternFilePath="templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WWQjYCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_WZig4CSWEemxeP6B0lLOpA" name="doGenerate" patternFilePath="templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WZig4CSWEemxeP6B0lLOpA.pt"/>

+            <parameters xmi:id="_WW3AUCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_WXAKQCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_WXTsQCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_WXc2MCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WXmnMCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WXwYMCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WYDTICSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_WYMdECSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_WYf_ECSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

+                type="java.lang.String"/>

+            <parameters xmi:id="_WYpJACSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_WYy6ACSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_WZF08CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_WZPl8CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_WZYv4CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

+                type="java.lang.String"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_WWkFYCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_WZ1b0CSWEemxeP6B0lLOpA"

+                called="#_WZig4CSWEemxeP6B0lLOpA"/>

+          </elements>

+          <elements xmi:id="_Y__lwCSWEemxeP6B0lLOpA" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+              name="Class.dynamicSetGenFeature.pre.insert" headerMethod="#_ZAcRsCSWEemxeP6B0lLOpA"

+              conditionMethod="#_ZBVCgCSWEemxeP6B0lLOpA" initMethod="#_ZA4WkCSWEemxeP6B0lLOpA"

+              footerMethod="#_ZB7fcCSWEemxeP6B0lLOpA">

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_ZASgsCSWEemxeP6B0lLOpA"

+                name="JET"/>

+            <methods xmi:id="_ZAcRsCSWEemxeP6B0lLOpA" name="header" patternFilePath="templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZAcRsCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_ZA4WkCSWEemxeP6B0lLOpA" name="init" patternFilePath="templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZA4WkCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_ZBVCgCSWEemxeP6B0lLOpA" name="preCondition" patternFilePath="templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZBVCgCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_ZB7fcCSWEemxeP6B0lLOpA" name="footer" patternFilePath="templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZB7fcCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_ZFqI4CSWEemxeP6B0lLOpA" name="doGenerate" patternFilePath="templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZFqI4CSWEemxeP6B0lLOpA.pt"/>

+            <parameters xmi:id="_ZChVUCSWEemxeP6B0lLOpA" name="setAccessorOperation"

+                type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_ZCrGUCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ZC-BQCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ZDHyQCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_ZDQ8MCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_ZDatMCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZDtoICSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZD3ZICSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZEBKICSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZEUFECSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZEd2ECSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

+                type="java.lang.String"/>

+            <parameters xmi:id="_ZEnAACSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_ZE568CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_ZFDr8CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_ZFNc8CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_ZFgX4CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

+                type="java.lang.String"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ZCYLYCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_ZFzS0CSWEemxeP6B0lLOpA"

+                called="#_ZFqI4CSWEemxeP6B0lLOpA"/>

+          </elements>

+          <elements xmi:id="_ZGGNwCSWEemxeP6B0lLOpA" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+              name="Class.dynamicSetGenFeature.post.insert" headerMethod="#_ZGZvwCSWEemxeP6B0lLOpA"

+              conditionMethod="#_ZHSgkCSWEemxeP6B0lLOpA" initMethod="#_ZG2bsCSWEemxeP6B0lLOpA"

+              footerMethod="#_ZHvMgCSWEemxeP6B0lLOpA">

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_ZGP-wCSWEemxeP6B0lLOpA"

+                name="JET"/>

+            <methods xmi:id="_ZGZvwCSWEemxeP6B0lLOpA" name="header" patternFilePath="templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZGZvwCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_ZG2bsCSWEemxeP6B0lLOpA" name="init" patternFilePath="templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZG2bsCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_ZHSgkCSWEemxeP6B0lLOpA" name="preCondition" patternFilePath="templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZHSgkCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_ZHvMgCSWEemxeP6B0lLOpA" name="footer" patternFilePath="templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZHvMgCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_ZLd18CSWEemxeP6B0lLOpA" name="doGenerate" patternFilePath="templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZLd18CSWEemxeP6B0lLOpA.pt"/>

+            <parameters xmi:id="_ZIVpcCSWEemxeP6B0lLOpA" name="setAccessorOperation"

+                type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_ZIezYCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ZIyVYCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ZI7fUCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_ZJFQUCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_ZJYLQCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZJh8QCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZJrGMCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZJ03MCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZKHyICSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ZKRjICSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

+                type="java.lang.String"/>

+            <parameters xmi:id="_ZKbUICSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_ZKkeECSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_ZK3ZACSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_ZLBKACSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_ZLK7ACSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

+                type="java.lang.String"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ZIL4cCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_ZLnm8CSWEemxeP6B0lLOpA"

+                called="#_ZLd18CSWEemxeP6B0lLOpA"/>

+          </elements>

         </libraries>

         <libraries xmi:id="_0u0bgGJ-Ed-FqczH3ESmRw" name="org.eclipse.egf.emf.pattern.model.call.Interface">

-          <elements xmi:id="_0u0bgWJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.declaredFieldGenFeature.insert&#xA;"

+          <elements xmi:id="_0u0bgWJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.declaredFieldGenFeature.insert&#xA;"

               name="Interface.declaredFieldGenFeature.override" headerMethod="#_0u0bg2J-Ed-FqczH3ESmRw"

               conditionMethod="#_AQBwxXLZEd-09ds9dfYpFw" initMethod="#_0u0bhGJ-Ed-FqczH3ESmRw"

               footerMethod="#_0u0bhmJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DExLoULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_buo9UCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0u0bg2J-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0u0bgWJ-Ed-FqczH3ESmRw/method._0u0bg2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0u0bhGJ-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0u0bgWJ-Ed-FqczH3ESmRw/method._0u0bhGJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AQBwxXLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0u0bgWJ-Ed-FqczH3ESmRw/method._AQBwxXLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0u0bhmJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0u0bgWJ-Ed-FqczH3ESmRw/method._0u0bhmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0u0bk2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0u0bgWJ-Ed-FqczH3ESmRw/method._0u0bk2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DExLqELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DExysELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DExysULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DExyskLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DExys0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DExytELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DExytULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DExytkLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DExyt0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_bw3x8CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_bxBi8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_bxUd4CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_bxeO4CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_bxxJ0CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bx660CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_byEEwCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_byW_sCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_bygwsCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_byqhsCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DExyuELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DExyuULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_by9coCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_bzHNoCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DExyukLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_bzQXkCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DExyu0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_bzj5kCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DExyvELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_bztDgCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DExLp0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DExyvkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_bwuoACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_b0JvcCSWEemxeP6B0lLOpA"

                 called="#_0u0bk2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0vHWcGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0vHWcGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.declaredFieldGenFeature.insert" headerMethod="#_0vHWcmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_ARX0lHLZEd-09ds9dfYpFw" initMethod="#_0vHWc2J-Ed-FqczH3ESmRw"

               footerMethod="#_0vHWdWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DE9_8ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_b0mbYCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0vHWcmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0vHWcGJ-Ed-FqczH3ESmRw/method._0vHWcmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0vHWc2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0vHWcGJ-Ed-FqczH3ESmRw/method._0vHWc2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_ARX0lHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0vHWcGJ-Ed-FqczH3ESmRw/method._ARX0lHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0vHWdWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0vHWcGJ-Ed-FqczH3ESmRw/method._0vHWdWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0vHWgmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0vHWcGJ-Ed-FqczH3ESmRw/method._0vHWgmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DE9_-ELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DE9_-ULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DE9_-kLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DE9_-0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DE9__ELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DE9__ULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DE9__kLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DE9__0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DE-AAELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_b2sGECSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_b2_BACSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_b3IyACSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_b3R78CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_b3k24CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_b3un4CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_b34Y4CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_b4Bi0CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_b4VE0CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_b4eOwCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DE-AAULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DE-AAkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_b4n_wCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_b466sCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DE-AA0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_b5ErsCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DE-ABELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_b5N1oCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DE-ABULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_b5XmoCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DE9_90LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DE-AB0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_b2iVECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_b50SkCSWEemxeP6B0lLOpA"

                 called="#_0vHWgmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0vQgYGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0vQgYGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.reflectiveDelegation.override" headerMethod="#_0vQgYmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_ASkHZHLZEd-09ds9dfYpFw" initMethod="#_0vQgY2J-Ed-FqczH3ESmRw"

               footerMethod="#_0vQgZWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DGPLQULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_cGCJoCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0vQgYmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0vQgYGJ-Ed-FqczH3ESmRw/method._0vQgYmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0vQgY2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0vQgYGJ-Ed-FqczH3ESmRw/method._0vQgY2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_ASkHZHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0vQgYGJ-Ed-FqczH3ESmRw/method._ASkHZHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0vQgZWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0vQgYGJ-Ed-FqczH3ESmRw/method._0vQgZWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0vQgcWJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0vQgYGJ-Ed-FqczH3ESmRw/method._0vQgcWJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DGPLSELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DGPLSULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DGPLSkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DGPLS0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DGPLTELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DGPLTULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DGPLTkLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DGPLT0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_cIQ-QCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_cIavQCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_cItqMCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_cI3bMCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cJBMMCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cJUHICSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cJdRECSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_cJnCECSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cJwzECSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DGPLUELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DGPLUULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_cKDuACSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_cKNfACSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DGPLUkLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_cKgZ8CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DGPLU0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_cKpj4CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DGPLVELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_cKzU4CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DGPLR0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DGPLVkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_cIH0UCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_cLQA0CSWEemxeP6B0lLOpA"

                 called="#_0vQgcWJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0vaRYGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeature.insert&#xA;"

+          <elements xmi:id="_0vaRYGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeature.insert&#xA;"

               name="Interface.genFeature.override" headerMethod="#_0vaRYmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AUpyFHLZEd-09ds9dfYpFw" initMethod="#_0vaRY2J-Ed-FqczH3ESmRw"

               footerMethod="#_0vaRZWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DHVXcULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_crb8wCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0vaRYmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0vaRYGJ-Ed-FqczH3ESmRw/method._0vaRYmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0vaRY2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0vaRYGJ-Ed-FqczH3ESmRw/method._0vaRY2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AUpyFHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0vaRYGJ-Ed-FqczH3ESmRw/method._AUpyFHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0vaRZWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0vaRYGJ-Ed-FqczH3ESmRw/method._0vaRZWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0vaRcmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0vaRYGJ-Ed-FqczH3ESmRw/method._0vaRcmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DHVXeELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DHV-gELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DHV-gULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DHV-gkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DHV-g0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHV-hELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHV-hULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHV-hkLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHV-h0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_ctqxYCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ct0iYCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ct-TYCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_cuROUCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_cua_UCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cukJQCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cut6QCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cvA1MCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_cvKmMCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cvTwICSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHV-iELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DHV-iULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_cvnSICSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_cvwcECSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHV-ikLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_cv6NECSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHV-i0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_cwNIACSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHV-jELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_cwW5ACSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DHVXd0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DHV-jkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ctX2cCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_cwzk8CSWEemxeP6B0lLOpA"

                 called="#_0vaRcmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0vkCYGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0vkCYGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.TODO.override&#xA;"

               name="Interface.getGenFeature.override" headerMethod="#_0vkCYmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AWlrxHLZEd-09ds9dfYpFw" initMethod="#_0vkCY2J-Ed-FqczH3ESmRw"

               footerMethod="#_0vkCZWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DHgWkULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_cxPp0CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0vkCYmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0vkCYGJ-Ed-FqczH3ESmRw/method._0vkCYmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0vkCY2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0vkCYGJ-Ed-FqczH3ESmRw/method._0vkCY2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AWlrxHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0vkCYGJ-Ed-FqczH3ESmRw/method._AWlrxHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0vkCZWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0vkCYGJ-Ed-FqczH3ESmRw/method._0vkCZWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0vkCcmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0vkCYGJ-Ed-FqczH3ESmRw/method._0vkCcmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DHg9pELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DHg9pULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DHg9pkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DHg9p0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DHg9qELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHg9qULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHg9qkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHg9q0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHg9rELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_czfFgCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_czoPcCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_cz7xcCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_c0E7YCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_c0OsYCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_c0hnUCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_c0rYUCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_c00iQCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_c1IEQCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_c1ROMCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHg9rULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DHg9rkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_c1a_MCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_c1t6ICSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHg9r0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_c13rICSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHg9sELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_c2A1ECSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHg9sULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_c2xDACSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DHg9o0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DHg9s0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_czVUgCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_c3NH4CSWEemxeP6B0lLOpA"

                 called="#_0vkCcmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0vtMUGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.javadoc.insert&#xA;"

+          <elements xmi:id="_0vtMUGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.javadoc.insert&#xA;"

               name="Interface.getGenFeature.javadoc.override" headerMethod="#_0vtMUmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AXx-lHLZEd-09ds9dfYpFw" initMethod="#_0vtMU2J-Ed-FqczH3ESmRw"

               footerMethod="#_0vtMVWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DHtx8ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_c3pz0CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0vtMUmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0vtMUGJ-Ed-FqczH3ESmRw/method._0vtMUmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0vtMU2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0vtMUGJ-Ed-FqczH3ESmRw/method._0vtMU2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AXx-lHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0vtMUGJ-Ed-FqczH3ESmRw/method._AXx-lHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0vtMVWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0vtMUGJ-Ed-FqczH3ESmRw/method._0vtMVWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0vtMYmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0vtMUGJ-Ed-FqczH3ESmRw/method._0vtMYmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DHuZBULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DHuZBkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DHuZB0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DHuZCELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DHuZCULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHuZCkLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHuZC0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHuZDELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHuZDULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_c55PgCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_c6CZcCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_c6MKcCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_c6fFYCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_c6o2YCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_c6ynYCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_c7FiUCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_c7OsQCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_c7YdQCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_c7rYMCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHuZDkLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DHuZD0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_c71JMCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_c7-6MCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHuZEELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_c8R1ICSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHuZEULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_c8a_ECSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHuZEkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_c8kwECSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DHuZBELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DHuZFELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_c5ltgCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_c9BcACSWEemxeP6B0lLOpA"

                 called="#_0vtMYmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0wJ4QGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0wJ4QGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.getGenFeature.javadoc.insert" headerMethod="#_0wJ4QmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AZkHRHLZEd-09ds9dfYpFw" initMethod="#_0wJ4Q2J-Ed-FqczH3ESmRw"

               footerMethod="#_0wJ4RWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DH4KAULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_c9eH8CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0wJ4QmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0wJ4QGJ-Ed-FqczH3ESmRw/method._0wJ4QmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0wJ4Q2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0wJ4QGJ-Ed-FqczH3ESmRw/method._0wJ4Q2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AZkHRHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0wJ4QGJ-Ed-FqczH3ESmRw/method._AZkHRHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0wJ4RWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0wJ4QGJ-Ed-FqczH3ESmRw/method._0wJ4RWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0wJ4UmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0wJ4QGJ-Ed-FqczH3ESmRw/method._0wJ4UmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DH4KCELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DH4KCULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DH4KCkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DH4KC0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DH4KDELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DH4KDULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DH4KDkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DH4KD0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DH4KEELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_c_s8kCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_c_2tkCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_dAJogCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_dATZgCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_dAmUcCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dAwFcCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dA5PYCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dBMKUCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_dBV7UCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dBfsUCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DH4KEULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DH4KEkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_dBynQCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_dB8YQCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DH4KE0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_dCPTMCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DH4KFELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_dCYdICSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DH4KFULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_dCiOICSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DH4KB0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DH4KF0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_c_jyoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_dC-6ECSWEemxeP6B0lLOpA"

                 called="#_0wJ4UmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0wTpQGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0wTpQGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.getGenFeature.annotations.insert" headerMethod="#_0wTpQmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AawaFHLZEd-09ds9dfYpFw" initMethod="#_0wTpQ2J-Ed-FqczH3ESmRw"

               footerMethod="#_0wTpRWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DGoz4ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_cS2doCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0wTpQmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0wTpQGJ-Ed-FqczH3ESmRw/method._0wTpQmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0wTpQ2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0wTpQGJ-Ed-FqczH3ESmRw/method._0wTpQ2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AawaFHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0wTpQGJ-Ed-FqczH3ESmRw/method._AawaFHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0wTpRWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0wTpQGJ-Ed-FqczH3ESmRw/method._0wTpRWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0wTpUmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0wTpQGJ-Ed-FqczH3ESmRw/method._0wTpUmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DGoz6ELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DGoz6ULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DGoz6kLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DGoz60LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DGoz7ELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DGoz7ULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DGoz7kLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DGoz70LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DGoz8ELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_cVPDQCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_cVY0QCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_cVh-MCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_cV05ICSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_cV-qICSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cWIbICSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cWbWECSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cWlHECSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_cWuRACSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cW4CACSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DGoz8ULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DGoz8kLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_cXK88CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_cXUt8CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DGoz80LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_cXd34CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DGoz9ELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_cXxZ4CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DGoz9ULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_cX6j0CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DGoz50LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DGoz90LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_cU8IUCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_cYXPwCSWEemxeP6B0lLOpA"

                 called="#_0wTpUmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0wczMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0wczMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.getGenFeature.pre.insert" headerMethod="#_0wczMmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_Ab8s5HLZEd-09ds9dfYpFw" initMethod="#_0wczM2J-Ed-FqczH3ESmRw"

               footerMethod="#_0wczNWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DG1oMULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_cYz7sCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0wczMmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0wczMGJ-Ed-FqczH3ESmRw/method._0wczMmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0wczM2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0wczMGJ-Ed-FqczH3ESmRw/method._0wczM2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_Ab8s5HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0wczMGJ-Ed-FqczH3ESmRw/method._Ab8s5HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0wczNWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0wczMGJ-Ed-FqczH3ESmRw/method._0wczNWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0wczQmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0wczMGJ-Ed-FqczH3ESmRw/method._0wczQmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DG1oOELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DG1oOULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DG1oOkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DG1oO0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DG1oPELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DG1oPULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DG1oPkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DG1oP0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DG1oQELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_cbMhUCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_cbfcQCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_cbpNQCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_cb8IMCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_ccF5MCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ccPDICSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ccY0ICSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ccrvECSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_cc-qACSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cdIbACSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DG1oQULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DG1oQkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_cdSMACSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_cdlG8CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DG1oQ0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_cdu38CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DG1oRELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_cd4B4CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DG1oRULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_ceLj4CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DG1oN0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DG1oR0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ca5mYCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_cenowCSWEemxeP6B0lLOpA"

                 called="#_0wczQmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0wmkMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0wmkMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.getGenFeature.TODO.override" headerMethod="#_0wmkMmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AdvcpHLZEd-09ds9dfYpFw" initMethod="#_0wmkM2J-Ed-FqczH3ESmRw"

               footerMethod="#_0wmkNWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DIE-UULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_dDkv8CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0wmkMmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0wmkMGJ-Ed-FqczH3ESmRw/method._0wmkMmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0wmkM2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0wmkMGJ-Ed-FqczH3ESmRw/method._0wmkM2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AdvcpHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0wmkMGJ-Ed-FqczH3ESmRw/method._AdvcpHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0wmkNWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0wmkMGJ-Ed-FqczH3ESmRw/method._0wmkNWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0wmkQmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0wmkMGJ-Ed-FqczH3ESmRw/method._0wmkQmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DIFlZELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DIFlZULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DIFlZkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DIFlZ0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DIFlaELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIFlaULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIFlakLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIFla0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIFlbELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_dF0LoCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_dF9VkCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_dGHGkCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_dGaBgCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_dGjygCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dGtjgCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dHAecCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dHJoYCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_dHdKYCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dHmUUCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIFlbULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DIFlbkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_dHwFUCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_dIDAQCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIFlb0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_dIMxQCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIFlcELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_dIV7MCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIFlcULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_dIpdMCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DIFlY0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DIFlc0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_dFhQsCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_dI8YICSWEemxeP6B0lLOpA"

                 called="#_0wmkQmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0wwVMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0wwVMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.TODO.override&#xA;"

               name="Interface.basicGetGenFeature.override" headerMethod="#_0wwVMmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AfhlVHLZEd-09ds9dfYpFw" initMethod="#_0wwVM2J-Ed-FqczH3ESmRw"

               footerMethod="#_0wwVNWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DIPWYULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_dJiOACSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0wwVMmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0wwVMGJ-Ed-FqczH3ESmRw/method._0wwVMmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0wwVM2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0wwVMGJ-Ed-FqczH3ESmRw/method._0wwVM2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AfhlVHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0wwVMGJ-Ed-FqczH3ESmRw/method._AfhlVHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0wwVNWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0wwVMGJ-Ed-FqczH3ESmRw/method._0wwVNWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0wwVQmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0wwVMGJ-Ed-FqczH3ESmRw/method._0wwVQmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DIPWaELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DIPWaULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DIPWakLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DIPWa0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DIPWbELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIPWbULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIPWbkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIPWb0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIPWcELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_dLxpsCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_dL6zoCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_dMOVoCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_dMXfkCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_dMhQkCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dM0LgCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dM98gCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dNHGcCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_dNaocCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dNjyYCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIPWcULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DIPWckLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_dNtjYCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_dOAeUCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIPWc0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_dOKPUCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIPWdELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_dOTZQCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIPWdULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_dOm7QCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DIPWZ0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DIPWd0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_dLn4sCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_dO52MCSWEemxeP6B0lLOpA"

                 called="#_0wwVQmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0w5fIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0w5fIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.basicGetGenFeature.annotations.insert" headerMethod="#_0w5fImJ-Ed-FqczH3ESmRw"

               conditionMethod="#_Ag3pJHLZEd-09ds9dfYpFw" initMethod="#_0w5fI2J-Ed-FqczH3ESmRw"

               footerMethod="#_0w5fJWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DIZucULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_dPfsECSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0w5fImJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0w5fIGJ-Ed-FqczH3ESmRw/method._0w5fImJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0w5fI2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0w5fIGJ-Ed-FqczH3ESmRw/method._0w5fI2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_Ag3pJHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0w5fIGJ-Ed-FqczH3ESmRw/method._Ag3pJHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0w5fJWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0w5fIGJ-Ed-FqczH3ESmRw/method._0w5fJWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0w5fMmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0w5fIGJ-Ed-FqczH3ESmRw/method._0w5fMmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DIZueELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DIZueULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DIZuekLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DIZue0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DIZufELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIZufULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIZufkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIZuf0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIZugELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_dRvHwCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_dR4RsCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_dSLzsCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_dSU9oCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_dSeuoCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dSxpkCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dS7akCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dTOVgCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_dTYGgCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dThQcCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIZugULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DIZugkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_dT0ycCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_dT98YCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIZug0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_dUHtYCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIZuhELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_dUaoUCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIZuhULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_dUkZUCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DIZud0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DIZuh0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_dRcM0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_dVBFQCSWEemxeP6B0lLOpA"

                 called="#_0w5fMmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0xDQIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0xDQIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.basicGetGenFeature.pre.insert" headerMethod="#_0xDQImJ-Ed-FqczH3ESmRw"

               conditionMethod="#_Ah6K9HLZEd-09ds9dfYpFw" initMethod="#_0xDQI2J-Ed-FqczH3ESmRw"

               footerMethod="#_0xDQJWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DImiwULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_dVdKICSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0xDQImJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0xDQIGJ-Ed-FqczH3ESmRw/method._0xDQImJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0xDQI2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0xDQIGJ-Ed-FqczH3ESmRw/method._0xDQI2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_Ah6K9HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0xDQIGJ-Ed-FqczH3ESmRw/method._Ah6K9HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0xDQJWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0xDQIGJ-Ed-FqczH3ESmRw/method._0xDQJWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0xDQMmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0xDQIGJ-Ed-FqczH3ESmRw/method._0xDQMmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DImiyELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DImiyULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DImiykLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DImiy0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DImizELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DImizULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DImizkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DImiz0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DImi0ELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_dXsl0CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_dX1vwCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_dYJRwCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_dYSbsCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_dYcMsCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dYvHoCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dY44oCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dZLzkCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_dZVkkCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dZeugCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DImi0ULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DImi0kLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_dZyQgCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_dZ7acCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DImi00LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_daFLcCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DImi1ELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_daYGYCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DImi1ULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_dah3YCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DImix0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DImi10LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_dXi00CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_da-jUCSWEemxeP6B0lLOpA"

                 called="#_0xDQMmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0xNBIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0xNBIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.basicGetGenFeature.TODO.override" headerMethod="#_0xNBImJ-Ed-FqczH3ESmRw"

               conditionMethod="#_Aizi1HLZEd-09ds9dfYpFw" initMethod="#_0xNBI2J-Ed-FqczH3ESmRw"

               footerMethod="#_0xNBJWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DIywAULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_dbbPQCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0xNBImJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0xNBIGJ-Ed-FqczH3ESmRw/method._0xNBImJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0xNBI2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0xNBIGJ-Ed-FqczH3ESmRw/method._0xNBI2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_Aizi1HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0xNBIGJ-Ed-FqczH3ESmRw/method._Aizi1HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0xNBJWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0xNBIGJ-Ed-FqczH3ESmRw/method._0xNBJWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0xNBMmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0xNBIGJ-Ed-FqczH3ESmRw/method._0xNBMmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DIzXEkLpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DIzXE0LpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DIzXFELpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DIzXFULpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DIzXFkLpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIzXF0LpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIzXGELpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIzXGULpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DIzXGkLpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_deZqwCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_dejbwCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_deslsCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_dfAHsCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_dfJRoCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dfTCoCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dfl9kCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dfvukCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_dgCpgCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dgMagCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIzXG0LpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DIzXHELpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_dgVkcCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_dgofYCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIzXHULpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_dgyQYCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIzXHkLpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_dg8BYCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DIzXH0LpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_dhO8UCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DIzXEULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DIzXIULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_deGv0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_dhroQCSWEemxeP6B0lLOpA"

                 called="#_0xNBMmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0xWLEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0xWLEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.TODO.override&#xA;"

               name="Interface.basicSetGenFeature.override" headerMethod="#_0xWLEmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_Aj_1pHLZEd-09ds9dfYpFw" initMethod="#_0xWLE2J-Ed-FqczH3ESmRw"

               footerMethod="#_0xWLFWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DJALYULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_diIUMCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0xWLEmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0xWLEGJ-Ed-FqczH3ESmRw/method._0xWLEmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0xWLE2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0xWLEGJ-Ed-FqczH3ESmRw/method._0xWLE2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_Aj_1pHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0xWLEGJ-Ed-FqczH3ESmRw/method._Aj_1pHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0xWLFWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0xWLEGJ-Ed-FqczH3ESmRw/method._0xWLFWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0xWLImJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0xWLEGJ-Ed-FqczH3ESmRw/method._0xWLImJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DJALaELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DJALaULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DJALakLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DJALa0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DJALbELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJALbULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJALbkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJALb0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJALcELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_dkXI0CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_dkqDwCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_dkz0wCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_dlGvsCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_dlQgsCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dlZqoCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dltMoCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dl2WkCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_dmJ4kCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dmTCgCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJALcULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DJALckLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_dmczgCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_dmvucCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJALc0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_dm5fcCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJALdELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_dnMaYCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJALdULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_dnWLYCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DJALZ0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DJALd0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_dkNX0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_dnyQQCSWEemxeP6B0lLOpA"

                 called="#_0xWLImJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0xpGAGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0xpGAGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.basicSetGenFeature.annotations.insert" headerMethod="#_0xpGAmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AmYbRHLZEd-09ds9dfYpFw" initMethod="#_0xpGA2J-Ed-FqczH3ESmRw"

               footerMethod="#_0xpGBWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DHAnUULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_cfEUsCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0xpGAmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0xpGAGJ-Ed-FqczH3ESmRw/method._0xpGAmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0xpGA2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0xpGAGJ-Ed-FqczH3ESmRw/method._0xpGA2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AmYbRHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0xpGAGJ-Ed-FqczH3ESmRw/method._AmYbRHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0xpGBWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0xpGAGJ-Ed-FqczH3ESmRw/method._0xpGBWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0xpGEmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0xpGAGJ-Ed-FqczH3ESmRw/method._0xpGEmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DHBOY0LpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DHBOZELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DHBOZULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DHBOZkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DHBOZ0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHBOaELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHBOaULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHBOakLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHBOa0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_chTwYCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_chc6UCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_chv1QCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_ch5mQCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_ciMhMCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ciWSMCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cipNICSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ciy-ICSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_ci8IECSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cjPqECSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHBObELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DHBObULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_cjY0ACSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_cjilACSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHBObkLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_cj1f8CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHBOb0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_cj_Q8CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHBOcELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_ckSL4CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DHBOYkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DHBOckLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_chJ_YCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_cklG0CSWEemxeP6B0lLOpA"

                 called="#_0xpGEmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0xy3AGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0xy3AGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.basicSetGenFeature.pre.insert" headerMethod="#_0xy3AmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AsC-ZHLZEd-09ds9dfYpFw" initMethod="#_0xy3A2J-Ed-FqczH3ESmRw"

               footerMethod="#_0xy3BWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DJQqEULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_doPjQCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0xy3AmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0xy3AGJ-Ed-FqczH3ESmRw/method._0xy3AmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0xy3A2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0xy3AGJ-Ed-FqczH3ESmRw/method._0xy3A2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AsC-ZHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0xy3AGJ-Ed-FqczH3ESmRw/method._AsC-ZHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0xy3BWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0xy3AGJ-Ed-FqczH3ESmRw/method._0xy3BWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0xy3EmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0xy3AGJ-Ed-FqczH3ESmRw/method._0xy3EmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DJQqGELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DJQqGULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DJQqGkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DJQqG0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DJQqHELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJQqHULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJQqHkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJQqH0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJQqIELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_dqeX4CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_dqxS0CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_dq7D0CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_drN-wCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_drXvwCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_drg5sCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_drz0oCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dr9loCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_dsHWoCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dsaRkCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJQqIULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DJQqIkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_dsjbgCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_dstMgCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJQqI0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_dtAHcCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJQqJELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_dtJ4cCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJQqJULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_dtTpcCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DJQqF0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DJQqJ0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_dqUm4CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_dtvuUCSWEemxeP6B0lLOpA"

                 called="#_0xy3EmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0x8oAGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0x8oAGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.basicSetGenFeature.post.insert" headerMethod="#_0x8oAmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AtPRNHLZEd-09ds9dfYpFw" initMethod="#_0x8oA2J-Ed-FqczH3ESmRw"

               footerMethod="#_0x8oBWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DJkMEULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_duMaQCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0x8oAmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0x8oAGJ-Ed-FqczH3ESmRw/method._0x8oAmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0x8oA2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0x8oAGJ-Ed-FqczH3ESmRw/method._0x8oA2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AtPRNHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0x8oAGJ-Ed-FqczH3ESmRw/method._AtPRNHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0x8oBWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0x8oAGJ-Ed-FqczH3ESmRw/method._0x8oBWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0x8oEmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0x8oAGJ-Ed-FqczH3ESmRw/method._0x8oEmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DJkMGELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DJkMGULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DJkMGkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DJkMG0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DJkMHELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJkMHULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJkMHkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJkMH0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJkMIELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_dwk_4CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_dwuw4CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_dxBr0CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_dxLc0CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_dxUmwCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dxoIwCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dxxSsCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dx7DsCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_dyN-oCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_dyXvoCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJkMIULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DJkMIkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_dyqqkCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_dy0bkCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJkMI0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_dy9lgCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJkMJELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_dzRHgCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJkMJULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_dzaRcCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DJkMF0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DJkzIULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_dwSE8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_dz29YCSWEemxeP6B0lLOpA"

                 called="#_0x8oEmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0x8oFGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0x8oFGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.basicSetGenFeature.TODO.override" headerMethod="#_0x8oFmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_Aukt9HLZEd-09ds9dfYpFw" initMethod="#_0x8oF2J-Ed-FqczH3ESmRw"

               footerMethod="#_0x8oGWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DJ3HAULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_d0TpUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0x8oFmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0x8oFGJ-Ed-FqczH3ESmRw/method._0x8oFmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0x8oF2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0x8oFGJ-Ed-FqczH3ESmRw/method._0x8oF2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_Aukt9HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0x8oFGJ-Ed-FqczH3ESmRw/method._Aukt9HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0x8oGWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0x8oFGJ-Ed-FqczH3ESmRw/method._0x8oGWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0yFx-2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0x8oFGJ-Ed-FqczH3ESmRw/method._0yFx-2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DJ3uFULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DJ3uFkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DJ3uF0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DJ3uGELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DJ3uGULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJ3uGkLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJ3uG0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJ3uHELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DJ3uHULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_d2id8CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_d2sO8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_d2_J4CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_d3I64CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_d3b10CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_d3lm0CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_d3uwwCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_d4CSwCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_d4LcsCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_d4eXoCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJ3uHkLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DJ3uH0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_d4oIoCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_d4x5oCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJ3uIELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_d5E0kCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJ3uIULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_d5OlkCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DJ3uIkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_d5XvgCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DJ3uFELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DJ3uJELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_d2ZUACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_d50bcCSWEemxeP6B0lLOpA"

                 called="#_0yFx-2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0yPi8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0yPi8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.dynamicSetGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.dynamicSetGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.post.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.TODO.override&#xA;"

               name="Interface.setGenFeature.override" headerMethod="#_0yPi8mJ-Ed-FqczH3ESmRw"

               conditionMethod="#_AvxAxHLZEd-09ds9dfYpFw" initMethod="#_0yPi82J-Ed-FqczH3ESmRw"

               footerMethod="#_0yPi9WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DKCtMULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_d6a4YCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0yPi8mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0yPi8GJ-Ed-FqczH3ESmRw/method._0yPi8mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0yPi82J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0yPi8GJ-Ed-FqczH3ESmRw/method._0yPi82J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_AvxAxHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0yPi8GJ-Ed-FqczH3ESmRw/method._AvxAxHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0yPi9WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0yPi8GJ-Ed-FqczH3ESmRw/method._0yPi9WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0yPjAmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0yPi8GJ-Ed-FqczH3ESmRw/method._0yPjAmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DKDURULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DKDURkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DKDUR0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DKDUSELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DKDUSULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKDUSkLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKDUS0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKDUTELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKDUTULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_d8ptACSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_d8zeACSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_d9GY8CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_d9Pi4CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_d9ZT4CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_d9sO0CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_d91_0CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_d-I6wCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_d-SrwCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_d-b1sCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKDUTkLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DKDUT0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_d-vXsCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_d-4hoCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKDUUELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_d_CSoCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKDUUULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_d_VNkCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKDUUkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_d_e-kCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DKDURELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DKDUVELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_d8f8ACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_d_7qgCSWEemxeP6B0lLOpA"

                 called="#_0yPjAmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0yZT8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.javadoc.insert&#xA;"

+          <elements xmi:id="_0yZT8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.javadoc.insert&#xA;"

               name="Interface.setGenFeature.javadoc.override" headerMethod="#_0yZT8mJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BAT-NHLZEd-09ds9dfYpFw" initMethod="#_0yZT82J-Ed-FqczH3ESmRw"

               footerMethod="#_0yZT9WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DKOTYULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_eAhgYCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0yZT8mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0yZT8GJ-Ed-FqczH3ESmRw/method._0yZT8mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0yZT82J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0yZT8GJ-Ed-FqczH3ESmRw/method._0yZT82J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BAT-NHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0yZT8GJ-Ed-FqczH3ESmRw/method._BAT-NHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0yZT9WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0yZT8GJ-Ed-FqczH3ESmRw/method._0yZT9WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0yZUAmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0yZT8GJ-Ed-FqczH3ESmRw/method._0yZUAmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DKO6cULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DKO6ckLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DKO6c0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DKO6dELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DKO6dULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKO6dkLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKO6d0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKO6eELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKO6eULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_eDNoACSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_eDgi8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_eDps4CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_eD9O4CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_eEGY0CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eEZ60CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eEjEwCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eE1_sCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_eE_wsCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eFJhsCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKO6ekLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DKO6e0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_eFccoCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_eFmNoCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKO6fELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_eFvXkCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKO6fULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_eGCSgCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKO6fkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_eGMDgCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DKO6cELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DKO6gELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_eDD3ACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_eGovcCSWEemxeP6B0lLOpA"

                 called="#_0yZUAmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0yid4GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0yid4GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.setGenFeature.javadoc.insert" headerMethod="#_0yid4mJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BGamNHLZEd-09ds9dfYpFw" initMethod="#_0yid42J-Ed-FqczH3ESmRw"

               footerMethod="#_0yid5WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DKYrcULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_eHFbYCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0yid4mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0yid4GJ-Ed-FqczH3ESmRw/method._0yid4mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0yid42J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0yid4GJ-Ed-FqczH3ESmRw/method._0yid42J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BGamNHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0yid4GJ-Ed-FqczH3ESmRw/method._BGamNHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0yid5WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0yid4GJ-Ed-FqczH3ESmRw/method._0yid5WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0yid8mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0yid4GJ-Ed-FqczH3ESmRw/method._0yid8mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DKYreELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DKYreULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DKYrekLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DKYre0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DKYrfELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKYrfULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKYrfkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKYrf0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKYrgELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_eJUQACSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_eJeBACSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_eJw78CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_eJ6s8CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_eKD24CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eKXY4CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eKgi0CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eKqT0CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_eK9OwCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eLG_wCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKYrgULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DKYrgkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_eLZ6sCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_eLjrsCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKYrg0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_eLs1oCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKYrhELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_eL_wkCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKYrhULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_eMJhkCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DKYrd0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DKYrh0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_eJLGECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_eMmNgCSWEemxeP6B0lLOpA"

                 called="#_0yid8mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0ysO4GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0ysO4GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.setGenFeature.annotations.insert" headerMethod="#_0ysO4mJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BH6bBHLZEd-09ds9dfYpFw" initMethod="#_0ysO42J-Ed-FqczH3ESmRw"

               footerMethod="#_0ysO5WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DHK_YULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_clLjwCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0ysO4mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0ysO4GJ-Ed-FqczH3ESmRw/method._0ysO4mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0ysO42J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0ysO4GJ-Ed-FqczH3ESmRw/method._0ysO42J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BH6bBHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0ysO4GJ-Ed-FqczH3ESmRw/method._BH6bBHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0ysO5WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0ysO4GJ-Ed-FqczH3ESmRw/method._0ysO5WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0ysO8mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0ysO4GJ-Ed-FqczH3ESmRw/method._0ysO8mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DHK_aELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DHK_aULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DHK_akLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DHK_a0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DHK_bELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHK_bULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHK_bkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHK_b0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DHK_cELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_cnkJYCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_cntTUCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_coA1UCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_coJ_QCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_coTwQCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_comrMCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cowcMCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cpDXICSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_cpNIICSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cpWSECSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHK_cULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DHK_ckLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_cpp0ECSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_cpy-ACSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHK_c0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_cqF48CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHK_dELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_cqPp8CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DHK_dULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_cqZa8CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DHK_Z0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DHK_d0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_cnaYYCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_cq2G4CSWEemxeP6B0lLOpA"

                 called="#_0ysO8mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0y1Y0GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0y1Y0GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.setGenFeature.pre.insert" headerMethod="#_0y1Y0mJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BI881HLZEd-09ds9dfYpFw" initMethod="#_0y1Y02J-Ed-FqczH3ESmRw"

               footerMethod="#_0y1Y1WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DKiccULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_eNV0YCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0y1Y0mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0y1Y0GJ-Ed-FqczH3ESmRw/method._0y1Y0mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0y1Y02J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0y1Y0GJ-Ed-FqczH3ESmRw/method._0y1Y02J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BI881HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0y1Y0GJ-Ed-FqczH3ESmRw/method._BI881HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0y1Y1WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0y1Y0GJ-Ed-FqczH3ESmRw/method._0y1Y1WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0y1Y42J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0y1Y0GJ-Ed-FqczH3ESmRw/method._0y1Y42J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DKiceELpEei0i9bcSdIGKw" name="setAccessorOperation"

+            <parameters xmi:id="_ePkpACSWEemxeP6B0lLOpA" name="setAccessorOperation"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DKiceULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DKicekLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DKice0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DKicfELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DKicfULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKjDgELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKjDgULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKjDgkLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKjDg0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_eP4LACSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_eQBU8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_eQLF8CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_eQeA4CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_eQnx4CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eQ6s0CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eREd0CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eRNnwCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_eRhJwCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eRqTsCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKjDhELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DKjDhULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_eR0EsCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_eSG_oCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKjDhkLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_eSQwoCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKjDh0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_eSjrkCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKjDiELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_eStckCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DKicd0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DKjDikLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ePbfECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_eTJhcCSWEemxeP6B0lLOpA"

                 called="#_0y1Y42J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0y_J0GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0y_J0GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.setGenFeature.post.insert" headerMethod="#_0y_J0mJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BKJPpHLZEd-09ds9dfYpFw" initMethod="#_0y_J02J-Ed-FqczH3ESmRw"

               footerMethod="#_0y_J1WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DKq_UULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_ef91cCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0y_J0mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0y_J0GJ-Ed-FqczH3ESmRw/method._0y_J0mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0y_J02J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0y_J0GJ-Ed-FqczH3ESmRw/method._0y_J02J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BKJPpHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0y_J0GJ-Ed-FqczH3ESmRw/method._BKJPpHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0y_J1WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0y_J0GJ-Ed-FqczH3ESmRw/method._0y_J1WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0y_J42J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0y_J0GJ-Ed-FqczH3ESmRw/method._0y_J42J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DKrmYELpEei0i9bcSdIGKw" name="setAccessorOperation"

+            <parameters xmi:id="_eigMECSWEemxeP6B0lLOpA" name="setAccessorOperation"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DKrmYULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DKrmYkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DKrmY0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DKrmZELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DKrmZULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKrmZkLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKrmZ0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKrmaELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DKrmaULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_eizHACSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ei84ACSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ejGB8CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_ejZj8CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_ejit4CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ej2P4CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ej_Z0CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ekSUwCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_ekcFwCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ekl2wCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKrmakLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DKrma0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_ek4xsCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_elCisCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKrmbELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_elVdoCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKrmbULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_elenkCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DKrmbkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_elyJkCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DKq_V0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DKrmcELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_eiWbECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_emO1gCSWEemxeP6B0lLOpA"

                 called="#_0y_J42J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0y_J5WJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0y_J5WJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.setGenFeature.TODO.override" headerMethod="#_0y_J52J-Ed-FqczH3ESmRw"

               conditionMethod="#_BQGttHLZEd-09ds9dfYpFw" initMethod="#_0y_J6GJ-Ed-FqczH3ESmRw"

               footerMethod="#_0zI60GJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DK0wUULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_enuDQCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0y_J52J-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0y_J5WJ-Ed-FqczH3ESmRw/method._0y_J52J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0y_J6GJ-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0y_J5WJ-Ed-FqczH3ESmRw/method._0y_J6GJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BQGttHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0y_J5WJ-Ed-FqczH3ESmRw/method._BQGttHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0zI60GJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0y_J5WJ-Ed-FqczH3ESmRw/method._0zI60GJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0zI63mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0y_J5WJ-Ed-FqczH3ESmRw/method._0zI63mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DK0wWELpEei0i9bcSdIGKw" name="setAccessorOperation"

+            <parameters xmi:id="_ep834CSWEemxeP6B0lLOpA" name="setAccessorOperation"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DK0wWULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DK0wWkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DK0wW0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DK0wXELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DK0wXULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DK0wXkLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DK0wX0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DK1XYELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DK1XYULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_eqPy0CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_eqZj0CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_eqsewCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_eq2PwCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_erAAwCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_erS7sCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ercFoCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_erl2oCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_er4xkCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_esCikCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DK1XYkLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DK1XY0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_esVdgCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_esfOgCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DK1XZELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_esyJcCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DK1XZULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_es76cCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DK1XZkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_etO1YCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DK0wV0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DK1XaELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_epzt8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_etrhUCSWEemxeP6B0lLOpA"

                 called="#_0zI63mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0zSEwGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0zSEwGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.TODO.override&#xA;"

               name="Interface.basicUnsetGenFeature.override" headerMethod="#_0zSEwmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BR5ddHLZEd-09ds9dfYpFw" initMethod="#_0zSEw2J-Ed-FqczH3ESmRw"

               footerMethod="#_0zSExWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DK-hUELpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_euRXMCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0zSEwmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0zSEwGJ-Ed-FqczH3ESmRw/method._0zSEwmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0zSEw2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0zSEwGJ-Ed-FqczH3ESmRw/method._0zSEw2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BR5ddHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0zSEwGJ-Ed-FqczH3ESmRw/method._BR5ddHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0zSExWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0zSEwGJ-Ed-FqczH3ESmRw/method._0zSExWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0zSE0mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0zSEwGJ-Ed-FqczH3ESmRw/method._0zSE0mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DK-hV0LpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DK-hWELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DK-hWULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DK-hWkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DK-hW0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DK-hXELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DK-hXULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DK-hXkLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DK-hX0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_ewgy4CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ewzt0CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ew9e0CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_exQZwCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_exZjsCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_exjUsCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ex2PoCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eyAAoCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_eyJxoCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eycskCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DK-hYELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DK-hYULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_eyl2gCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_eyvngCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DK-hYkLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_ezCicCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DK-hY0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_ezMTcCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DK-hZELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_ezfOYCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DK-hVkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DK-hZkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ewXB4CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_ezyJUCSWEemxeP6B0lLOpA"

                 called="#_0zSE0mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0zb1wGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0zb1wGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.basicUnsetGenFeature.annotations.insert" headerMethod="#_0zb1wmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BS7_RHLZEd-09ds9dfYpFw" initMethod="#_0zb1w2J-Ed-FqczH3ESmRw"

               footerMethod="#_0zb1xWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DLT4gULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_e0YmQCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0zb1wmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0zb1wGJ-Ed-FqczH3ESmRw/method._0zb1wmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0zb1w2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0zb1wGJ-Ed-FqczH3ESmRw/method._0zb1w2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BS7_RHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0zb1wGJ-Ed-FqczH3ESmRw/method._BS7_RHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0zb1xWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0zb1wGJ-Ed-FqczH3ESmRw/method._0zb1xWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0zb10mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0zb1wGJ-Ed-FqczH3ESmRw/method._0zb10mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DLUflULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DLUflkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DLUfl0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DLUfmELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DLUfmULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLUfmkLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLUfm0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLUfnELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLUfnULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_e2na4CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_e2xL4CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_e3EG0CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_e3N30CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_e3gywCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_e3qjwCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_e3ztsCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_e4HPsCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_e4QZoCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_e4jUkCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLUfnkLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DLUfn0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_e4tFkCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_e422kCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLUfoELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_e5JxgCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLUfoULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_e5TigCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLUfokLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_e5mdcCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DLUflELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DLUfpELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_e2eQ8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_e55YYCSWEemxeP6B0lLOpA"

                 called="#_0zb10mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0zlmwGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0zlmwGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.basicUnsetGenFeature.TODO.override" headerMethod="#_0zlmwmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BUISFHLZEd-09ds9dfYpFw" initMethod="#_0zlmw2J-Ed-FqczH3ESmRw"

               footerMethod="#_0zlmxWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DLdCcULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_e6f1UCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0zlmwmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0zlmwGJ-Ed-FqczH3ESmRw/method._0zlmwmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0zlmw2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0zlmwGJ-Ed-FqczH3ESmRw/method._0zlmw2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BUISFHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0zlmwGJ-Ed-FqczH3ESmRw/method._BUISFHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0zlmxWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0zlmwGJ-Ed-FqczH3ESmRw/method._0zlmxWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0zlm0mJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0zlmwGJ-Ed-FqczH3ESmRw/method._0zlm0mJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DLdphULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DLdphkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DLdph0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DLdpiELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DLdpiULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLdpikLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLdpi0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLdpjELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLdpjULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_e8up8CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_e84a8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_e9LV4CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_e9Uf0CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_e9oB0CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_e9xLwCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_e968wCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_e-N3sCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_e-XosCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_e-gyoCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLdpjkLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DLdpj0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_e-0UoCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_e-9ekCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLdpkELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_e_RAkCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLdpkULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_e_aKgCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLdpkkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_e_tFcCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DLdphELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DLdplELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_e8k48CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_fAAncCSWEemxeP6B0lLOpA"

                 called="#_0zlm0mJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0z4hsGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0z4hsGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.TODO.override&#xA;"

               name="Interface.unsetGenFeature.override" headerMethod="#_0z4hsmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BVnf1HLZEd-09ds9dfYpFw" initMethod="#_0z4hs2J-Ed-FqczH3ESmRw"

               footerMethod="#_0z4htWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DLmzcULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_fAwOUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0z4hsmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0z4hsGJ-Ed-FqczH3ESmRw/method._0z4hsmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0z4hs2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0z4hsGJ-Ed-FqczH3ESmRw/method._0z4hs2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BVnf1HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0z4hsGJ-Ed-FqczH3ESmRw/method._BVnf1HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0z4htWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0z4hsGJ-Ed-FqczH3ESmRw/method._0z4htWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0z4hwmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0z4hsGJ-Ed-FqczH3ESmRw/method._0z4hwmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DLmzeELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DLmzeULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DLmzekLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DLmze0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DLmzfELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLmzfULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLmzfkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLmzf0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLmzgELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_fDIz8CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_fDbu4CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_fDlf4CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_fDup0CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_fD4a0CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fELVwCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fEVGwCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fEeQsCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_fExysCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fE68oCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLmzgULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DLmzgkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_fFOeoCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_fFXokCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLmzg0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_fFhZkCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLmzhELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_fF0UgCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLmzhULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_fF-FgCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DLmzd0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DLmzh0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_fC_C8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_fGaxcCSWEemxeP6B0lLOpA"

                 called="#_0z4hwmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_00BroGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.javadoc.insert&#xA;"

+          <elements xmi:id="_00BroGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.javadoc.insert&#xA;"

               name="Interface.unsetGenFeature.javadoc.override" headerMethod="#_00BromJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BW9jpHLZEd-09ds9dfYpFw" initMethod="#_00Bro2J-Ed-FqczH3ESmRw"

               footerMethod="#_00BrpWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DLv9YULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_fHAnUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_00BromJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._00BroGJ-Ed-FqczH3ESmRw/method._00BromJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_00Bro2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._00BroGJ-Ed-FqczH3ESmRw/method._00Bro2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BW9jpHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._00BroGJ-Ed-FqczH3ESmRw/method._BW9jpHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_00BrpWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._00BroGJ-Ed-FqczH3ESmRw/method._00BrpWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_00BrsmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._00BroGJ-Ed-FqczH3ESmRw/method._00BrsmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DLwkckLpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DLwkc0LpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DLwkdELpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DLwkdULpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DLwkdkLpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLwkd0LpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLwkeELpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLwkeULpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DLwkekLpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_fJQDACSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_fJZM8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_fJsH4CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_fJ144CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_fKIz0CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fKSk0CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fKcV0CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fKvQwCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_fK4asCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fLL8sCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLwke0LpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DLwkfELpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_fLVGoCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_fLe3oCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLwkfULpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_fLxykCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLwkfkLpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_fMhZcCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DLwkf0LpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_fMrKcCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DLwkcULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DLwkgULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_fJGSACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_fNH2YCSWEemxeP6B0lLOpA"

                 called="#_00BrsmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_00LcoGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_00LcoGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.unsetGenFeature.javadoc.insert" headerMethod="#_00LcomJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BX27hHLZEd-09ds9dfYpFw" initMethod="#_00Lco2J-Ed-FqczH3ESmRw"

               footerMethod="#_00LcpWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DL7jkULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_fNkiUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_00LcomJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._00LcoGJ-Ed-FqczH3ESmRw/method._00LcomJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_00Lco2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._00LcoGJ-Ed-FqczH3ESmRw/method._00Lco2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BX27hHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._00LcoGJ-Ed-FqczH3ESmRw/method._BX27hHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_00LcpWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._00LcoGJ-Ed-FqczH3ESmRw/method._00LcpWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_00LcsmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._00LcoGJ-Ed-FqczH3ESmRw/method._00LcsmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DL7jmELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DL7jmULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DL7jmkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DL7jm0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DL7jnELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DL7jnULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DL7jnkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DL7jn0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DL7joELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_fP9H8CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_fQGR4CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_fQQC4CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_fQi90CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_fQsu0CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fQ14wCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fRJawCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fRSksCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_fRcVsCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fRvQoCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DL7joULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DL7jokLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_fR5BoCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_fSL8kCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DL7jo0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_fSVtkCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DL7jpELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_fSe3gCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DL7jpULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_fSyZgCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DL7jl0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DL7jp0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_fPpl8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_fTOeYCSWEemxeP6B0lLOpA"

                 called="#_00LcsmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_00VNoGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_00VNoGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.unsetGenFeature.annotations.insert" headerMethod="#_00VNomJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BY5dVHLZEd-09ds9dfYpFw" initMethod="#_00VNo2J-Ed-FqczH3ESmRw"

               footerMethod="#_00VNpWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DMGisULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_fT07UCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_00VNomJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._00VNoGJ-Ed-FqczH3ESmRw/method._00VNomJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_00VNo2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._00VNoGJ-Ed-FqczH3ESmRw/method._00VNo2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BY5dVHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._00VNoGJ-Ed-FqczH3ESmRw/method._BY5dVHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_00VNpWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._00VNoGJ-Ed-FqczH3ESmRw/method._00VNpWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_00VNsmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._00VNoGJ-Ed-FqczH3ESmRw/method._00VNsmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DMGiuELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DMGiuULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DMGiukLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DMGiu0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DMGivELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMGivULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMGivkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMGiv0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMGiwELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_fWNg8CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_fWXR8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_fWqM4CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_fWzW0CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_fW9H0CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fXQCwCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fXjkwCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fXsusCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_fX2fsCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fYJaoCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMGiwULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DMGiwkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_fYTLoCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_fYmGkCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMGiw0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_fYv3kCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMGixELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_fY5BgCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMGixULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_fZL8cCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DMGit0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DMGix0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_fV6mACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_fZooYCSWEemxeP6B0lLOpA"

                 called="#_00VNsmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_00eXkGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_00eXkGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.unsetGenFeature.TODO.override" headerMethod="#_00eXkmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BZy1NHLZEd-09ds9dfYpFw" initMethod="#_00eXk2J-Ed-FqczH3ESmRw"

               footerMethod="#_00eXlWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DMPFkULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_faFUUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_00eXkmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._00eXkGJ-Ed-FqczH3ESmRw/method._00eXkmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_00eXk2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._00eXkGJ-Ed-FqczH3ESmRw/method._00eXk2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BZy1NHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._00eXkGJ-Ed-FqczH3ESmRw/method._BZy1NHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_00eXlWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._00eXkGJ-Ed-FqczH3ESmRw/method._00eXlWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_00eXomJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._00eXkGJ-Ed-FqczH3ESmRw/method._00eXomJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DMPsokLpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DMPso0LpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DMPspELpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DMPspULpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DMPspkLpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMPsp0LpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMPsqELpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMPsqULpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMPsqkLpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_fcd58CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_fcnq8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_fc6l4CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_fdEW4CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_fdNg0CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fdhC0CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fdqMwCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fd9HsCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_feG4sCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_feQpsCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMPsq0LpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DMPsrELpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_fejkoCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_fetVoCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMPsrULpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_ffAQkCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMPsrkLpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_ffJagCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMPsr0LpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_ffTLgCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DMPsoULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DMPssULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_fcK_ACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_ffv3cCSWEemxeP6B0lLOpA"

                 called="#_00eXomJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_00oIkGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_00oIkGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.TODO.override&#xA;"

               name="Interface.isSetGenFeature.override" headerMethod="#_00oIkmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BaPhJHLZEd-09ds9dfYpFw" initMethod="#_00oIk2J-Ed-FqczH3ESmRw"

               footerMethod="#_00oIlWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DMY2kULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_fgVtUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_00oIkmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._00oIkGJ-Ed-FqczH3ESmRw/method._00oIkmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_00oIk2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._00oIkGJ-Ed-FqczH3ESmRw/method._00oIk2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BaPhJHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._00oIkGJ-Ed-FqczH3ESmRw/method._BaPhJHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_00oIlWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._00oIkGJ-Ed-FqczH3ESmRw/method._00oIlWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_00oIomJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._00oIkGJ-Ed-FqczH3ESmRw/method._00oIomJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DMY2mELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DMY2mULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DMY2mkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DMY2m0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DMY2nELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMY2nULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMY2nkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMY2n0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMY2oELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_filJACSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_fiuS8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_fjB08CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_fjK-4CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_fjeg4CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fjnq0CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fjxb0CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fkEWwCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_fkOHwCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fkhCsCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMY2oULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DMY2okLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_fkqzsCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_fkz9oCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMY2o0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_flG4kCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMY2pELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_flQpkCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMY2pULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_flaakCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DMY2l0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DMY2p0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_fibYACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_fl3GgCSWEemxeP6B0lLOpA"

                 called="#_00oIomJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_00x5kGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.javadoc.insert&#xA;"

+          <elements xmi:id="_00x5kGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.javadoc.insert&#xA;"

               name="Interface.isSetGenFeature.javadoc.override" headerMethod="#_00x5kmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BbSC9HLZEd-09ds9dfYpFw" initMethod="#_00x5k2J-Ed-FqczH3ESmRw"

               footerMethod="#_00x5lWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DMsYkULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_fmc8YCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_00x5kmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._00x5kGJ-Ed-FqczH3ESmRw/method._00x5kmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_00x5k2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._00x5kGJ-Ed-FqczH3ESmRw/method._00x5k2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BbSC9HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._00x5kGJ-Ed-FqczH3ESmRw/method._BbSC9HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_00x5lWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._00x5kGJ-Ed-FqczH3ESmRw/method._00x5lWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_00x5omJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._00x5kGJ-Ed-FqczH3ESmRw/method._00x5omJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DMs_pELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DMs_pULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DMs_pkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DMs_p0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DMs_qELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMs_qULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMs_qkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMs_q0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DMs_rELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_forxACSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_fo1iACSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_fo_TACSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_fpSN8CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_fpb-8CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fpu54CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fp4D0CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fqB00CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_fqUvwCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fqegwCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMs_rULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DMs_rkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_fqoRwCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_fq7MsCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMs_r0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_frE9sCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMs_sELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_frX4oCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DMs_sULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_frhCkCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DMs_o0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DMs_s0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_foY2ECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_fr9ugCSWEemxeP6B0lLOpA"

                 called="#_00x5omJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_01N-cGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_01N-cGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.isSetGenFeature.javadoc.insert" headerMethod="#_01N-cmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BcoGxHLZEd-09ds9dfYpFw" initMethod="#_01N-c2J-Ed-FqczH3ESmRw"

               footerMethod="#_01N-dWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DM2woULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_fsaacCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_01N-cmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._01N-cGJ-Ed-FqczH3ESmRw/method._01N-cmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_01N-c2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._01N-cGJ-Ed-FqczH3ESmRw/method._01N-c2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BcoGxHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._01N-cGJ-Ed-FqczH3ESmRw/method._BcoGxHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_01N-dWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._01N-cGJ-Ed-FqczH3ESmRw/method._01N-dWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_01N-gmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._01N-cGJ-Ed-FqczH3ESmRw/method._01N-gmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DM2wqELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DM2wqULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DM2wqkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DM2wq0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DM2wrELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DM2wrULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DM2wrkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DM2wr0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DM2wsELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_fuzAECSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_fu8xECSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_fvPsACSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_fvZdACSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_fvsX8CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fv2I8CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fv_S4CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fwSN0CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_fxCbwCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_fxLlsCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DM2wsULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DM2wskLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_fxegoCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_fxoRoCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DM2ws0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_fxyCoCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DM2wtELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_fyE9kCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DM2wtULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_fyOukCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DM2wp0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DM2wt0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_fup2ICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_fyqzcCSWEemxeP6B0lLOpA"

                 called="#_01N-gmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_01hgcGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_01hgcGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.isSetGenFeature.annotations.insert" headerMethod="#_01hgcmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_Bd9jhHLZEd-09ds9dfYpFw" initMethod="#_01hgc2J-Ed-FqczH3ESmRw"

               footerMethod="#_01hgdWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DNAhoULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_fzHfYCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_01hgcmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._01hgcGJ-Ed-FqczH3ESmRw/method._01hgcmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_01hgc2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._01hgcGJ-Ed-FqczH3ESmRw/method._01hgc2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_Bd9jhHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._01hgcGJ-Ed-FqczH3ESmRw/method._Bd9jhHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_01hgdWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._01hgcGJ-Ed-FqczH3ESmRw/method._01hgdWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_01hggmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._01hgcGJ-Ed-FqczH3ESmRw/method._01hggmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DNAhqELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DNAhqULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DNAhqkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DNAhq0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DNAhrELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNAhrULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNAhrkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNAhr0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNAhsELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_f1gFACSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_f1p2ACSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_f18w8CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_f2Gh8CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_f2Zc4CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_f2jN4CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_f2sX0CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_f2_50CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_f3JDwCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_f3b-sCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNAhsULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DNAhskLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_f3lvsCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_f3vgsCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNAhs0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_f4CboCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNAhtELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_f4MMoCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNAhtULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_f4fHkCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DNAhp0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DNAht0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_f1W7ECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_f4yCgCSWEemxeP6B0lLOpA"

                 called="#_01hggmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_01qqYGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_01qqYGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.isSetGenFeature.TODO.override" headerMethod="#_01qqYmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BfAsZHLZEd-09ds9dfYpFw" initMethod="#_01qqY2J-Ed-FqczH3ESmRw"

               footerMethod="#_01qqZWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DNLgwULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_f5YfcCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_01qqYmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._01qqYGJ-Ed-FqczH3ESmRw/method._01qqYmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_01qqY2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._01qqYGJ-Ed-FqczH3ESmRw/method._01qqY2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BfAsZHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._01qqYGJ-Ed-FqczH3ESmRw/method._BfAsZHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_01qqZWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._01qqYGJ-Ed-FqczH3ESmRw/method._01qqZWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_01qqcmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._01qqYGJ-Ed-FqczH3ESmRw/method._01qqcmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DNLgyELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DNLgyULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DNLgykLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DNLgy0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DNLgzELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNLgzULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNLgzkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNLgz0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNLg0ELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_f7nUECSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_f76PACSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_f8EAACSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_f8NJ8CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_f8gr8CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_f8p14CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_f89X4CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_f9Gh0CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_f9ZcwCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_f9jNwCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNLg0ULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DNLg0kLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_f92IsCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_f9_5sCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNLg00LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_f-JqsCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNLg1ELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_f-cloCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNLg1ULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_f-lvkCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DNLgx0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DNMH0ELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_f7djECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_f_CbgCSWEemxeP6B0lLOpA"

                 called="#_01qqcmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_010bYGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_010bYGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.genFeature.insert" headerMethod="#_010bYmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BgWJJHLZEd-09ds9dfYpFw" initMethod="#_010bY2J-Ed-FqczH3ESmRw"

               footerMethod="#_010bZWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DNYVEULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_f_o4cCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_010bYmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._010bYGJ-Ed-FqczH3ESmRw/method._010bYmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_010bY2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._010bYGJ-Ed-FqczH3ESmRw/method._010bY2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BgWJJHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._010bYGJ-Ed-FqczH3ESmRw/method._BgWJJHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_010bZWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._010bYGJ-Ed-FqczH3ESmRw/method._010bZWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_010bcmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._010bYGJ-Ed-FqczH3ESmRw/method._010bcmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DNYVGELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DNYVGULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DNYVGkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DNYVG0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DNYVHELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNYVHULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNYVHkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNYVH0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNYVIELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_gB3tECSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_gCKoACSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_gCUZACSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_gCnT8CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_gCxE8CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gC618CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gDNw4CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gDW60CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_gDqc0CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gDzmwCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNYVIULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DNYVIkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_gD9XwCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_gEQSsCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNYVI0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_gEaDsCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNYVJELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_gEs-oCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNYVJULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_gE2voCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DNYVF0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DNYVJ0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_gBujICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_gFTbkCSWEemxeP6B0lLOpA"

                 called="#_010bcmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_01-MYGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.implementedGenOperation.TODO.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.insert&#xA;"

+          <elements xmi:id="_01-MYGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.javadoc.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.implementedGenOperation.TODO.override&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.insert&#xA;"

               name="Interface.genOperation.override" headerMethod="#_01-MYmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BiI45HLZEd-09ds9dfYpFw" initMethod="#_01-MY2J-Ed-FqczH3ESmRw"

               footerMethod="#_01-MZWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DNg38ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_gFvgcCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_01-MYmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._01-MYGJ-Ed-FqczH3ESmRw/method._01-MYmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_01-MY2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._01-MYGJ-Ed-FqczH3ESmRw/method._01-MY2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BiI45HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._01-MYGJ-Ed-FqczH3ESmRw/method._BiI45HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_01-MZWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._01-MYGJ-Ed-FqczH3ESmRw/method._01-MZWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_01-McmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._01-MYGJ-Ed-FqczH3ESmRw/method._01-McmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DNg3-ELpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DNg3-ULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DNg3-kLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DNg3-0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DNg3_ELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNg3_ULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNg3_kLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNg3_0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNg4AELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_gH-8ICSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_gIR3ECSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_gIboECSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_gIkyACSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_gI4UACSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gJBd8CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gJUY4CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gJeJ4CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_gJxE0CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gJ610CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNg4AULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DNg4AkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_gKEm0CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_gKXhwCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNg4A0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_gKgrsCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNg4BELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_gK0NsCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNg4BULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_gK9XoCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DNg390LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DNg4B0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_gH1LICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_gLaDkCSWEemxeP6B0lLOpA"

                 called="#_01-McmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_02HWUGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.javadoc.insert&#xA;"

+          <elements xmi:id="_02HWUGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.javadoc.insert&#xA;"

               name="Interface.genOperation.javadoc.override" headerMethod="#_02HWUmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_Bjx3pHLZEd-09ds9dfYpFw" initMethod="#_02HWU2J-Ed-FqczH3ESmRw"

               footerMethod="#_02HWVWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DNqB4ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_gL2vgCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_02HWUmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._02HWUGJ-Ed-FqczH3ESmRw/method._02HWUmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_02HWU2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._02HWUGJ-Ed-FqczH3ESmRw/method._02HWU2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_Bjx3pHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._02HWUGJ-Ed-FqczH3ESmRw/method._Bjx3pHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_02HWVWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._02HWUGJ-Ed-FqczH3ESmRw/method._02HWVWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_02HWYmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._02HWUGJ-Ed-FqczH3ESmRw/method._02HWYmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DNqo80LpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DNqo9ELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DNqo9ULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DNqo9kLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DNqo90LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNqo-ELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNqo-ULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNqo-kLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNqo-0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_gOPVICSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_gOZGICSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_gOsBECSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_gO1yECSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_gPItACSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gPSeACSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gPbn8CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gPui4CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_gP4T4CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gQCE4CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNqo_ELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DNqo_ULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_gQU_0CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_gQew0CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNqo_kLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_gQxrwCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNqo_0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_gQ61sCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNqpAELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_gREmsCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DNqo8kLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DNqpAkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_gOGLMCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_gRhSoCSWEemxeP6B0lLOpA"

                 called="#_02HWYmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_02kCQGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_02kCQGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.genOperation.javadoc.insert" headerMethod="#_02kCQmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BlkAVHLZEd-09ds9dfYpFw" initMethod="#_02kCQ2J-Ed-FqczH3ESmRw"

               footerMethod="#_02kCRWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DNzy4ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_gR9-kCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_02kCQmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._02kCQGJ-Ed-FqczH3ESmRw/method._02kCQmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_02kCQ2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._02kCQGJ-Ed-FqczH3ESmRw/method._02kCQ2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BlkAVHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._02kCQGJ-Ed-FqczH3ESmRw/method._BlkAVHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_02kCRWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._02kCQGJ-Ed-FqczH3ESmRw/method._02kCRWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_02kCUmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._02kCQGJ-Ed-FqczH3ESmRw/method._02kCUmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DNzy6ELpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DNzy6ULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DNzy6kLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DNzy60LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DNzy7ELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNzy7ULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNzy7kLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNzy70LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DNzy8ELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_gUWkMCSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_gVGLECSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_gVZGACSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_gVi3ACSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_gV1x8CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gV_i8CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gWSd4CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gWcO4CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_gWvJ0CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gW4TwCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNzy8ULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DNzy8kLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_gXCEwCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_gXU_sCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNzy80LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_gXewsCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNzy9ELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_gXohsCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DNzy9ULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_gX7coCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DNzy50LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DNzy90LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_gUMzMCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_gYYIkCSWEemxeP6B0lLOpA"

                 called="#_02kCUmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_02tzQGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_02tzQGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.genOperation.annotations.insert" headerMethod="#_02tzQmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BnDOFHLZEd-09ds9dfYpFw" initMethod="#_02tzQ2J-Ed-FqczH3ESmRw"

               footerMethod="#_02tzRWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DN_ZEULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_gY00gCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_02tzQmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._02tzQGJ-Ed-FqczH3ESmRw/method._02tzQmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_02tzQ2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._02tzQGJ-Ed-FqczH3ESmRw/method._02tzQ2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BnDOFHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._02tzQGJ-Ed-FqczH3ESmRw/method._BnDOFHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_02tzRWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._02tzQGJ-Ed-FqczH3ESmRw/method._02tzRWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_02tzUmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._02tzQGJ-Ed-FqczH3ESmRw/method._02tzUmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DN_ZGELpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DN_ZGULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DN_ZGkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DN_ZG0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DN_ZHELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DN_ZHULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DN_ZHkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DN_ZH0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DN_ZIELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_gbDpICSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_gbWkECSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_gbgVECSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_gbzQACSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_gb9BACSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gcGK8CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gcZs8CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gci24CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_gc1x0CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gc_i0CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DN_ZIULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DN_ZIkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_gdJT0CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_gdcOwCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DN_ZI0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_gdl_wCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DN_ZJELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_gdvJsCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DN_ZJULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_geCEoCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DN_ZF0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DN_ZJ0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ga54ICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_geVmoCSWEemxeP6B0lLOpA"

                 called="#_02tzUmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0229MGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_0229MGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.implementedGenOperation.TODO.override" headerMethod="#_0229MmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_Bn8l9HLZEd-09ds9dfYpFw" initMethod="#_0229M2J-Ed-FqczH3ESmRw"

               footerMethod="#_0229NWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DOK_QULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_ge7cgCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0229MmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0229MGJ-Ed-FqczH3ESmRw/method._0229MmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0229M2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0229MGJ-Ed-FqczH3ESmRw/method._0229M2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_Bn8l9HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0229MGJ-Ed-FqczH3ESmRw/method._Bn8l9HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0229NWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0229MGJ-Ed-FqczH3ESmRw/method._0229NWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0229QmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0229MGJ-Ed-FqczH3ESmRw/method._0229QmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DOK_SELpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DOK_SULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DOK_SkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DOK_S0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DOK_TELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOK_TULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOK_TkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOK_T0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOK_UELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_ghK4MCSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_ghdzICSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ghm9ECSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_ghwuECSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_giDpACSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_giNaACSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gigU8CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_giqF8CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_gizP4CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gjGx4CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOK_UULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DOK_UkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_gjP70CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_gjjd0CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOK_U0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_gjsnwCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOK_VELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_gj2YwCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOK_VULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_gkJTsCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DOK_R0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DOK_V0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ghBHMCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_gkcOoCSWEemxeP6B0lLOpA"

                 called="#_0229QmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_03AuMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_03AuMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.genOperation.insert" headerMethod="#_03AuMmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BpSpxHLZEd-09ds9dfYpFw" initMethod="#_03AuM2J-Ed-FqczH3ESmRw"

               footerMethod="#_03AuNWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DOTiIULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_glCrkCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_03AuMmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._03AuMGJ-Ed-FqczH3ESmRw/method._03AuMmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_03AuM2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._03AuMGJ-Ed-FqczH3ESmRw/method._03AuM2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BpSpxHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._03AuMGJ-Ed-FqczH3ESmRw/method._BpSpxHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_03AuNWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._03AuMGJ-Ed-FqczH3ESmRw/method._03AuNWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_03AuQmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._03AuMGJ-Ed-FqczH3ESmRw/method._03AuQmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DOUJNULpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DOUJNkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DOUJN0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DOUJOELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DOUJOULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOUJOkLpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOUJO0LpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOUJPELpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOUJPULpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_gnRgMCSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_gnkbICSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_gnuMICSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_gn39ICSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_goK4ECSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_goUpECSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gonkACSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gowt8CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_go6e8CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gpNZ4CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOUJPkLpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DOUJP0LpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_gpXK4CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_gpg74CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOUJQELpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_gpz20CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOUJQULpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_gp9AwCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOUJQkLpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_gqGxwCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DOUJNELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DOUJRELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_gnIWQCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_gqjdsCSWEemxeP6B0lLOpA"

                 called="#_03AuQmJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_03KfMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_03KfMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.eUnset.override" headerMethod="#_03KfMmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BqoGhHLZEd-09ds9dfYpFw" initMethod="#_03KfM2J-Ed-FqczH3ESmRw"

               footerMethod="#_03KfNWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DOcsEULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_grAJoCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_03KfMmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._03KfMGJ-Ed-FqczH3ESmRw/method._03KfMmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_03KfM2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._03KfMGJ-Ed-FqczH3ESmRw/method._03KfM2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BqoGhHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._03KfMGJ-Ed-FqczH3ESmRw/method._BqoGhHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_03KfNWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._03KfMGJ-Ed-FqczH3ESmRw/method._03KfNWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_03KfQWJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._03KfMGJ-Ed-FqczH3ESmRw/method._03KfQWJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DOdTJELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DOdTJULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DOdTJkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DOdTJ0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOdTKELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOdTKULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOdTKkLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOdTK0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_gtYvQCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_gtigQCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_gt1bMCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_gt-lICSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_guIWICSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gubRECSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gulCECSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_guuzECSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_gvBuACSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOdTLELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DOdTLULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_gvK38CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_gveZ8CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOdTLkLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_gvnj4CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOdTL0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_gv7F4CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOdTMELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_gwEP0CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DOdTI0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DOdTMkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_gtF0UCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_gwg7wCSWEemxeP6B0lLOpA"

                 called="#_03KfQWJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_03TpIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_03TpIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.eIsSet.override" headerMethod="#_03TpImJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BsH7VHLZEd-09ds9dfYpFw" initMethod="#_03TpI2J-Ed-FqczH3ESmRw"

               footerMethod="#_03TpJWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DOoSQULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_gxjdkCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_03TpImJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._03TpIGJ-Ed-FqczH3ESmRw/method._03TpImJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_03TpI2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._03TpIGJ-Ed-FqczH3ESmRw/method._03TpI2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BsH7VHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._03TpIGJ-Ed-FqczH3ESmRw/method._BsH7VHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_03TpJWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._03TpIGJ-Ed-FqczH3ESmRw/method._03TpJWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_03TpMWJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._03TpIGJ-Ed-FqczH3ESmRw/method._03TpMWJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DOoSSELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DOoSSULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DOoSSkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DOoSS0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOoSTELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOoSTULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOoSTkLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOoST0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_gzy5QCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_gz8DMCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_g0PlMCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_g0YvICSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_g0sRICSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_g01bECSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_g0_MECSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_g1SHACSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_g1b4ACSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOoSUELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DOoSUULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_g1uy8CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_g14j8CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOoSUkLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_g2Bt4CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOoSU0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_g2Uo0CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOoSVELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_g2eZ0CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DOoSR0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DOoSVkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_gzpIQCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_g27FwCSWEemxeP6B0lLOpA"

                 called="#_03TpMWJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_03daIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_03daIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.insert" headerMethod="#_03daImJ-Ed-FqczH3ESmRw" conditionMethod="#_BtAsJHLZEd-09ds9dfYpFw"

               initMethod="#_03daI2J-Ed-FqczH3ESmRw" footerMethod="#_03daJWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DOxcMULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_g3XxsCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_03daImJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._03daIGJ-Ed-FqczH3ESmRw/method._03daImJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_03daI2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._03daIGJ-Ed-FqczH3ESmRw/method._03daI2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BtAsJHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._03daIGJ-Ed-FqczH3ESmRw/method._BtAsJHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_03daJWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._03daIGJ-Ed-FqczH3ESmRw/method._03daJWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_03daMWJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._03daIGJ-Ed-FqczH3ESmRw/method._03daMWJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DOxcOELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DOxcOULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DOxcOkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DOxcO0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOxcPELpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOxcPULpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOxcPkLpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DOxcP0LpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_g6NDQCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_g6WNMCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_g6pvMCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_g6y5ICSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_g68qICSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_g7PlECSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_g7ZWECSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_g7sRACSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_g72CACSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOxcQELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DOxcQULpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_g8I88CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_g8SG4CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOxcQkLpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_g8b34CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOxcQ0LpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_g8uy0CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DOxcRELpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_g84j0CSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DOxcN0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DOxcRkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_g6DSQCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_g9VPwCSWEemxeP6B0lLOpA"

                 called="#_03daMWJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_K9da0HroEeC0XN9kbwkPYQ" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.qualifier from EMF org.e&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_K9da0HroEeC0XN9kbwkPYQ" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.egfCustom.constructor.override" headerMethod="#_K9da0nroEeC0XN9kbwkPYQ"

               conditionMethod="#_K9da1HroEeC0XN9kbwkPYQ" initMethod="#_K9da03roEeC0XN9kbwkPYQ"

               footerMethod="#_K9da1nroEeC0XN9kbwkPYQ">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_teIVUbBcEeSqLfQ0kalDug"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_b6aIcCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_K9da0nroEeC0XN9kbwkPYQ" name="header" patternFilePath="templates/pattern._K9da0HroEeC0XN9kbwkPYQ/method._K9da0nroEeC0XN9kbwkPYQ.pt"/>

             <methods xmi:id="_K9da03roEeC0XN9kbwkPYQ" name="init" patternFilePath="templates/pattern._K9da0HroEeC0XN9kbwkPYQ/method._K9da03roEeC0XN9kbwkPYQ.pt"/>

             <methods xmi:id="_K9da1HroEeC0XN9kbwkPYQ" name="preCondition" patternFilePath="templates/pattern._K9da0HroEeC0XN9kbwkPYQ/method._K9da1HroEeC0XN9kbwkPYQ.pt"/>

             <methods xmi:id="_K9da1nroEeC0XN9kbwkPYQ" name="footer" patternFilePath="templates/pattern._K9da0HroEeC0XN9kbwkPYQ/method._K9da1nroEeC0XN9kbwkPYQ.pt"/>

             <methods xmi:id="_K9da4XroEeC0XN9kbwkPYQ" name="doGenerate" patternFilePath="templates/pattern._K9da0HroEeC0XN9kbwkPYQ/method._K9da4XroEeC0XN9kbwkPYQ.pt"/>

-            <parameters xmi:id="_teIVWLBcEeSqLfQ0kalDug" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_teIVWbBcEeSqLfQ0kalDug" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_teIVWrBcEeSqLfQ0kalDug" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_teIVW7BcEeSqLfQ0kalDug" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_teIVXLBcEeSqLfQ0kalDug" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_teIVXbBcEeSqLfQ0kalDug" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_teIVXrBcEeSqLfQ0kalDug" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_teIVX7BcEeSqLfQ0kalDug" name="publicStaticFinalFlag"

+            <parameters xmi:id="_b8fzICSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_b8pkICSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_b88fECSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_b9GQECSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_b9PaACSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_b9i8ACSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_b9sF8CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_b9128CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_b-Ix4CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_teIVYLBcEeSqLfQ0kalDug" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_teIVYbBcEeSqLfQ0kalDug" name="negativeOffsetCorrection"

+            <parameters xmi:id="_b-Si4CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_b-bs0CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_teIVYrBcEeSqLfQ0kalDug" name="positiveOffsetCorrection"

+            <parameters xmi:id="_b-unwCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_teIVY7BcEeSqLfQ0kalDug" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_b-4YwCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_teIVZLBcEeSqLfQ0kalDug" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_b_LTsCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_teIVV7BcEeSqLfQ0kalDug"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_teIVZrBcEeSqLfQ0kalDug"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_b8WCICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_b_e1sCSWEemxeP6B0lLOpA"

                 called="#_K9da4XroEeC0XN9kbwkPYQ"/>

           </elements>

-          <elements xmi:id="_BsLUkeXDEeCxnsoQRwU99Q" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.11.0.qualifier from EMF org.e&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+          <elements xmi:id="_BsLUkeXDEeCxnsoQRwU99Q" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

               name="Interface.interface.javadoc.override" headerMethod="#_BsLUk-XDEeCxnsoQRwU99Q"

               conditionMethod="#_BsVFkeXDEeCxnsoQRwU99Q" initMethod="#_BsVFkOXDEeCxnsoQRwU99Q"

               footerMethod="#_BsVFk-XDEeCxnsoQRwU99Q">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DEmMgkLpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_bn74YCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_BsLUk-XDEeCxnsoQRwU99Q" name="header" patternFilePath="templates/pattern._BsLUkeXDEeCxnsoQRwU99Q/method._BsLUk-XDEeCxnsoQRwU99Q.pt"/>

             <methods xmi:id="_BsVFkOXDEeCxnsoQRwU99Q" name="init" patternFilePath="templates/pattern._BsLUkeXDEeCxnsoQRwU99Q/method._BsVFkOXDEeCxnsoQRwU99Q.pt"/>

             <methods xmi:id="_BsVFkeXDEeCxnsoQRwU99Q" name="preCondition" patternFilePath="templates/pattern._BsLUkeXDEeCxnsoQRwU99Q/method._BsVFkeXDEeCxnsoQRwU99Q.pt"/>

             <methods xmi:id="_BsVFk-XDEeCxnsoQRwU99Q" name="footer" patternFilePath="templates/pattern._BsLUkeXDEeCxnsoQRwU99Q/method._BsVFk-XDEeCxnsoQRwU99Q.pt"/>

             <methods xmi:id="_BsVFouXDEeCxnsoQRwU99Q" name="doGenerate" patternFilePath="templates/pattern._BsLUkeXDEeCxnsoQRwU99Q/method._BsVFouXDEeCxnsoQRwU99Q.pt"/>

-            <parameters xmi:id="_DEmMiULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DEmMikLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DEmMi0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DEmMjELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DEmMjULpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DEmMjkLpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DEmMj0LpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DEmMkELpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_bqUeACSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_bqdn8CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_bqnY8CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_brp6wCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_br9cwCSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bsGmsCSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bsQXsCSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_bsjSoCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_bstDoCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DEmMkULpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DEmMkkLpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_bs2NkCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_btJvkCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DEmMk0LpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_btS5gCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DEmMlELpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_btcqgCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DEmMlULpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_btvlcCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DEmMiELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DEmMl0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_bqA8ACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_buCgYCSWEemxeP6B0lLOpA"

                 called="#_BsVFouXDEeCxnsoQRwU99Q"/>

           </elements>

-          <elements xmi:id="_onysQLM-EeKd56X4hcZPSw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.annotations.insert&#xA;"

+          <elements xmi:id="_onysQLM-EeKd56X4hcZPSw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.pre.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.annotations.insert&#xA;"

               name="Interface.genFeatureReified.override" headerMethod="#_onysQrM-EeKd56X4hcZPSw"

               conditionMethod="#_onysRLM-EeKd56X4hcZPSw" initMethod="#_onysQ7M-EeKd56X4hcZPSw"

               footerMethod="#_onysRrM-EeKd56X4hcZPSw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DGbYgULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_cL12sCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_onysQrM-EeKd56X4hcZPSw" name="header" patternFilePath="templates/pattern._onysQLM-EeKd56X4hcZPSw/method._onysQrM-EeKd56X4hcZPSw.pt"/>

             <methods xmi:id="_onysQ7M-EeKd56X4hcZPSw" name="init" patternFilePath="templates/pattern._onysQLM-EeKd56X4hcZPSw/method._onysQ7M-EeKd56X4hcZPSw.pt"/>

             <methods xmi:id="_onysRLM-EeKd56X4hcZPSw" name="preCondition" patternFilePath="templates/pattern._onysQLM-EeKd56X4hcZPSw/method._onysRLM-EeKd56X4hcZPSw.pt"/>

             <methods xmi:id="_onysRrM-EeKd56X4hcZPSw" name="footer" patternFilePath="templates/pattern._onysQLM-EeKd56X4hcZPSw/method._onysRrM-EeKd56X4hcZPSw.pt"/>

             <methods xmi:id="_onysWLM-EeKd56X4hcZPSw" name="doGenerate" patternFilePath="templates/pattern._onysQLM-EeKd56X4hcZPSw/method._onysWLM-EeKd56X4hcZPSw.pt"/>

-            <parameters xmi:id="_DGbYiELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DGbYiULpEei0i9bcSdIGKw" name="classExtendsGenClass"

+            <parameters xmi:id="_cN7hYCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_cOOcUCSWEemxeP6B0lLOpA" name="classExtendsGenClass"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DGbYikLpEei0i9bcSdIGKw" name="classExtendsAllGenFeatures"

+            <parameters xmi:id="_cOYNUCSWEemxeP6B0lLOpA" name="classExtendsAllGenFeatures"

                 type="java.util.List"/>

-            <parameters xmi:id="_DGbYi0LpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DGbYjELpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DGbYjULpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DGbYjkLpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DGbYj0LpEei0i9bcSdIGKw" name="isInterface" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DGb_kELpEei0i9bcSdIGKw" name="isImplementation" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DGb_kULpEei0i9bcSdIGKw" name="isGWT" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DGb_kkLpEei0i9bcSdIGKw" name="publicStaticFinalFlag"

+            <parameters xmi:id="_cOh-UCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_cO05QCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_cO-qQCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_cPH0MCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cPavICSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cPkgICSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cPuRICSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_cQBMECSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cQK9ECSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DGb_k0LpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_DGb_lELpEei0i9bcSdIGKw" name="negativeOffsetCorrection"

+            <parameters xmi:id="_cRNe4CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_cRXP4CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DGb_lULpEei0i9bcSdIGKw" name="positiveOffsetCorrection"

+            <parameters xmi:id="_cRqK0CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DGb_lkLpEei0i9bcSdIGKw" name="negativeOperationOffsetCorrection"

+            <parameters xmi:id="_cRzUwCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DGb_l0LpEei0i9bcSdIGKw" name="positiveOperationOffsetCorrection"

+            <parameters xmi:id="_cR9FwCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DGbYh0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DGb_mULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_cNyXcCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_cSZxsCSWEemxeP6B0lLOpA"

                 called="#_onysWLM-EeKd56X4hcZPSw"/>

           </elements>

+          <elements xmi:id="_cAErkCSWEemxeP6B0lLOpA" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+              name="Interface.dynamicDelegation" headerMethod="#_cAhXgCSWEemxeP6B0lLOpA"

+              conditionMethod="#_cBQ-YCSWEemxeP6B0lLOpA" initMethod="#_cA-DcCSWEemxeP6B0lLOpA"

+              footerMethod="#_cB3bUCSWEemxeP6B0lLOpA">

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_cAXmgCSWEemxeP6B0lLOpA"

+                name="JET"/>

+            <methods xmi:id="_cAhXgCSWEemxeP6B0lLOpA" name="header" patternFilePath="templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cAhXgCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_cA-DcCSWEemxeP6B0lLOpA" name="init" patternFilePath="templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cA-DcCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_cBQ-YCSWEemxeP6B0lLOpA" name="preCondition" patternFilePath="templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cBQ-YCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_cB3bUCSWEemxeP6B0lLOpA" name="footer" patternFilePath="templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cB3bUCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_cFSiwCSWEemxeP6B0lLOpA" name="doGenerate" patternFilePath="templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cFSiwCSWEemxeP6B0lLOpA.pt"/>

+            <parameters xmi:id="_cCdRMCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_cCwMICSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_cC59ICSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_cDDuICSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cDWpECSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cDfzACSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cDpkACSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_cD8e8CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_cEGP8CSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

+                type="java.lang.String"/>

+            <parameters xmi:id="_cEQA8CSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_cEi74CSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_cEsF0CSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_cE120CSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_cFIxwCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

+                type="java.lang.String"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_cCTgMCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_cFldsCSWEemxeP6B0lLOpA"

+                called="#_cFSiwCSWEemxeP6B0lLOpA"/>

+          </elements>

+          <elements xmi:id="_eTdDcCSWEemxeP6B0lLOpA" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+              name="Interface.dynamicSetGenFeature.pre.insert" headerMethod="#_eT5vYCSWEemxeP6B0lLOpA"

+              conditionMethod="#_eUpWQCSWEemxeP6B0lLOpA" initMethod="#_eUMqUCSWEemxeP6B0lLOpA"

+              footerMethod="#_eVPMICSWEemxeP6B0lLOpA">

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_eTmNYCSWEemxeP6B0lLOpA"

+                name="JET"/>

+            <methods xmi:id="_eT5vYCSWEemxeP6B0lLOpA" name="header" patternFilePath="templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eT5vYCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_eUMqUCSWEemxeP6B0lLOpA" name="init" patternFilePath="templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eUMqUCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_eUpWQCSWEemxeP6B0lLOpA" name="preCondition" patternFilePath="templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eUpWQCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_eVPMICSWEemxeP6B0lLOpA" name="footer" patternFilePath="templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eVPMICSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_eY91kCSWEemxeP6B0lLOpA" name="doGenerate" patternFilePath="templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eY91kCSWEemxeP6B0lLOpA.pt"/>

+            <parameters xmi:id="_eV1pECSWEemxeP6B0lLOpA" name="setAccessorOperation"

+                type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_eWIkACSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_eWSVACSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_eWbe8CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_eWuZ4CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_eW4K4CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eXB74CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eXLF0CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eXen0CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_eXnxwCSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_eX6ssCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

+                type="java.lang.String"/>

+            <parameters xmi:id="_eYEdsCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_eYOOsCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_eYXYoCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_eYq6oCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_eY0EkCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

+                type="java.lang.String"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_eVr4ECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_eZQwgCSWEemxeP6B0lLOpA"

+                called="#_eY91kCSWEemxeP6B0lLOpA"/>

+          </elements>

+          <elements xmi:id="_eZahgCSWEemxeP6B0lLOpA" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/Class.javajet&quot;&#xA;"

+              name="Interface.dynamicSetGenFeature.post.insert" headerMethod="#_eZ3NcCSWEemxeP6B0lLOpA"

+              conditionMethod="#_eam0UCSWEemxeP6B0lLOpA" initMethod="#_eaTSUCSWEemxeP6B0lLOpA"

+              footerMethod="#_ebMqMCSWEemxeP6B0lLOpA">

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_eZtccCSWEemxeP6B0lLOpA"

+                name="JET"/>

+            <methods xmi:id="_eZ3NcCSWEemxeP6B0lLOpA" name="header" patternFilePath="templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._eZ3NcCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_eaTSUCSWEemxeP6B0lLOpA" name="init" patternFilePath="templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._eaTSUCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_eam0UCSWEemxeP6B0lLOpA" name="preCondition" patternFilePath="templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._eam0UCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_ebMqMCSWEemxeP6B0lLOpA" name="footer" patternFilePath="templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._ebMqMCSWEemxeP6B0lLOpA.pt"/>

+            <methods xmi:id="_efOOkCSWEemxeP6B0lLOpA" name="doGenerate" patternFilePath="templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._efOOkCSWEemxeP6B0lLOpA.pt"/>

+            <parameters xmi:id="_eb8RECSWEemxeP6B0lLOpA" name="setAccessorOperation"

+                type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_ecGCECSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ecPzECSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_eciuACSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_ecr38CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_ec_Z8CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_edIj4CSWEemxeP6B0lLOpA" name="isInterface" type="java.lang.Boolean"/>

+            <parameters xmi:id="_edSU4CSWEemxeP6B0lLOpA" name="isImplementation" type="java.lang.Boolean"/>

+            <parameters xmi:id="_edlP0CSWEemxeP6B0lLOpA" name="useInterfaceOverrideAnnotation"

+                type="java.lang.Boolean"/>

+            <parameters xmi:id="_edvA0CSWEemxeP6B0lLOpA" name="isGWT" type="java.lang.Boolean"/>

+            <parameters xmi:id="_ed4KwCSWEemxeP6B0lLOpA" name="publicStaticFinalFlag"

+                type="java.lang.String"/>

+            <parameters xmi:id="_eeLswCSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_eeU2sCSWEemxeP6B0lLOpA" name="negativeOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_eeensCSWEemxeP6B0lLOpA" name="positiveOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_eexioCSWEemxeP6B0lLOpA" name="negativeOperationOffsetCorrection"

+                type="java.lang.String"/>

+            <parameters xmi:id="_ee7ToCSWEemxeP6B0lLOpA" name="positiveOperationOffsetCorrection"

+                type="java.lang.String"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ebpWICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_efX_kCSWEemxeP6B0lLOpA"

+                called="#_efOOkCSWEemxeP6B0lLOpA"/>

+          </elements>

         </libraries>

         <libraries xmi:id="_omcocLM-EeKd56X4hcZPSw" name="org.eclipse.egf.emf.pattern.model.call.ValidatorClass">

-          <elements xmi:id="_omcocbM-EeKd56X4hcZPSw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model/ValidatorClass.javajet&quot;&#xA;"

+          <elements xmi:id="_omcocbM-EeKd56X4hcZPSw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model/ValidatorClass.javajet&quot;&#xA;"

               name="ValidatorClass.insert" headerMethod="#_omcoc7M-EeKd56X4hcZPSw"

               conditionMethod="#_omcodbM-EeKd56X4hcZPSw" initMethod="#_omcodLM-EeKd56X4hcZPSw"

               footerMethod="#_omcod7M-EeKd56X4hcZPSw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C5yDokLpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_V17dgCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_omcoc7M-EeKd56X4hcZPSw" name="header" patternFilePath="templates/pattern._omcocbM-EeKd56X4hcZPSw/method._omcoc7M-EeKd56X4hcZPSw.pt"/>

             <methods xmi:id="_omcodLM-EeKd56X4hcZPSw" name="init" patternFilePath="templates/pattern._omcocbM-EeKd56X4hcZPSw/method._omcodLM-EeKd56X4hcZPSw.pt"/>

             <methods xmi:id="_omcodbM-EeKd56X4hcZPSw" name="preCondition" patternFilePath="templates/pattern._omcocbM-EeKd56X4hcZPSw/method._omcodbM-EeKd56X4hcZPSw.pt"/>

             <methods xmi:id="_omcod7M-EeKd56X4hcZPSw" name="footer" patternFilePath="templates/pattern._omcocbM-EeKd56X4hcZPSw/method._omcod7M-EeKd56X4hcZPSw.pt"/>

             <methods xmi:id="_omcof7M-EeKd56X4hcZPSw" name="doGenerate" patternFilePath="templates/pattern._omcocbM-EeKd56X4hcZPSw/method._omcof7M-EeKd56X4hcZPSw.pt"/>

-            <parameters xmi:id="_C5yDqULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_C5yDqkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_C5yDq0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_C5yDrELpEei0i9bcSdIGKw" name="singleWildcard" type="java.lang.String"/>

-            <parameters xmi:id="_C5yDrULpEei0i9bcSdIGKw" name="_Map" type="java.lang.String"/>

-            <parameters xmi:id="_C5yqsELpEei0i9bcSdIGKw" name="objectArgument" type="java.lang.String"/>

-            <parameters xmi:id="_C5yqsULpEei0i9bcSdIGKw" name="count" type="java.lang.Integer"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C5yDqELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C5yqs0LpEei0i9bcSdIGKw"

+            <parameters xmi:id="_V4KSICSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_V4UDICSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_V4dNECSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_V4m-ECSWEemxeP6B0lLOpA" name="singleWildcard" type="java.lang.String"/>

+            <parameters xmi:id="_V455ACSWEemxeP6B0lLOpA" name="_Map" type="java.lang.String"/>

+            <parameters xmi:id="_V5DqACSWEemxeP6B0lLOpA" name="objectArgument" type="java.lang.String"/>

+            <parameters xmi:id="_V5Mz8CSWEemxeP6B0lLOpA" name="count" type="java.lang.Integer"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_V33XMCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_V5pf4CSWEemxeP6B0lLOpA"

                 called="#_omcof7M-EeKd56X4hcZPSw"/>

           </elements>

         </libraries>

       </viewpoints>

     </viewpointContainer>

     <orchestration xmi:type="fprod:ProductionPlan" xmi:id="_Prg8YDG0Ed-kc8dEZsdm2w">

-      <invocations xmi:id="_DU4rQULpEei0i9bcSdIGKw" name="EMF Model Pattern" invokedActivity="ftask:Task platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_jT-SgD1hEd-m5uHrCQ1Jew">

-        <invocationContractContainer xmi:id="_DU4rQkLpEei0i9bcSdIGKw">

-          <invocationContracts xmi:id="_DU4rQ0LpEei0i9bcSdIGKw" factoryComponentContract="#_Prg8ZTG0Ed-kc8dEZsdm2w"

+      <invocations xmi:id="_jJtAsCSWEemxeP6B0lLOpA" name="EMF Model Pattern" invokedActivity="ftask:Task platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_jT-SgD1hEd-m5uHrCQ1Jew">

+        <invocationContractContainer xmi:id="_jKJsoCSWEemxeP6B0lLOpA">

+          <invocationContracts xmi:id="_jKmYkCSWEemxeP6B0lLOpA" factoryComponentContract="#_Prg8ZTG0Ed-kc8dEZsdm2w"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_DgB2IP6fEd64XaYPo3s6sPg"/>

-          <invocationContracts xmi:id="_DU55YkLpEei0i9bcSdIGKw" factoryComponentContract="#_WRxYEFIIEd-eGOdO3WtsxA"

+          <invocationContracts xmi:id="_jLo6YCSWEemxeP6B0lLOpA" factoryComponentContract="#_WRxYEFIIEd-eGOdO3WtsxA"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_L6JSwAHAEd-4faJMEplCjxw">

-            <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_DU6gcELpEei0i9bcSdIGKw"

+            <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_jLyrYCSWEemxeP6B0lLOpA"

                 value="org.eclipse.egf.emf.pattern.base.ContentTypePatternExecutionReporter"/>

           </invocationContracts>

-          <invocationContracts xmi:id="_DU7HgELpEei0i9bcSdIGKw" factoryComponentContract="#_TxwAHVkTEd-bv5aydwO2Qw"

+          <invocationContracts xmi:id="_jMYhQCSWEemxeP6B0lLOpA" factoryComponentContract="#_TxwAHVkTEd-bv5aydwO2Qw"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_nz1HkSCaEd-Sse0r9LJWbA">

-            <type xmi:type="pattern:TypePatternList" xmi:id="_DU7HgULpEei0i9bcSdIGKw"

+            <type xmi:type="pattern:TypePatternList" xmi:id="_jMsDQCSWEemxeP6B0lLOpA"

                 elements="#_Pcm9szG0Ed-kc8dEZsdm2w"/>

           </invocationContracts>

-          <invocationContracts xmi:id="_DU7HhELpEei0i9bcSdIGKw" factoryComponentContract="#_OVsagFHVEd-dr9AWwNwIMQ"

+          <invocationContracts xmi:id="_jNR5ICSWEemxeP6B0lLOpA" factoryComponentContract="#_OVsagFHVEd-dr9AWwNwIMQ"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_NFhJ4UMgEd-Ixul1H5ANhg"/>

-          <invocationContracts xmi:id="_DU7Hh0LpEei0i9bcSdIGKw" factoryComponentContract="#_RcQCMPI7Ed-Pp8S8RvVOuQ"

+          <invocationContracts xmi:id="_jOLRACSWEemxeP6B0lLOpA" factoryComponentContract="#_RcQCMPI7Ed-Pp8S8RvVOuQ"

               invokedContract="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_JWI2sPI7Ed-Pp8S8RvVOuQ"/>

-          <invocationContracts xmi:id="_DU7HikLpEei0i9bcSdIGKw" factoryComponentContract="#_sluXsVLLEd-ZSLMRjxSbVQ"

+          <invocationContracts xmi:id="_jO634CSWEemxeP6B0lLOpA" factoryComponentContract="#_sluXsVLLEd-ZSLMRjxSbVQ"

               invokedContract="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_vtlEAFLMEd-ZSLMRjxSbVQ"/>

         </invocationContractContainer>

       </invocations>

@@ -4110,38 +4540,38 @@
   <fcore:FactoryComponent xmi:id="_PiIW4DG0Ed-kc8dEZsdm2w" name="EMF Edit Pattern">

     <contractContainer xmi:id="_Prg8bzG0Ed-kc8dEZsdm2w">

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_Prg8cDG0Ed-kc8dEZsdm2w"

-          description="EMF Edit Pattern" name="genModel" mandatory="true" invocationContracts="#_DU7uk0LpEei0i9bcSdIGKw">

-        <type xmi:type="domain:TypeDomain" xmi:id="_DU7ulkLpEei0i9bcSdIGKw"/>

+          description="EMF Edit Pattern" name="genModel" mandatory="true" invocationContracts="#_jQtAkCSWEemxeP6B0lLOpA">

+        <type xmi:type="domain:TypeDomain" xmi:id="_jRTdgCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_jzYi8FIIEd-eGOdO3WtsxA"

-          description="EMF Edit Pattern" name="pattern.execution.reporter" invocationContracts="#_DU7ul0LpEei0i9bcSdIGKw">

-        <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_DU7umkLpEei0i9bcSdIGKw"/>

+          description="EMF Edit Pattern" name="pattern.execution.reporter" invocationContracts="#_jRmYcCSWEemxeP6B0lLOpA">

+        <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_jSDEYCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_Tx5xHVkTEd-bv5aydwO2Qw"

-          description="EMF Edit Pattern" name="pattern.ids" invocationContracts="#_DU7um0LpEei0i9bcSdIGKw">

-        <type xmi:type="pattern:TypePatternList" xmi:id="_DU7unkLpEei0i9bcSdIGKw"/>

+          description="EMF Edit Pattern" name="pattern.ids" invocationContracts="#_jSfwUCSWEemxeP6B0lLOpA">

+        <type xmi:type="pattern:TypePatternList" xmi:id="_jSyrQCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_UCnhEFHVEd-dr9AWwNwIMQ"

-          description="EMF Edit Pattern" name="pattern.substitutions" invocationContracts="#_DU7un0LpEei0i9bcSdIGKw">

-        <type xmi:type="pattern:TypePatternSubstitution" xmi:id="_DU7uoULpEei0i9bcSdIGKw"/>

+          description="EMF Edit Pattern" name="pattern.substitutions" invocationContracts="#_jTPXMCSWEemxeP6B0lLOpA">

+        <type xmi:type="pattern:TypePatternSubstitution" xmi:id="_jTiSICSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_dgkvsPI7Ed-Pp8S8RvVOuQ"

-          description="EMF Edit Pattern" name="usedGenPackages" invocationContracts="#_DU7uokLpEei0i9bcSdIGKw">

-        <type xmi:type="domain:TypeGenPackages" xmi:id="_DU7upELpEei0i9bcSdIGKw"/>

+          description="EMF Edit Pattern" name="usedGenPackages" invocationContracts="#_jT10ICSWEemxeP6B0lLOpA">

+        <type xmi:type="domain:TypeGenPackages" xmi:id="_jUR5ACSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_9wHxsFLMEd-ZSLMRjxSbVQ"

-          description="EMF Edit Pattern" name="mergeRulesURI" invocationContracts="#_DU7upULpEei0i9bcSdIGKw">

-        <type xmi:type="types:TypeURI" xmi:id="_DU7up0LpEei0i9bcSdIGKw"/>

+          description="EMF Edit Pattern" name="mergeRulesURI" invocationContracts="#_jUuk8CSWEemxeP6B0lLOpA">

+        <type xmi:type="types:TypeURI" xmi:id="_jVCG8CSWEemxeP6B0lLOpA"/>

       </contracts>

     </contractContainer>

     <viewpointContainer xmi:id="_PiIW4TG0Ed-kc8dEZsdm2w">

       <viewpoints xmi:type="pattern:PatternViewpoint" xmi:id="_PiIW4jG0Ed-kc8dEZsdm2w">

         <libraries xmi:id="_PiIW4zG0Ed-kc8dEZsdm2w" name="org.eclipse.egf.emf.pattern.edit">

-          <elements xmi:id="_PiIW5DG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/plugin.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

+          <elements xmi:id="_PiIW5DG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/plugin.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

               name="PluginXML" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#_PiIW5jG0Ed-kc8dEZsdm2w" conditionMethod="#_9qU51HLYEd-09ds9dfYpFw"

               initMethod="#_PiIW5zG0Ed-kc8dEZsdm2w" footerMethod="#_PiIW6TG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CwaFNELpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_TZwWACSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PiIW5jG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PiIW5DG0Ed-kc8dEZsdm2w/method._PiIW5jG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PiIW5zG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PiIW5DG0Ed-kc8dEZsdm2w/method._PiIW5zG0Ed-kc8dEZsdm2w.pt"/>

@@ -4152,20 +4582,20 @@
             <methods xmi:id="_SuSFqGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PiIW5DG0Ed-kc8dEZsdm2w/method._SuSFqGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_09tDuWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PiIW5DG0Ed-kc8dEZsdm2w/method._09tDuWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PiIW7TG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PiIW5DG0Ed-kc8dEZsdm2w/method._PiIW7TG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CwaFOkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CwaFPkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Tb2AsCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TclnkCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CwasQELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TdCTgCSWEemxeP6B0lLOpA"

                 called="#_PiIW7TG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CwasQULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CwasQkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_TdLdcCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Tde_cCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PibR0DG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/build.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

+          <elements xmi:id="_PibR0DG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/build.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

               name="BuildProperties" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#_PibR0jG0Ed-kc8dEZsdm2w" conditionMethod="#_9kEg2HLYEd-09ds9dfYpFw"

               initMethod="#_PibR0zG0Ed-kc8dEZsdm2w" footerMethod="#_PibR1TG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_Cwqj4ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Td7EUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PibR0jG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PibR0DG0Ed-kc8dEZsdm2w/method._PibR0jG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PibR0zG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PibR0DG0Ed-kc8dEZsdm2w/method._PibR0zG0Ed-kc8dEZsdm2w.pt"/>

@@ -4176,20 +4606,20 @@
             <methods xmi:id="_St_KvGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PibR0DG0Ed-kc8dEZsdm2w/method._St_KvGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_09QXzWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PibR0DG0Ed-kc8dEZsdm2w/method._09QXzWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PibR2TG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PibR0DG0Ed-kc8dEZsdm2w/method._PibR2TG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CwrK9ELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CwrK-ELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Tf3lECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TgwV4CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CwrK-kLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_ThD34CSWEemxeP6B0lLOpA"

                 called="#_PibR2TG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CwrK-0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CwrK_ELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_ThNB0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Thf8wCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PiuMwDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/manifest.mfjet&quot;&#xA;"

+          <elements xmi:id="_PiuMwDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/manifest.mfjet&quot;&#xA;"

               name="ManifestMF" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#_PiuMwjG0Ed-kc8dEZsdm2w" conditionMethod="#_9nWeVHLYEd-09ds9dfYpFw"

               initMethod="#_PiuMwzG0Ed-kc8dEZsdm2w" footerMethod="#_PiuMxTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_Cw7CkULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Th8osCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PiuMwjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PiuMwDG0Ed-kc8dEZsdm2w/method._PiuMwjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PiuMwzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PiuMwDG0Ed-kc8dEZsdm2w/method._PiuMwzG0Ed-kc8dEZsdm2w.pt"/>

@@ -4200,20 +4630,20 @@
             <methods xmi:id="_SuI7uGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PiuMwDG0Ed-kc8dEZsdm2w/method._SuI7uGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_09j5yWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PiuMwDG0Ed-kc8dEZsdm2w/method._09j5yWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PiuMyTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PiuMwDG0Ed-kc8dEZsdm2w/method._PiuMyTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Cw7po0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cw7pp0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Tj4iYCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Tkx6QCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cw7pqULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TlOmMCSWEemxeP6B0lLOpA"

                 called="#_PiuMyTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_Cw7pqkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cw7pq0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_TlYXMCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TlrSICSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_Pi39wDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/plugin.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

+          <elements xmi:id="_Pi39wDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/plugin.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

               name="PluginProperties" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_xxtwkCg7Ed-ROrlGa8LEeQ"

               headerMethod="#_Pi39wjG0Ed-kc8dEZsdm2w" conditionMethod="#_9tdGVHLYEd-09ds9dfYpFw"

               initMethod="#_Pi39wzG0Ed-kc8dEZsdm2w" footerMethod="#_Pi39xTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_Cxd1IULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_TqmOYCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_Pi39wjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Pi39wDG0Ed-kc8dEZsdm2w/method._Pi39wjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_Pi39wzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Pi39wDG0Ed-kc8dEZsdm2w/method._Pi39wzG0Ed-kc8dEZsdm2w.pt"/>

@@ -4224,20 +4654,20 @@
             <methods xmi:id="_Sub2qGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._Pi39wDG0Ed-kc8dEZsdm2w/method._Sub2qGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_0920uWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Pi39wDG0Ed-kc8dEZsdm2w/method._0920uWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_Pi39yTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Pi39wDG0Ed-kc8dEZsdm2w/method._Pi39yTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Cxd1J0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cxd1K0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_TsrSACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Ttbf8CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_pQ16sChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CxecMELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Tt3k0CSWEemxeP6B0lLOpA"

                 called="#_Pi39yTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CxecMULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CxecMkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_TuBV0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TuLG0CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PjK4sDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.addPropertyDescriptor.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.getText.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.getStyledText.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsReferenceDelegatedFeature.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsAttributeDelegatedFeature.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsReferenceFeature.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsAttributeFeature.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.insert&#xA;"

+          <elements xmi:id="_PjK4sDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.addPropertyDescriptor.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.getText.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.getStyledText.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsReferenceDelegatedFeature.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsAttributeDelegatedFeature.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsReferenceFeature.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsAttributeFeature.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.insert&#xA;"

               name="ItemProvider" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_hYG6UCg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PjK4sjG0Ed-kc8dEZsdm2w" conditionMethod="#_9wJN9HLYEd-09ds9dfYpFw"

               initMethod="#_PjK4szG0Ed-kc8dEZsdm2w" footerMethod="#_PjK4tTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CxwwEULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_T292cCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PjK4sjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PjK4sDG0Ed-kc8dEZsdm2w/method._PjK4sjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PjK4szG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PjK4sDG0Ed-kc8dEZsdm2w/method._PjK4szG0Ed-kc8dEZsdm2w.pt"/>

@@ -4248,20 +4678,20 @@
             <methods xmi:id="_SuuxqGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PjK4sDG0Ed-kc8dEZsdm2w/method._SuuxqGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_0-TgqWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PjK4sDG0Ed-kc8dEZsdm2w/method._0-TgqWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PjK4uTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PjK4sDG0Ed-kc8dEZsdm2w/method._PjK4uTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CxwwF0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CxxXI0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_T45wICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_T5pXACSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_Chxo4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CxxXJULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_T6GC8CSWEemxeP6B0lLOpA"

                 called="#_PjK4uTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CxxXJkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CxxXJ0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_T6PM4CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_T6Y94CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PjdzoDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/ItemProviderAdapterFactory.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsReferenceDelegatedFeature.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsAttributeDelegatedFeature.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsReferenceFeature.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsAttributeFeature.override&#xA;"

+          <elements xmi:id="_PjdzoDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/ItemProviderAdapterFactory.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsReferenceDelegatedFeature.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsAttributeDelegatedFeature.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsReferenceFeature.override&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsAttributeFeature.override&#xA;"

               name="ItemProviderAdapterFactory" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PjdzojG0Ed-kc8dEZsdm2w" conditionMethod="#_92_c1HLYEd-09ds9dfYpFw"

               initMethod="#_PjdzozG0Ed-kc8dEZsdm2w" footerMethod="#_PjdzpTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CyS7kULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_T_AYICSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PjdzojG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PjdzoDG0Ed-kc8dEZsdm2w/method._PjdzojG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PjdzozG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PjdzoDG0Ed-kc8dEZsdm2w/method._PjdzozG0Ed-kc8dEZsdm2w.pt"/>

@@ -4272,20 +4702,20 @@
             <methods xmi:id="_SulnpGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PjdzoDG0Ed-kc8dEZsdm2w/method._SulnpGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_09_-qWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PjdzoDG0Ed-kc8dEZsdm2w/method._09_-qWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PjdzqTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PjdzoDG0Ed-kc8dEZsdm2w/method._PjdzqTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CyTiokLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CyTipkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_UA8R0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UBsfwCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CyTiqELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UCIkoCSWEemxeP6B0lLOpA"

                 called="#_PjdzqTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CyTiqULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CyTiqkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_UCSVoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UClQkCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PjwukDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/Plugin.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PjwukDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/Plugin.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="Plugin" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_F0In8Cg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PjwukjG0Ed-kc8dEZsdm2w" conditionMethod="#_9y-fhHLYEd-09ds9dfYpFw"

               initMethod="#_PjwukzG0Ed-kc8dEZsdm2w" footerMethod="#_PjwulTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_Cy0gAELpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_T6-zwCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PjwukjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PjwukDG0Ed-kc8dEZsdm2w/method._PjwukjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PjwukzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PjwukDG0Ed-kc8dEZsdm2w/method._PjwukzG0Ed-kc8dEZsdm2w.pt"/>

@@ -4296,20 +4726,20 @@
             <methods xmi:id="_SuuxmGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PjwukDG0Ed-kc8dEZsdm2w/method._SuuxmGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_0-JvqWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PjwukDG0Ed-kc8dEZsdm2w/method._0-JvqWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PjwumTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PjwukDG0Ed-kc8dEZsdm2w/method._PjwumTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Cy0gBkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cy1HE0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_T87UgCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_T9q7YCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_cjQNwChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cy1HFULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_T-HnUCSWEemxeP6B0lLOpA"

                 called="#_PjwumTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_Cy1HFkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cy1HF0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_T-QxQCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_T-aiQCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_Pj6fkDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * &#xA;"

+          <elements xmi:id="_Pj6fkDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * &#xA;"

               name="CreateChildIconsForGenPackage" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_HODPICrVEd-81OQ8yF10Og"

               headerMethod="#_PkEQkDG0Ed-kc8dEZsdm2w" conditionMethod="#_97KyNHLYEd-09ds9dfYpFw"

               initMethod="#_PkEQkTG0Ed-kc8dEZsdm2w" footerMethod="#_PkEQkzG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_Czf1cULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_UGm08CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PkEQkDG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Pj6fkDG0Ed-kc8dEZsdm2w/method._PkEQkDG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PkEQkTG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Pj6fkDG0Ed-kc8dEZsdm2w/method._PkEQkTG0Ed-kc8dEZsdm2w.pt"/>

@@ -4317,20 +4747,20 @@
             <methods xmi:id="_PkEQkzG0Ed-kc8dEZsdm2w" name="footer" patternFilePath="templates/pattern._Pj6fkDG0Ed-kc8dEZsdm2w/method._PkEQkzG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_0-wMmGKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Pj6fkDG0Ed-kc8dEZsdm2w/method._0-wMmGKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PkEQlzG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Pj6fkDG0Ed-kc8dEZsdm2w/method._PkEQlzG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Czf1d0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CzgcgULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_UIiuoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UI_akCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_yLcWwCt-Ed-D6YqMf1n1Bg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Czgcg0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UJcGgCSWEemxeP6B0lLOpA"

                 called="#_PkEQlzG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CzgchELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CzgchULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_UJl3gCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UJvBcCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_0yyMcCt-Ed-D6YqMf1n1Bg"/>

           </elements>

-          <elements xmi:id="_PkNagDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * &#xA;"

+          <elements xmi:id="_PkNagDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * &#xA;"

               name="ItemIcon" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_IzJSwCrXEd-81OQ8yF10Og"

               headerMethod="#_PkNagjG0Ed-kc8dEZsdm2w" conditionMethod="#_99Zm1HLYEd-09ds9dfYpFw"

               initMethod="#_PkNagzG0Ed-kc8dEZsdm2w" footerMethod="#_PkNahTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CzFlwULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_UDB8gCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PkNagjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PkNagDG0Ed-kc8dEZsdm2w/method._PkNagjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PkNagzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PkNagDG0Ed-kc8dEZsdm2w/method._PkNagzG0Ed-kc8dEZsdm2w.pt"/>

@@ -4338,20 +4768,20 @@
             <methods xmi:id="_PkNahTG0Ed-kc8dEZsdm2w" name="footer" patternFilePath="templates/pattern._PkNagDG0Ed-kc8dEZsdm2w/method._PkNahTG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_0-mbmGKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PkNagDG0Ed-kc8dEZsdm2w/method._0-mbmGKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PkNaiTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PkNagDG0Ed-kc8dEZsdm2w/method._PkNaiTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CzFlx0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CzGM0ELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_UE92MCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UFaiICSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_Chxo4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CzGM0kLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UFtdECSWEemxeP6B0lLOpA"

                 called="#_PkNaiTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CzGM00LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CzGM1ELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_UGA_ECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UGKJACSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_Pkg8gDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * &#xA;"

+          <elements xmi:id="_Pkg8gDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * &#xA;"

               name="CreateChildIconsForGenClass" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_IzJSwCrXEd-81OQ8yF10Og"

               headerMethod="#_Pkg8gjG0Ed-kc8dEZsdm2w" conditionMethod="#_9_MWlHLYEd-09ds9dfYpFw"

               initMethod="#_Pkg8gzG0Ed-kc8dEZsdm2w" footerMethod="#_Pkg8hTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CzSaEULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_UKfPYCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_Pkg8gjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Pkg8gDG0Ed-kc8dEZsdm2w/method._Pkg8gjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_Pkg8gzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Pkg8gDG0Ed-kc8dEZsdm2w/method._Pkg8gzG0Ed-kc8dEZsdm2w.pt"/>

@@ -4359,20 +4789,20 @@
             <methods xmi:id="_Pkg8hTG0Ed-kc8dEZsdm2w" name="footer" patternFilePath="templates/pattern._Pkg8gDG0Ed-kc8dEZsdm2w/method._Pkg8hTG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_0-cqmGKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Pkg8gDG0Ed-kc8dEZsdm2w/method._0-cqmGKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_Pkg8iTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Pkg8gDG0Ed-kc8dEZsdm2w/method._Pkg8iTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CzTBJULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CzTBJ0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_UMbJECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UM31ACSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_Chxo4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CzTBKULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UNT54CSWEemxeP6B0lLOpA"

                 called="#_Pkg8iTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CzTBKkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CzTBK0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_UNdq4CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UNnb4CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_QPtOcH7rEd-W9_ZFSEQEPg" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/module.gwt.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

+          <elements xmi:id="_QPtOcH7rEd-W9_ZFSEQEPg" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/module.gwt.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

               name="ModuleGWTXML" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#_QPtOcn7rEd-W9_ZFSEQEPg" conditionMethod="#_QPtOdH7rEd-W9_ZFSEQEPg"

               initMethod="#_QPtOc37rEd-W9_ZFSEQEPg" footerMethod="#_QPtOdn7rEd-W9_ZFSEQEPg">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CxN9gULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_TmH-ECSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_QPtOcn7rEd-W9_ZFSEQEPg" name="header" patternFilePath="templates/pattern._QPtOcH7rEd-W9_ZFSEQEPg/method._QPtOcn7rEd-W9_ZFSEQEPg.pt"/>

             <methods xmi:id="_QPtOc37rEd-W9_ZFSEQEPg" name="init" patternFilePath="templates/pattern._QPtOcH7rEd-W9_ZFSEQEPg/method._QPtOc37rEd-W9_ZFSEQEPg.pt"/>

@@ -4383,20 +4813,20 @@
             <methods xmi:id="_QP2YYX7rEd-W9_ZFSEQEPg" name="setArgument" patternFilePath="templates/pattern._QPtOcH7rEd-W9_ZFSEQEPg/method._QP2YYX7rEd-W9_ZFSEQEPg.pt"/>

             <methods xmi:id="_QP2YYn7rEd-W9_ZFSEQEPg" name="ensureProjectExists" patternFilePath="templates/pattern._QPtOcH7rEd-W9_ZFSEQEPg/method._QP2YYn7rEd-W9_ZFSEQEPg.pt"/>

             <methods xmi:id="_QP2YZH7rEd-W9_ZFSEQEPg" name="doGenerate" patternFilePath="templates/pattern._QPtOcH7rEd-W9_ZFSEQEPg/method._QP2YZH7rEd-W9_ZFSEQEPg.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CxN9h0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CxN9i0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ToNowCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_To9PoCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CxN9jULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TpZ7kCSWEemxeP6B0lLOpA"

                 called="#_QP2YZH7rEd-W9_ZFSEQEPg"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CxN9jkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CxN9j0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_TpjFgCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Tps2gCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_QRpIIH7rEd-W9_ZFSEQEPg" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/Images.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_QRpIIH7rEd-W9_ZFSEQEPg" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/Images.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="Images" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_F0In8Cg6Ed-ROrlGa8LEeQ"

               headerMethod="#_QRpIIn7rEd-W9_ZFSEQEPg" conditionMethod="#_QRpIJH7rEd-W9_ZFSEQEPg"

               initMethod="#_QRpII37rEd-W9_ZFSEQEPg" footerMethod="#_QRpIJn7rEd-W9_ZFSEQEPg">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CyBOwULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Tuw8sCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_QRpIIn7rEd-W9_ZFSEQEPg" name="header" patternFilePath="templates/pattern._QRpIIH7rEd-W9_ZFSEQEPg/method._QRpIIn7rEd-W9_ZFSEQEPg.pt"/>

             <methods xmi:id="_QRpII37rEd-W9_ZFSEQEPg" name="init" patternFilePath="templates/pattern._QRpIIH7rEd-W9_ZFSEQEPg/method._QRpII37rEd-W9_ZFSEQEPg.pt"/>

@@ -4407,20 +4837,20 @@
             <methods xmi:id="_QRpIKX7rEd-W9_ZFSEQEPg" name="setArgument" patternFilePath="templates/pattern._QRpIIH7rEd-W9_ZFSEQEPg/method._QRpIKX7rEd-W9_ZFSEQEPg.pt"/>

             <methods xmi:id="_QRpIKn7rEd-W9_ZFSEQEPg" name="ensureProjectExists" patternFilePath="templates/pattern._QRpIIH7rEd-W9_ZFSEQEPg/method._QRpIKn7rEd-W9_ZFSEQEPg.pt"/>

             <methods xmi:id="_QRpILH7rEd-W9_ZFSEQEPg" name="doGenerate" patternFilePath="templates/pattern._QRpIIH7rEd-W9_ZFSEQEPg/method._QRpILH7rEd-W9_ZFSEQEPg.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CyBOx0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CyB100LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Tws2YCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TxcdQCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_cjQNwChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CyB11ULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Tx5JMCSWEemxeP6B0lLOpA"

                 called="#_QRpILH7rEd-W9_ZFSEQEPg"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CyB11kLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CyB110LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_TyC6MCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_TyMrMCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_QR8DEH7rEd-W9_ZFSEQEPg" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/Properties.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_QR8DEH7rEd-W9_ZFSEQEPg" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/Properties.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="Properties" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_F0In8Cg6Ed-ROrlGa8LEeQ"

               headerMethod="#_QR8DEn7rEd-W9_ZFSEQEPg" conditionMethod="#_QR8DFH7rEd-W9_ZFSEQEPg"

               initMethod="#_QR8DE37rEd-W9_ZFSEQEPg" footerMethod="#_QR8DFn7rEd-W9_ZFSEQEPg">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CyjaQULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_TyyhECSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_QR8DEn7rEd-W9_ZFSEQEPg" name="header" patternFilePath="templates/pattern._QR8DEH7rEd-W9_ZFSEQEPg/method._QR8DEn7rEd-W9_ZFSEQEPg.pt"/>

             <methods xmi:id="_QR8DE37rEd-W9_ZFSEQEPg" name="init" patternFilePath="templates/pattern._QR8DEH7rEd-W9_ZFSEQEPg/method._QR8DE37rEd-W9_ZFSEQEPg.pt"/>

@@ -4431,320 +4861,320 @@
             <methods xmi:id="_QR8DGX7rEd-W9_ZFSEQEPg" name="setArgument" patternFilePath="templates/pattern._QR8DEH7rEd-W9_ZFSEQEPg/method._QR8DGX7rEd-W9_ZFSEQEPg.pt"/>

             <methods xmi:id="_QR8DGn7rEd-W9_ZFSEQEPg" name="ensureProjectExists" patternFilePath="templates/pattern._QR8DEH7rEd-W9_ZFSEQEPg/method._QR8DGn7rEd-W9_ZFSEQEPg.pt"/>

             <methods xmi:id="_QR8DHH7rEd-W9_ZFSEQEPg" name="doGenerate" patternFilePath="templates/pattern._QR8DEH7rEd-W9_ZFSEQEPg/method._QR8DHH7rEd-W9_ZFSEQEPg.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CykBVELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CykBWELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_T0uawCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_T1nyoCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_cjQNwChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CykBWkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_T16tkCSWEemxeP6B0lLOpA"

                 called="#_QR8DHH7rEd-W9_ZFSEQEPg"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CykBW0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CykBXELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_T2NogCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_T2XZgCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

         </libraries>

         <libraries xmi:id="_03mkEGJ-Ed-FqczH3ESmRw" name="org.eclipse.egf.emf.pattern.edit.call.ItemProvider">

-          <elements xmi:id="_03mkEWJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

+          <elements xmi:id="_03mkEWJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

               name="ItemProvider.addPropertyDescriptor.override" headerMethod="#_03mkE2J-Ed-FqczH3ESmRw"

               conditionMethod="#_BuWv9XLZEd-09ds9dfYpFw" initMethod="#_03mkFGJ-Ed-FqczH3ESmRw"

               footerMethod="#_03mkFmJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DPGMUkLpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_g-E2oCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_03mkE2J-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._03mkEWJ-Ed-FqczH3ESmRw/method._03mkE2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_03mkFGJ-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._03mkEWJ-Ed-FqczH3ESmRw/method._03mkFGJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BuWv9XLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._03mkEWJ-Ed-FqczH3ESmRw/method._BuWv9XLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_03mkFmJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._03mkEWJ-Ed-FqczH3ESmRw/method._03mkFmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_03mkHWJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._03mkEWJ-Ed-FqczH3ESmRw/method._03mkHWJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DPGzZULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DPGzZkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DPGzZ0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DPGzaELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DPGzaULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DPGzakLpEei0i9bcSdIGKw" name="_List" type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DPGzZELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DPGzbELpEei0i9bcSdIGKw"

+            <parameters xmi:id="_hAAwUCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hAKhUCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hAdcQCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_hAnNQCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_hAwXMCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_hA6IMCSWEemxeP6B0lLOpA" name="_List" type="java.lang.String"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_g_2_UCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_hBW0ICSWEemxeP6B0lLOpA"

                 called="#_03mkHWJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_03wVEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

+          <elements xmi:id="_03wVEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

               name="ItemProvider.getText.override" headerMethod="#_03wVEmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_BvZRxHLZEd-09ds9dfYpFw" initMethod="#_03wVE2J-Ed-FqczH3ESmRw"

               footerMethod="#_03wVFWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DPRygULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_hBzgECSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_03wVEmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._03wVEGJ-Ed-FqczH3ESmRw/method._03wVEmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_03wVE2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._03wVEGJ-Ed-FqczH3ESmRw/method._03wVE2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_BvZRxHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._03wVEGJ-Ed-FqczH3ESmRw/method._BvZRxHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_03wVFWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._03wVEGJ-Ed-FqczH3ESmRw/method._03wVFWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_03wVG2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._03wVEGJ-Ed-FqczH3ESmRw/method._03wVG2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DPRyiELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DPRyiULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DPRyikLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DPRyi0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DPRyjELpEei0i9bcSdIGKw" name="_List" type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DPRyh0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DPRyjkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_hD4jsCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hECUsCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_hEMFsCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_hEfAoCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_hEoKkCSWEemxeP6B0lLOpA" name="_List" type="java.lang.String"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_hDlowCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_hE7skCSWEemxeP6B0lLOpA"

                 called="#_03wVG2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_036GEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsReferenceDelegatedFeature.insert&#xA;"

+          <elements xmi:id="_036GEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsReferenceDelegatedFeature.insert&#xA;"

               name="ItemProvider.newChildDescriptorsReferenceDelegatedFeature.override"

               headerMethod="#_036GEmJ-Ed-FqczH3ESmRw" conditionMethod="#_Bx7oZHLZEd-09ds9dfYpFw"

               initMethod="#_036GE2J-Ed-FqczH3ESmRw" footerMethod="#_036GFWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DPmioULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_hI9Q8CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_036GEmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._036GEGJ-Ed-FqczH3ESmRw/method._036GEmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_036GE2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._036GEGJ-Ed-FqczH3ESmRw/method._036GE2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_Bx7oZHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._036GEGJ-Ed-FqczH3ESmRw/method._Bx7oZHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_036GFWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._036GEGJ-Ed-FqczH3ESmRw/method._036GFWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_036GIGJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._036GEGJ-Ed-FqczH3ESmRw/method._036GIGJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DPmiqELpEei0i9bcSdIGKw" name="createClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DPmiqULpEei0i9bcSdIGKw" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DPmiqkLpEei0i9bcSdIGKw" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DPmiq0LpEei0i9bcSdIGKw" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

-            <parameters xmi:id="_DPmirELpEei0i9bcSdIGKw" name="childCreationData"

+            <parameters xmi:id="_hLCUkCSWEemxeP6B0lLOpA" name="createClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hLMFkCSWEemxeP6B0lLOpA" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hLfAgCSWEemxeP6B0lLOpA" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hLoxgCSWEemxeP6B0lLOpA" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

+            <parameters xmi:id="_hLx7cCSWEemxeP6B0lLOpA" name="childCreationData"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenClass$ChildCreationData"/>

-            <parameters xmi:id="_DPmirULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DPmirkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DPmir0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DPmisELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DPmip0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DPmiskLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_hL7scCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hMOnYCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_hMYYYCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_hMiJYCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_hK5KoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_hM-OQCSWEemxeP6B0lLOpA"

                 called="#_036GIGJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_04NBAGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

+          <elements xmi:id="_04NBAGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

               name="ItemProvider.newChildDescriptorsReferenceDelegatedFeature.insert"

               headerMethod="#_04NBAmJ-Ed-FqczH3ESmRw" conditionMethod="#_B2Z4tHLZEd-09ds9dfYpFw"

               initMethod="#_04NBA2J-Ed-FqczH3ESmRw" footerMethod="#_04NBBWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DPwToULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_hNa6MCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_04NBAmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._04NBAGJ-Ed-FqczH3ESmRw/method._04NBAmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_04NBA2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._04NBAGJ-Ed-FqczH3ESmRw/method._04NBA2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_B2Z4tHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._04NBAGJ-Ed-FqczH3ESmRw/method._B2Z4tHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_04NBBWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._04NBAGJ-Ed-FqczH3ESmRw/method._04NBBWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_04NBEGJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._04NBAGJ-Ed-FqczH3ESmRw/method._04NBEGJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DPwTqELpEei0i9bcSdIGKw" name="createClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DPwTqULpEei0i9bcSdIGKw" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DPwTqkLpEei0i9bcSdIGKw" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DPwTq0LpEei0i9bcSdIGKw" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

-            <parameters xmi:id="_DPwTrELpEei0i9bcSdIGKw" name="childCreationData"

+            <parameters xmi:id="_hPgk4CSWEemxeP6B0lLOpA" name="createClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hPqV4CSWEemxeP6B0lLOpA" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hPzf0CSWEemxeP6B0lLOpA" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hQHB0CSWEemxeP6B0lLOpA" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

+            <parameters xmi:id="_hQQLwCSWEemxeP6B0lLOpA" name="childCreationData"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenClass$ChildCreationData"/>

-            <parameters xmi:id="_DPwTrULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DPwTrkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DPwTr0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DPwTsELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DPwTp0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DPwTskLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_hQZ8wCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hQs3sCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_hQ2osCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_hQ_yoCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_hPXa8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_hRTUoCSWEemxeP6B0lLOpA"

                 called="#_04NBEGJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_04WyAGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsAttributeDelegatedFeature.insert&#xA;"

+          <elements xmi:id="_04WyAGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsAttributeDelegatedFeature.insert&#xA;"

               name="ItemProvider.newChildDescriptorsAttributeDelegatedFeature.override"

               headerMethod="#_04WyAmJ-Ed-FqczH3ESmRw" conditionMethod="#_B3vVdHLZEd-09ds9dfYpFw"

               initMethod="#_04WyA2J-Ed-FqczH3ESmRw" footerMethod="#_04WyBWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DP7SwULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_hR5KgCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_04WyAmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._04WyAGJ-Ed-FqczH3ESmRw/method._04WyAmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_04WyA2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._04WyAGJ-Ed-FqczH3ESmRw/method._04WyA2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_B3vVdHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._04WyAGJ-Ed-FqczH3ESmRw/method._B3vVdHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_04WyBWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._04WyAGJ-Ed-FqczH3ESmRw/method._04WyBWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_04WyEGJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._04WyAGJ-Ed-FqczH3ESmRw/method._04WyEGJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DP751ELpEei0i9bcSdIGKw" name="createDataType" type="org.eclipse.emf.codegen.ecore.genmodel.GenDataType"/>

-            <parameters xmi:id="_DP751ULpEei0i9bcSdIGKw" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DP751kLpEei0i9bcSdIGKw" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DP7510LpEei0i9bcSdIGKw" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

-            <parameters xmi:id="_DP752ELpEei0i9bcSdIGKw" name="childCreationData"

+            <parameters xmi:id="_hT1EMCSWEemxeP6B0lLOpA" name="createDataType" type="org.eclipse.emf.codegen.ecore.genmodel.GenDataType"/>

+            <parameters xmi:id="_hT-1MCSWEemxeP6B0lLOpA" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hURwICSWEemxeP6B0lLOpA" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hUbhICSWEemxeP6B0lLOpA" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

+            <parameters xmi:id="_hUkrECSWEemxeP6B0lLOpA" name="childCreationData"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenClass$ChildCreationData"/>

-            <parameters xmi:id="_DP752ULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DP752kLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DP7520LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DP753ELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DP7500LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DP753kLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_hUucECSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hVBXACSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_hVLIACSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_hVU5ACSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_hTr6QCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_hVw94CSWEemxeP6B0lLOpA"

                 called="#_04WyEGJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_04f78GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

+          <elements xmi:id="_04f78GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

               name="ItemProvider.newChildDescriptorsAttributeDelegatedFeature.insert"

               headerMethod="#_04f78mJ-Ed-FqczH3ESmRw" conditionMethod="#_B4yeVHLZEd-09ds9dfYpFw"

               initMethod="#_04f782J-Ed-FqczH3ESmRw" footerMethod="#_04f79WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DQFDwELpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_hWNp0CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_04f78mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._04f78GJ-Ed-FqczH3ESmRw/method._04f78mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_04f782J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._04f78GJ-Ed-FqczH3ESmRw/method._04f782J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_B4yeVHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._04f78GJ-Ed-FqczH3ESmRw/method._B4yeVHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_04f79WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._04f78GJ-Ed-FqczH3ESmRw/method._04f79WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_04f8AGJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._04f78GJ-Ed-FqczH3ESmRw/method._04f8AGJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DQFDx0LpEei0i9bcSdIGKw" name="createDataType" type="org.eclipse.emf.codegen.ecore.genmodel.GenDataType"/>

-            <parameters xmi:id="_DQFDyELpEei0i9bcSdIGKw" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DQFDyULpEei0i9bcSdIGKw" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DQFDykLpEei0i9bcSdIGKw" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

-            <parameters xmi:id="_DQFDy0LpEei0i9bcSdIGKw" name="childCreationData"

+            <parameters xmi:id="_hYTUgCSWEemxeP6B0lLOpA" name="createDataType" type="org.eclipse.emf.codegen.ecore.genmodel.GenDataType"/>

+            <parameters xmi:id="_hYdFgCSWEemxeP6B0lLOpA" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hYmPcCSWEemxeP6B0lLOpA" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hY5xcCSWEemxeP6B0lLOpA" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

+            <parameters xmi:id="_hZC7YCSWEemxeP6B0lLOpA" name="childCreationData"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenClass$ChildCreationData"/>

-            <parameters xmi:id="_DQFDzELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DQFDzULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DQFDzkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DQFDz0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DQFDxkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DQFD0ULpEei0i9bcSdIGKw"

+            <parameters xmi:id="_hZMsYCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hZV2UCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_hZpYUCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_hZyiQCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_hYJjgCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_haGEQCSWEemxeP6B0lLOpA"

                 called="#_04f8AGJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_04ps8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsReferenceFeature.insert&#xA;"

+          <elements xmi:id="_04ps8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsReferenceFeature.insert&#xA;"

               name="ItemProvider.newChildDescriptorsReferenceFeature.override" headerMethod="#_04ps8mJ-Ed-FqczH3ESmRw"

               conditionMethod="#_B63h9HLZEd-09ds9dfYpFw" initMethod="#_04ps82J-Ed-FqczH3ESmRw"

               footerMethod="#_04ps9WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DQPb0ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_har6ICSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_04ps8mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._04ps8GJ-Ed-FqczH3ESmRw/method._04ps8mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_04ps82J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._04ps8GJ-Ed-FqczH3ESmRw/method._04ps82J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_B63h9HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._04ps8GJ-Ed-FqczH3ESmRw/method._B63h9HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_04ps9WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._04ps8GJ-Ed-FqczH3ESmRw/method._04ps9WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_04ptAGJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._04ps8GJ-Ed-FqczH3ESmRw/method._04ptAGJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DQPb2ELpEei0i9bcSdIGKw" name="createClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DQPb2ULpEei0i9bcSdIGKw" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DQPb2kLpEei0i9bcSdIGKw" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DQPb20LpEei0i9bcSdIGKw" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

-            <parameters xmi:id="_DQPb3ELpEei0i9bcSdIGKw" name="childCreationData"

+            <parameters xmi:id="_hcxk0CSWEemxeP6B0lLOpA" name="createClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hc6uwCSWEemxeP6B0lLOpA" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hdEfwCSWEemxeP6B0lLOpA" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hdOQwCSWEemxeP6B0lLOpA" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

+            <parameters xmi:id="_hdhLsCSWEemxeP6B0lLOpA" name="childCreationData"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenClass$ChildCreationData"/>

-            <parameters xmi:id="_DQPb3ULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DQPb3kLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DQPb30LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DQPb4ELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DQPb10LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DQPb4kLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_hdq8sCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hd0GoCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_hd93oCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_heQykCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_hcep4CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_hejtgCSWEemxeP6B0lLOpA"

                 called="#_04ptAGJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_04y24GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

+          <elements xmi:id="_04y24GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

               name="ItemProvider.newChildDescriptorsReferenceFeature.insert" headerMethod="#_04y24mJ-Ed-FqczH3ESmRw"

               conditionMethod="#_B-caZHLZEd-09ds9dfYpFw" initMethod="#_04y242J-Ed-FqczH3ESmRw"

               footerMethod="#_04y25WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DQZM0ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_hfKKcCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_04y24mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._04y24GJ-Ed-FqczH3ESmRw/method._04y24mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_04y242J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._04y24GJ-Ed-FqczH3ESmRw/method._04y242J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_B-caZHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._04y24GJ-Ed-FqczH3ESmRw/method._B-caZHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_04y25WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._04y24GJ-Ed-FqczH3ESmRw/method._04y25WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_04y28GJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._04y24GJ-Ed-FqczH3ESmRw/method._04y28GJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DQZM2ELpEei0i9bcSdIGKw" name="createClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DQZM2ULpEei0i9bcSdIGKw" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DQZM2kLpEei0i9bcSdIGKw" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DQZM20LpEei0i9bcSdIGKw" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

-            <parameters xmi:id="_DQZM3ELpEei0i9bcSdIGKw" name="childCreationData"

+            <parameters xmi:id="_hhGEICSWEemxeP6B0lLOpA" name="createClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hhY_ECSWEemxeP6B0lLOpA" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hhiwECSWEemxeP6B0lLOpA" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hhr6ACSWEemxeP6B0lLOpA" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

+            <parameters xmi:id="_hh_cACSWEemxeP6B0lLOpA" name="childCreationData"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenClass$ChildCreationData"/>

-            <parameters xmi:id="_DQZM3ULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DQZM3kLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DQZM30LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DQZM4ELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DQZM10LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DQZM4kLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_hiIl8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hiSW8CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_hicH8CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_hivC4CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_hg86MCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_hjB90CSWEemxeP6B0lLOpA"

                 called="#_04y28GJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_048n4GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsAttributeFeature.insert&#xA;"

+          <elements xmi:id="_048n4GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.edit.call.ItemProvider.ItemProvider.newChildDescriptorsAttributeFeature.insert&#xA;"

               name="ItemProvider.newChildDescriptorsAttributeFeature.override" headerMethod="#_048n4mJ-Ed-FqczH3ESmRw"

               conditionMethod="#_B_otNHLZEd-09ds9dfYpFw" initMethod="#_048n42J-Ed-FqczH3ESmRw"

               footerMethod="#_048n5WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DQkzAULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_hjepwCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_048n4mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._048n4GJ-Ed-FqczH3ESmRw/method._048n4mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_048n42J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._048n4GJ-Ed-FqczH3ESmRw/method._048n42J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_B_otNHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._048n4GJ-Ed-FqczH3ESmRw/method._B_otNHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_048n5WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._048n4GJ-Ed-FqczH3ESmRw/method._048n5WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_048n8GJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._048n4GJ-Ed-FqczH3ESmRw/method._048n8GJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DQkzCELpEei0i9bcSdIGKw" name="createDataType" type="org.eclipse.emf.codegen.ecore.genmodel.GenDataType"/>

-            <parameters xmi:id="_DQkzCULpEei0i9bcSdIGKw" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DQkzCkLpEei0i9bcSdIGKw" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DQkzC0LpEei0i9bcSdIGKw" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

-            <parameters xmi:id="_DQkzDELpEei0i9bcSdIGKw" name="childCreationData"

+            <parameters xmi:id="_hmKKUCSWEemxeP6B0lLOpA" name="createDataType" type="org.eclipse.emf.codegen.ecore.genmodel.GenDataType"/>

+            <parameters xmi:id="_hmT7UCSWEemxeP6B0lLOpA" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hmm2QCSWEemxeP6B0lLOpA" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hmwnQCSWEemxeP6B0lLOpA" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

+            <parameters xmi:id="_hm5xMCSWEemxeP6B0lLOpA" name="childCreationData"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenClass$ChildCreationData"/>

-            <parameters xmi:id="_DQkzDULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DQkzDkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DQkzD0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DQkzEELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DQkzB0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DQkzEkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_hnDiMCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hnWdICSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_hngOICSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_hnpYECSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_hmBAYCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_hoGEACSWEemxeP6B0lLOpA"

                 called="#_048n8GJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_05ZT0GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

+          <elements xmi:id="_05ZT0GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

               name="ItemProvider.newChildDescriptorsAttributeFeature.insert" headerMethod="#_05ZT0mJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CBIiBHLZEd-09ds9dfYpFw" initMethod="#_05ZT02J-Ed-FqczH3ESmRw"

               footerMethod="#_05ZT1WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DQvyIULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_hoiv8CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_05ZT0mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._05ZT0GJ-Ed-FqczH3ESmRw/method._05ZT0mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_05ZT02J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._05ZT0GJ-Ed-FqczH3ESmRw/method._05ZT02J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CBIiBHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._05ZT0GJ-Ed-FqczH3ESmRw/method._CBIiBHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_05ZT1WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._05ZT0GJ-Ed-FqczH3ESmRw/method._05ZT1WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_05ZT4GJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._05ZT0GJ-Ed-FqczH3ESmRw/method._05ZT4GJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DQvyKELpEei0i9bcSdIGKw" name="createDataType" type="org.eclipse.emf.codegen.ecore.genmodel.GenDataType"/>

-            <parameters xmi:id="_DQvyKULpEei0i9bcSdIGKw" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DQvyKkLpEei0i9bcSdIGKw" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DQvyK0LpEei0i9bcSdIGKw" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

-            <parameters xmi:id="_DQvyLELpEei0i9bcSdIGKw" name="childCreationData"

+            <parameters xmi:id="_hqoaoCSWEemxeP6B0lLOpA" name="createDataType" type="org.eclipse.emf.codegen.ecore.genmodel.GenDataType"/>

+            <parameters xmi:id="_hqyLoCSWEemxeP6B0lLOpA" name="createFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hq7VkCSWEemxeP6B0lLOpA" name="delegatedFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_hrOQgCSWEemxeP6B0lLOpA" name="createClassifier" type="org.eclipse.emf.codegen.ecore.genmodel.GenClassifier"/>

+            <parameters xmi:id="_hrYBgCSWEemxeP6B0lLOpA" name="childCreationData"

                 type="org.eclipse.emf.codegen.ecore.genmodel.GenClass$ChildCreationData"/>

-            <parameters xmi:id="_DQvyLULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DQvyLkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DQvyL0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DQvyMELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DQvyJ0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DQvyMkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_hrhygCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hrq8cCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_hr0tcCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_hsHoYCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_hqepoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_hsajUCSWEemxeP6B0lLOpA"

                 called="#_05ZT4GJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_051_wGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

+          <elements xmi:id="_051_wGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

               name="ItemProvider.insert" headerMethod="#_051_wmJ-Ed-FqczH3ESmRw" conditionMethod="#_CCU01HLZEd-09ds9dfYpFw"

               initMethod="#_051_w2J-Ed-FqczH3ESmRw" footerMethod="#_051_xWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DQ7YUULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_hs3PQCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_051_wmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._051_wGJ-Ed-FqczH3ESmRw/method._051_wmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_051_w2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._051_wGJ-Ed-FqczH3ESmRw/method._051_w2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CCU01HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._051_wGJ-Ed-FqczH3ESmRw/method._CCU01HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_051_xWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._051_wGJ-Ed-FqczH3ESmRw/method._051_xWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_051_y2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._051_wGJ-Ed-FqczH3ESmRw/method._051_y2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DQ7_YELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DQ7_YULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DQ7_YkLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DQ7_Y0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DQ7_ZELpEei0i9bcSdIGKw" name="_List" type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DQ7YV0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DQ7_ZkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_hu858CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hvGq8CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_hvZl4CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_hvjW4CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_hvsg0CSWEemxeP6B0lLOpA" name="_List" type="java.lang.String"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_huzI8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_hwJMwCSWEemxeP6B0lLOpA"

                 called="#_051_y2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_sd5EMKoMEeOCpsO1cKKCxA" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

+          <elements xmi:id="_sd5EMKoMEeOCpsO1cKKCxA" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/edit/ItemProvider.javajet&quot;&#xA;"

               name="ItemProvider.getStyledText.override" headerMethod="#_sd5EMqoMEeOCpsO1cKKCxA"

               conditionMethod="#_sd5ENKoMEeOCpsO1cKKCxA" initMethod="#_sd5EM6oMEeOCpsO1cKKCxA"

               footerMethod="#_sd5ENqoMEeOCpsO1cKKCxA">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DPdYsULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_hFYYgCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_sd5EMqoMEeOCpsO1cKKCxA" name="header" patternFilePath="templates/pattern._sd5EMKoMEeOCpsO1cKKCxA/method._sd5EMqoMEeOCpsO1cKKCxA.pt"/>

             <methods xmi:id="_sd5EM6oMEeOCpsO1cKKCxA" name="init" patternFilePath="templates/pattern._sd5EMKoMEeOCpsO1cKKCxA/method._sd5EM6oMEeOCpsO1cKKCxA.pt"/>

             <methods xmi:id="_sd5ENKoMEeOCpsO1cKKCxA" name="preCondition" patternFilePath="templates/pattern._sd5EMKoMEeOCpsO1cKKCxA/method._sd5ENKoMEeOCpsO1cKKCxA.pt"/>

             <methods xmi:id="_sd5ENqoMEeOCpsO1cKKCxA" name="footer" patternFilePath="templates/pattern._sd5EMKoMEeOCpsO1cKKCxA/method._sd5ENqoMEeOCpsO1cKKCxA.pt"/>

             <methods xmi:id="_sd5EPKoMEeOCpsO1cKKCxA" name="doGenerate" patternFilePath="templates/pattern._sd5EMKoMEeOCpsO1cKKCxA/method._sd5EPKoMEeOCpsO1cKKCxA.pt"/>

-            <parameters xmi:id="_DPdYuELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DPdYuULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DPdYukLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DPdYu0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DPdYvELpEei0i9bcSdIGKw" name="_List" type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DPdYt0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DPdYvkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_hHdcICSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_hHnNICSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_hH6IECSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_hID5ECSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_hINDACSWEemxeP6B0lLOpA" name="_List" type="java.lang.String"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_hHUSMCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_hIglACSWEemxeP6B0lLOpA"

                 called="#_sd5EPKoMEeOCpsO1cKKCxA"/>

           </elements>

         </libraries>

       </viewpoints>

     </viewpointContainer>

     <orchestration xmi:type="fprod:ProductionPlan" xmi:id="_Prg8azG0Ed-kc8dEZsdm2w">

-      <invocations xmi:id="_DU7ukULpEei0i9bcSdIGKw" name="EMF Edit Pattern" invokedActivity="ftask:Task platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_jT-SgD1hEd-m5uHrCQ1Jew">

-        <invocationContractContainer xmi:id="_DU7ukkLpEei0i9bcSdIGKw">

-          <invocationContracts xmi:id="_DU7uk0LpEei0i9bcSdIGKw" factoryComponentContract="#_Prg8cDG0Ed-kc8dEZsdm2w"

+      <invocations xmi:id="_jP9ZsCSWEemxeP6B0lLOpA" name="EMF Edit Pattern" invokedActivity="ftask:Task platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_jT-SgD1hEd-m5uHrCQ1Jew">

+        <invocationContractContainer xmi:id="_jQaFoCSWEemxeP6B0lLOpA">

+          <invocationContracts xmi:id="_jQtAkCSWEemxeP6B0lLOpA" factoryComponentContract="#_Prg8cDG0Ed-kc8dEZsdm2w"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_DgB2IP6fEd64XaYPo3s6sPg"/>

-          <invocationContracts xmi:id="_DU7ul0LpEei0i9bcSdIGKw" factoryComponentContract="#_jzYi8FIIEd-eGOdO3WtsxA"

+          <invocationContracts xmi:id="_jRmYcCSWEemxeP6B0lLOpA" factoryComponentContract="#_jzYi8FIIEd-eGOdO3WtsxA"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_L6JSwAHAEd-4faJMEplCjxw">

-            <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_DU7umELpEei0i9bcSdIGKw"

+            <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_jR5TYCSWEemxeP6B0lLOpA"

                 value="org.eclipse.egf.emf.pattern.base.ContentTypePatternExecutionReporter"/>

           </invocationContracts>

-          <invocationContracts xmi:id="_DU7um0LpEei0i9bcSdIGKw" factoryComponentContract="#_Tx5xHVkTEd-bv5aydwO2Qw"

+          <invocationContracts xmi:id="_jSfwUCSWEemxeP6B0lLOpA" factoryComponentContract="#_Tx5xHVkTEd-bv5aydwO2Qw"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_nz1HkSCaEd-Sse0r9LJWbA">

-            <type xmi:type="pattern:TypePatternList" xmi:id="_DU7unELpEei0i9bcSdIGKw"

+            <type xmi:type="pattern:TypePatternList" xmi:id="_jSphUCSWEemxeP6B0lLOpA"

                 elements="#_PiIW4zG0Ed-kc8dEZsdm2w"/>

           </invocationContracts>

-          <invocationContracts xmi:id="_DU7un0LpEei0i9bcSdIGKw" factoryComponentContract="#_UCnhEFHVEd-dr9AWwNwIMQ"

+          <invocationContracts xmi:id="_jTPXMCSWEemxeP6B0lLOpA" factoryComponentContract="#_UCnhEFHVEd-dr9AWwNwIMQ"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_NFhJ4UMgEd-Ixul1H5ANhg"/>

-          <invocationContracts xmi:id="_DU7uokLpEei0i9bcSdIGKw" factoryComponentContract="#_dgkvsPI7Ed-Pp8S8RvVOuQ"

+          <invocationContracts xmi:id="_jT10ICSWEemxeP6B0lLOpA" factoryComponentContract="#_dgkvsPI7Ed-Pp8S8RvVOuQ"

               invokedContract="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_JWI2sPI7Ed-Pp8S8RvVOuQ"/>

-          <invocationContracts xmi:id="_DU7upULpEei0i9bcSdIGKw" factoryComponentContract="#_9wHxsFLMEd-ZSLMRjxSbVQ"

+          <invocationContracts xmi:id="_jUuk8CSWEemxeP6B0lLOpA" factoryComponentContract="#_9wHxsFLMEd-ZSLMRjxSbVQ"

               invokedContract="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_vtlEAFLMEd-ZSLMRjxSbVQ"/>

         </invocationContractContainer>

       </invocations>

@@ -4753,38 +5183,38 @@
   <fcore:FactoryComponent xmi:id="_PkqGcDG0Ed-kc8dEZsdm2w" name="EMF Editor Pattern">

     <contractContainer xmi:id="_Prg8ejG0Ed-kc8dEZsdm2w">

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_Prg8ezG0Ed-kc8dEZsdm2w"

-          description="EMF Editor Pattern" name="genModel" mandatory="true" invocationContracts="#_DU8VoELpEei0i9bcSdIGKw">

-        <type xmi:type="domain:TypeDomain" xmi:id="_DU8Vo0LpEei0i9bcSdIGKw"/>

+          description="EMF Editor Pattern" name="genModel" mandatory="true" invocationContracts="#_jWXjsCSWEemxeP6B0lLOpA">

+        <type xmi:type="domain:TypeDomain" xmi:id="_jW-AoCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_pCqEMFIIEd-eGOdO3WtsxA"

-          description="EMF Editor Pattern" name="pattern.execution.reporter" invocationContracts="#_DU8VpELpEei0i9bcSdIGKw">

-        <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_DU8Vp0LpEei0i9bcSdIGKw"/>

+          description="EMF Editor Pattern" name="pattern.execution.reporter" invocationContracts="#_jXQ7kCSWEemxeP6B0lLOpA">

+        <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_jXtngCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_Tx5xMlkTEd-bv5aydwO2Qw"

-          description="EMF Editor Pattern" name="pattern.ids" invocationContracts="#_DU8VqELpEei0i9bcSdIGKw">

-        <type xmi:type="pattern:TypePatternList" xmi:id="_DU8Vq0LpEei0i9bcSdIGKw"/>

+          description="EMF Editor Pattern" name="pattern.ids" invocationContracts="#_jYAicCSWEemxeP6B0lLOpA">

+        <type xmi:type="pattern:TypePatternList" xmi:id="_jYm_YCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_Y3EukFHVEd-dr9AWwNwIMQ"

-          description="EMF Editor Pattern" name="pattern.substitutions" invocationContracts="#_DU8VrELpEei0i9bcSdIGKw">

-        <type xmi:type="pattern:TypePatternSubstitution" xmi:id="_DU8VrkLpEei0i9bcSdIGKw"/>

+          description="EMF Editor Pattern" name="pattern.substitutions" invocationContracts="#_jY56UCSWEemxeP6B0lLOpA">

+        <type xmi:type="pattern:TypePatternSubstitution" xmi:id="_jZWmQCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_NcZ6I_MqEd-6tr0C8ZV8Ew"

-          description="EMF Editor Pattern" name="usedGenPackages" invocationContracts="#_DU8Vr0LpEei0i9bcSdIGKw">

-        <type xmi:type="domain:TypeGenPackages" xmi:id="_DU8VsULpEei0i9bcSdIGKw"/>

+          description="EMF Editor Pattern" name="usedGenPackages" invocationContracts="#_jZphMCSWEemxeP6B0lLOpA">

+        <type xmi:type="domain:TypeGenPackages" xmi:id="_jaGNICSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_FqdyEFLNEd-ZSLMRjxSbVQ"

-          description="EMF Editor Pattern" name="mergeRulesURI" invocationContracts="#_DU8VskLpEei0i9bcSdIGKw">

-        <type xmi:type="types:TypeURI" xmi:id="_DU8VtELpEei0i9bcSdIGKw"/>

+          description="EMF Editor Pattern" name="mergeRulesURI" invocationContracts="#_jaZIECSWEemxeP6B0lLOpA">

+        <type xmi:type="types:TypeURI" xmi:id="_ja10ACSWEemxeP6B0lLOpA"/>

       </contracts>

     </contractContainer>

     <viewpointContainer xmi:id="_PkqGcTG0Ed-kc8dEZsdm2w">

       <viewpoints xmi:type="pattern:PatternViewpoint" xmi:id="_PkqGcjG0Ed-kc8dEZsdm2w">

         <libraries xmi:id="_PkqGczG0Ed-kc8dEZsdm2w" name="org.eclipse.egf.emf.pattern.editor">

-          <elements xmi:id="_PkqGdDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/plugin.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

+          <elements xmi:id="_PkqGdDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/plugin.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

               name="PluginXML" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#_PkqGdjG0Ed-kc8dEZsdm2w" conditionMethod="#_-G79VHLYEd-09ds9dfYpFw"

               initMethod="#_PkqGdzG0Ed-kc8dEZsdm2w" footerMethod="#_PkqGeTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C1QwAULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_UgFr8CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PkqGdjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PkqGdDG0Ed-kc8dEZsdm2w/method._PkqGdjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PkqGdzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PkqGdDG0Ed-kc8dEZsdm2w/method._PkqGdzG0Ed-kc8dEZsdm2w.pt"/>

@@ -4795,20 +5225,20 @@
             <methods xmi:id="_SvoJeGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PkqGdDG0Ed-kc8dEZsdm2w/method._SvoJeGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_0_MReWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PkqGdDG0Ed-kc8dEZsdm2w/method._0_MReWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_Pkz3cjG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PkqGdDG0Ed-kc8dEZsdm2w/method._Pkz3cjG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C1RXEELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C1RXFELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_UiLWoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Ui69gCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C1RXFkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UjN4cCSWEemxeP6B0lLOpA"

                 called="#_Pkz3cjG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C1RXF0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C1RXGELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_UjhacCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UjqkYCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_Pk9BYDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/manifest.mfjet&quot;&#xA;"

+          <elements xmi:id="_Pk9BYDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/manifest.mfjet&quot;&#xA;"

               name="ManifestMF" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#_Pk9BYjG0Ed-kc8dEZsdm2w" conditionMethod="#_-A1VWHLYEd-09ds9dfYpFw"

               initMethod="#_Pk9BYzG0Ed-kc8dEZsdm2w" footerMethod="#_Pk9BZTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C0wZsULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_UONRwCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_Pk9BYjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Pk9BYDG0Ed-kc8dEZsdm2w/method._Pk9BYjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_Pk9BYzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Pk9BYDG0Ed-kc8dEZsdm2w/method._Pk9BYzG0Ed-kc8dEZsdm2w.pt"/>

@@ -4819,20 +5249,20 @@
             <methods xmi:id="_SveYeGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._Pk9BYDG0Ed-kc8dEZsdm2w/method._SveYeGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_0_DHiWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Pk9BYDG0Ed-kc8dEZsdm2w/method._0_DHiWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_Pk9BaTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Pk9BYDG0Ed-kc8dEZsdm2w/method._Pk9BaTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C0wZt0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C0xAwELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_URVeQCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_USFFICSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C0xAwkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UShxECSWEemxeP6B0lLOpA"

                 called="#_Pk9BaTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C0xAw0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C0xAxELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_USriECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_US-dACSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PlQjYDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/build.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

+          <elements xmi:id="_PlQjYDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/build.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

               name="BuildProperties" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#_PlQjYjG0Ed-kc8dEZsdm2w" conditionMethod="#_-DEJ9HLYEd-09ds9dfYpFw"

               initMethod="#_PlQjYzG0Ed-kc8dEZsdm2w" footerMethod="#_PlQjZTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_CztQ0kLpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_UTk58CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PlQjYjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PlQjYDG0Ed-kc8dEZsdm2w/method._PlQjYjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PlQjYzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PlQjYDG0Ed-kc8dEZsdm2w/method._PlQjYzG0Ed-kc8dEZsdm2w.pt"/>

@@ -4843,20 +5273,20 @@
             <methods xmi:id="_SvVOjGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PlQjYDG0Ed-kc8dEZsdm2w/method._SvVOjGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_0-5WjWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PlQjYDG0Ed-kc8dEZsdm2w/method._0-5WjWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PlQjaTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PlQjYDG0Ed-kc8dEZsdm2w/method._PlQjaTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_CztQ2ELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CztQ3ELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_UVgzoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UWaLgCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CztQ3kLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UWtGcCSWEemxeP6B0lLOpA"

                 called="#_PlQjaTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_CztQ30LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_CztQ4ELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_UW2QYCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UXJyYCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PljeUDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/plugin.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

+          <elements xmi:id="_PljeUDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/plugin.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

               name="PluginProperties" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_xxtwkCg7Ed-ROrlGa8LEeQ"

               headerMethod="#_PljeUjG0Ed-kc8dEZsdm2w" conditionMethod="#_-K9htHLYEd-09ds9dfYpFw"

               initMethod="#_PljeUzG0Ed-kc8dEZsdm2w" footerMethod="#_PljeVTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C1hOsULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_UsdUACSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PljeUjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PljeUDG0Ed-kc8dEZsdm2w/method._PljeUjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PljeUzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PljeUDG0Ed-kc8dEZsdm2w/method._PljeUzG0Ed-kc8dEZsdm2w.pt"/>

@@ -4867,20 +5297,20 @@
             <methods xmi:id="_Svx6eGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PljeUDG0Ed-kc8dEZsdm2w/method._Svx6eGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_0_WCeWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PljeUDG0Ed-kc8dEZsdm2w/method._0_WCeWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PljeWTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PljeUDG0Ed-kc8dEZsdm2w/method._PljeWTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C1hOt0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C1hOu0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Uui-sCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UvSlkCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_pQ16sChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C1hOvULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UvvRgCSWEemxeP6B0lLOpA"

                 called="#_PljeWTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C1hOvkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C1hOv0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_Uv5CgCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UwL9cCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PltPUDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/ActionBarContributor.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PltPUDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/ActionBarContributor.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="ActionBarContributor" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PltPUjG0Ed-kc8dEZsdm2w" conditionMethod="#_-VjBFHLYEd-09ds9dfYpFw"

               initMethod="#_PltPUzG0Ed-kc8dEZsdm2w" footerMethod="#_PltPVTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C2zoIELpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_VCqNgCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PltPUjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PltPUDG0Ed-kc8dEZsdm2w/method._PltPUjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PltPUzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PltPUDG0Ed-kc8dEZsdm2w/method._PltPUzG0Ed-kc8dEZsdm2w.pt"/>

@@ -4891,20 +5321,20 @@
             <methods xmi:id="_SwhhWGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PltPUDG0Ed-kc8dEZsdm2w/method._SwhhWGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_1AFpWWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PltPUDG0Ed-kc8dEZsdm2w/method._1AFpWWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_Pl2ZQjG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PltPUDG0Ed-kc8dEZsdm2w/method._Pl2ZQjG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C2zoJkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C2zoKkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_VEv4MCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VFffECSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C2zoLELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VF8LACSWEemxeP6B0lLOpA"

                 called="#_Pl2ZQjG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C2zoLULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C2zoLkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_VGPF8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VGY28CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_Pmc2MDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/Editor.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.editor.call.Editor.Editor.addItemProviderFactories.override&#xA;"

+          <elements xmi:id="_Pmc2MDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/Editor.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.editor.call.Editor.Editor.addItemProviderFactories.override&#xA;"

               name="Editor" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PmmAIDG0Ed-kc8dEZsdm2w" conditionMethod="#_-SaNhHLYEd-09ds9dfYpFw"

               initMethod="#_PmmAITG0Ed-kc8dEZsdm2w" footerMethod="#_PmmAIzG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C2jJcULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_U5RoACSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PmmAIDG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Pmc2MDG0Ed-kc8dEZsdm2w/method._PmmAIDG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PmmAITG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Pmc2MDG0Ed-kc8dEZsdm2w/method._PmmAITG0Ed-kc8dEZsdm2w.pt"/>

@@ -4915,20 +5345,20 @@
             <methods xmi:id="_SwqrSGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._Pmc2MDG0Ed-kc8dEZsdm2w/method._SwqrSGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_1APaWWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Pmc2MDG0Ed-kc8dEZsdm2w/method._1APaWWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PmmAJzG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Pmc2MDG0Ed-kc8dEZsdm2w/method._PmmAJzG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C2jwgELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C2jwhELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_U7XSsCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_U8G5kCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C2jwhkLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_U8jlgCSWEemxeP6B0lLOpA"

                 called="#_PmmAJzG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C2jwh0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C2jwiELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_U8svcCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_U9ARcCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PmvxIDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/ModelWizard.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PmvxIDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/ModelWizard.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="ModelWizard" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PmvxIjG0Ed-kc8dEZsdm2w" conditionMethod="#_-Y0XhHLYEd-09ds9dfYpFw"

               initMethod="#_PmvxIzG0Ed-kc8dEZsdm2w" footerMethod="#_PmvxJTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C3EG0ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_U9mHUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PmvxIjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PmvxIDG0Ed-kc8dEZsdm2w/method._PmvxIjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PmvxIzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PmvxIDG0Ed-kc8dEZsdm2w/method._PmvxIzG0Ed-kc8dEZsdm2w.pt"/>

@@ -4939,20 +5369,20 @@
             <methods xmi:id="_SwN_WGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PmvxIDG0Ed-kc8dEZsdm2w/method._SwN_WGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_0_yuaWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PmvxIDG0Ed-kc8dEZsdm2w/method._0_yuaWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_Pm5iIjG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PmvxIDG0Ed-kc8dEZsdm2w/method._Pm5iIjG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C3EG10LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C3Et40LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_U_iBACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VARn4CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C3Et5ULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VAuT0CSWEemxeP6B0lLOpA"

                 called="#_Pm5iIjG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C3Et5kLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C3Et50LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_VA4E0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VCEXoCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PnCsEDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/Plugin.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PnCsEDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/Plugin.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="Plugin" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_F0In8Cg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PnCsEjG0Ed-kc8dEZsdm2w" conditionMethod="#_-NpCRHLYEd-09ds9dfYpFw"

               initMethod="#_PnCsEzG0Ed-kc8dEZsdm2w" footerMethod="#_PnCsFTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C2CzIULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_VHId0CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PnCsEjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PnCsEDG0Ed-kc8dEZsdm2w/method._PnCsEjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PnCsEzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PnCsEDG0Ed-kc8dEZsdm2w/method._PnCsEzG0Ed-kc8dEZsdm2w.pt"/>

@@ -4963,20 +5393,20 @@
             <methods xmi:id="_SwE1aGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PnCsEDG0Ed-kc8dEZsdm2w/method._SwE1aGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_0_fzeWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PnCsEDG0Ed-kc8dEZsdm2w/method._0_fzeWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PnCsGTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PnCsEDG0Ed-kc8dEZsdm2w/method._PnCsGTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C2CzJ0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C2DaM0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_VJOIgCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VKHgYCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_cjQNwChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C2DaNULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VKjlQCSWEemxeP6B0lLOpA"

                 called="#_PnCsGTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C2DaNkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C2DaN0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_VKtWQCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VLARMCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PnVnADG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/Advisor.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PnVnADG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/Advisor.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="Advisor" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_F0In8Cg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PnVnAjG0Ed-kc8dEZsdm2w" conditionMethod="#_-P4d9HLYEd-09ds9dfYpFw"

               initMethod="#_PnVnAzG0Ed-kc8dEZsdm2w" footerMethod="#_PnVnBTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C2T44ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_U1GSoCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PnVnAjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PnVnADG0Ed-kc8dEZsdm2w/method._PnVnAjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PnVnAzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PnVnADG0Ed-kc8dEZsdm2w/method._PnVnAzG0Ed-kc8dEZsdm2w.pt"/>

@@ -4987,20 +5417,20 @@
             <methods xmi:id="_Sv7EaGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PnVnADG0Ed-kc8dEZsdm2w/method._Sv7EaGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_0_o9aWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PnVnADG0Ed-kc8dEZsdm2w/method._0_o9aWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PnVnCTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PnVnADG0Ed-kc8dEZsdm2w/method._PnVnCTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C2T450LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C2T460LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_U3L9UCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_U37kMCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_cjQNwChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C2T47ULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_U4YQICSWEemxeP6B0lLOpA"

                 called="#_PnVnCTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C2T47kLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C2T470LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_U4iBICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_U408ECSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PnpJADG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * &#xA;"

+          <elements xmi:id="_PnpJADG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * &#xA;"

               name="ModelWizardIcon" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_HODPICrVEd-81OQ8yF10Og"

               headerMethod="#_PnpJAjG0Ed-kc8dEZsdm2w" conditionMethod="#_-bppFHLYEd-09ds9dfYpFw"

               initMethod="#_PnpJAzG0Ed-kc8dEZsdm2w" footerMethod="#_PnpJBTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C3gLsULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_VLc9ICSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PnpJAjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PnpJADG0Ed-kc8dEZsdm2w/method._PnpJAjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PnpJAzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PnpJADG0Ed-kc8dEZsdm2w/method._PnpJAzG0Ed-kc8dEZsdm2w.pt"/>

@@ -5008,20 +5438,20 @@
             <methods xmi:id="_PnpJBTG0Ed-kc8dEZsdm2w" name="footer" patternFilePath="templates/pattern._PnpJADG0Ed-kc8dEZsdm2w/method._PnpJBTG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_1AiVSGKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PnpJADG0Ed-kc8dEZsdm2w/method._1AiVSGKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PnpJCTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PnpJADG0Ed-kc8dEZsdm2w/method._PnpJCTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C3gLt0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C3gLuULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_VNin0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VN_TwCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_yLcWwCt-Ed-D6YqMf1n1Bg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C3gLu0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VOSOsCSWEemxeP6B0lLOpA"

                 called="#_PnpJCTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C3gLvELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C3gLvULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_VOb_sCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VOlJoCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_0yyMcCt-Ed-D6YqMf1n1Bg"/>

           </elements>

-          <elements xmi:id="_Pn8D8DG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * &#xA;"

+          <elements xmi:id="_Pn8D8DG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * &#xA;"

               name="ModelIcon" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_HODPICrVEd-81OQ8yF10Og"

               headerMethod="#_Pn8D8jG0Ed-kc8dEZsdm2w" conditionMethod="#_-dcY1HLYEd-09ds9dfYpFw"

               initMethod="#_Pn8D8zG0Ed-kc8dEZsdm2w" footerMethod="#_Pn8D9TG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C3T-cULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_VPLmkCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_Pn8D8jG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Pn8D8DG0Ed-kc8dEZsdm2w/method._Pn8D8jG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_Pn8D8zG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Pn8D8DG0Ed-kc8dEZsdm2w/method._Pn8D8zG0Ed-kc8dEZsdm2w.pt"/>

@@ -5029,20 +5459,20 @@
             <methods xmi:id="_Pn8D9TG0Ed-kc8dEZsdm2w" name="footer" patternFilePath="templates/pattern._Pn8D8DG0Ed-kc8dEZsdm2w/method._Pn8D9TG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_1AYkSGKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Pn8D8DG0Ed-kc8dEZsdm2w/method._1AYkSGKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_Pn8D-TG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Pn8D8DG0Ed-kc8dEZsdm2w/method._Pn8D-TG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C3T-d0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C3UlgULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_VQ9vQCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VRabMCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_yLcWwCt-Ed-D6YqMf1n1Bg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C3Ulg0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VRt9MCSWEemxeP6B0lLOpA"

                 called="#_Pn8D-TG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C3UlhELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C3UlhULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_VSA4ICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VSKCECSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_0yyMcCt-Ed-D6YqMf1n1Bg"/>

           </elements>

-          <elements xmi:id="__H8bZBmtEeCMbfVQrOfmzQ" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/appengine-web.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

+          <elements xmi:id="__H8bZBmtEeCMbfVQrOfmzQ" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/appengine-web.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

               name="AppEngineWebXML" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#__H8bZhmtEeCMbfVQrOfmzQ" conditionMethod="#__H8baBmtEeCMbfVQrOfmzQ"

               initMethod="#__H8bZxmtEeCMbfVQrOfmzQ" footerMethod="#__H8bahmtEeCMbfVQrOfmzQ">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C0O1QULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_UXvoQCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="__H8bZhmtEeCMbfVQrOfmzQ" name="header" patternFilePath="templates/pattern.__H8bZBmtEeCMbfVQrOfmzQ/method.__H8bZhmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__H8bZxmtEeCMbfVQrOfmzQ" name="init" patternFilePath="templates/pattern.__H8bZBmtEeCMbfVQrOfmzQ/method.__H8bZxmtEeCMbfVQrOfmzQ.pt"/>

@@ -5053,20 +5483,20 @@
             <methods xmi:id="__H8bbRmtEeCMbfVQrOfmzQ" name="setArgument" patternFilePath="templates/pattern.__H8bZBmtEeCMbfVQrOfmzQ/method.__H8bbRmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__H8bbhmtEeCMbfVQrOfmzQ" name="ensureProjectExists" patternFilePath="templates/pattern.__H8bZBmtEeCMbfVQrOfmzQ/method.__H8bbhmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__H8bcBmtEeCMbfVQrOfmzQ" name="doGenerate" patternFilePath="templates/pattern.__H8bZBmtEeCMbfVQrOfmzQ/method.__H8bcBmtEeCMbfVQrOfmzQ.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C0O1R0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C0PcU0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_UZrh8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Uak50CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C0PcVULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Ua30wCSWEemxeP6B0lLOpA"

                 called="#__H8bcBmtEeCMbfVQrOfmzQ"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C0PcVkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C0PcV0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_UbLWwCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UbUgsCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="__I1zQBmtEeCMbfVQrOfmzQ" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/home.htmljet&quot;&#xA;"

+          <elements xmi:id="__I1zQBmtEeCMbfVQrOfmzQ" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/home.htmljet&quot;&#xA;"

               name="HomeHTML" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#__I1zQhmtEeCMbfVQrOfmzQ" conditionMethod="#__I1zRBmtEeCMbfVQrOfmzQ"

               initMethod="#__I1zQxmtEeCMbfVQrOfmzQ" footerMethod="#__I1zRhmtEeCMbfVQrOfmzQ">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C1A4YULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_UkRBUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="__I1zQhmtEeCMbfVQrOfmzQ" name="header" patternFilePath="templates/pattern.__I1zQBmtEeCMbfVQrOfmzQ/method.__I1zQhmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__I1zQxmtEeCMbfVQrOfmzQ" name="init" patternFilePath="templates/pattern.__I1zQBmtEeCMbfVQrOfmzQ/method.__I1zQxmtEeCMbfVQrOfmzQ.pt"/>

@@ -5077,20 +5507,20 @@
             <methods xmi:id="__I1zSRmtEeCMbfVQrOfmzQ" name="setArgument" patternFilePath="templates/pattern.__I1zQBmtEeCMbfVQrOfmzQ/method.__I1zSRmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__I1zShmtEeCMbfVQrOfmzQ" name="ensureProjectExists" patternFilePath="templates/pattern.__I1zQBmtEeCMbfVQrOfmzQ/method.__I1zShmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__I1zTBmtEeCMbfVQrOfmzQ" name="doGenerate" patternFilePath="templates/pattern.__I1zQBmtEeCMbfVQrOfmzQ/method.__I1zTBmtEeCMbfVQrOfmzQ.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C1A4Z0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C1Bfc0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_UmM7ACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Um8h4CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C1BfdULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UnZN0CSWEemxeP6B0lLOpA"

                 called="#__I1zTBmtEeCMbfVQrOfmzQ"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C1BfdkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C1Bfd0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_UniXwCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Un15wCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="__KLQABmtEeCMbfVQrOfmzQ" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/module.gwt.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

+          <elements xmi:id="__KLQABmtEeCMbfVQrOfmzQ" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/module.gwt.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

               name="ModuleGWTXML" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#__KLQAhmtEeCMbfVQrOfmzQ" conditionMethod="#__KLQBBmtEeCMbfVQrOfmzQ"

               initMethod="#__KLQAxmtEeCMbfVQrOfmzQ" footerMethod="#__KLQBhmtEeCMbfVQrOfmzQ">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C0fT8ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_UobvoCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="__KLQAhmtEeCMbfVQrOfmzQ" name="header" patternFilePath="templates/pattern.__KLQABmtEeCMbfVQrOfmzQ/method.__KLQAhmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__KLQAxmtEeCMbfVQrOfmzQ" name="init" patternFilePath="templates/pattern.__KLQABmtEeCMbfVQrOfmzQ/method.__KLQAxmtEeCMbfVQrOfmzQ.pt"/>

@@ -5101,20 +5531,20 @@
             <methods xmi:id="__KLQCRmtEeCMbfVQrOfmzQ" name="setArgument" patternFilePath="templates/pattern.__KLQABmtEeCMbfVQrOfmzQ/method.__KLQCRmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__KLQChmtEeCMbfVQrOfmzQ" name="ensureProjectExists" patternFilePath="templates/pattern.__KLQABmtEeCMbfVQrOfmzQ/method.__KLQChmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__KLQDBmtEeCMbfVQrOfmzQ" name="doGenerate" patternFilePath="templates/pattern.__KLQABmtEeCMbfVQrOfmzQ/method.__KLQDBmtEeCMbfVQrOfmzQ.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C0fT90LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C0f7A0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_UqXpUCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UrH3QCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C0f7BULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Urj8ICSWEemxeP6B0lLOpA"

                 called="#__KLQDBmtEeCMbfVQrOfmzQ"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C0f7BkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C0f7B0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_UrttICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UsAoECSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="__gO_kBmtEeCMbfVQrOfmzQ" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/web.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

+          <elements xmi:id="__gO_kBmtEeCMbfVQrOfmzQ" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/web.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

               name="WebXML" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#__gO_khmtEeCMbfVQrOfmzQ" conditionMethod="#__gO_lBmtEeCMbfVQrOfmzQ"

               initMethod="#__gO_kxmtEeCMbfVQrOfmzQ" footerMethod="#__gO_lhmtEeCMbfVQrOfmzQ">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_Cz9vgULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Ub69oCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="__gO_khmtEeCMbfVQrOfmzQ" name="header" patternFilePath="templates/pattern.__gO_kBmtEeCMbfVQrOfmzQ/method.__gO_khmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__gO_kxmtEeCMbfVQrOfmzQ" name="init" patternFilePath="templates/pattern.__gO_kBmtEeCMbfVQrOfmzQ/method.__gO_kxmtEeCMbfVQrOfmzQ.pt"/>

@@ -5125,20 +5555,20 @@
             <methods xmi:id="__gO_mRmtEeCMbfVQrOfmzQ" name="setArgument" patternFilePath="templates/pattern.__gO_kBmtEeCMbfVQrOfmzQ/method.__gO_mRmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__gO_mhmtEeCMbfVQrOfmzQ" name="ensureProjectExists" patternFilePath="templates/pattern.__gO_kBmtEeCMbfVQrOfmzQ/method.__gO_mhmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__gO_nBmtEeCMbfVQrOfmzQ" name="doGenerate" patternFilePath="templates/pattern.__gO_kBmtEeCMbfVQrOfmzQ/method.__gO_nBmtEeCMbfVQrOfmzQ.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Cz9vh0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cz-Wk0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Ud23UCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UemeMCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cz-WlULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_UfDKICSWEemxeP6B0lLOpA"

                 called="#__gO_nBmtEeCMbfVQrOfmzQ"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_Cz-WlkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Cz-Wl0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_UfWFECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Uff2ECSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="__9b48BmtEeCMbfVQrOfmzQ" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/EntryPoint.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="__9b48BmtEeCMbfVQrOfmzQ" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/EntryPoint.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="EntryPoint" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_F0In8Cg6Ed-ROrlGa8LEeQ"

               headerMethod="#__9b48hmtEeCMbfVQrOfmzQ" conditionMethod="#__9b49BmtEeCMbfVQrOfmzQ"

               initMethod="#__9b48xmtEeCMbfVQrOfmzQ" footerMethod="#__9b49hmtEeCMbfVQrOfmzQ">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C1wfQULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_UxFVUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="__9b48hmtEeCMbfVQrOfmzQ" name="header" patternFilePath="templates/pattern.__9b48BmtEeCMbfVQrOfmzQ/method.__9b48hmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__9b48xmtEeCMbfVQrOfmzQ" name="init" patternFilePath="templates/pattern.__9b48BmtEeCMbfVQrOfmzQ/method.__9b48xmtEeCMbfVQrOfmzQ.pt"/>

@@ -5149,170 +5579,170 @@
             <methods xmi:id="__9b4-RmtEeCMbfVQrOfmzQ" name="setArgument" patternFilePath="templates/pattern.__9b48BmtEeCMbfVQrOfmzQ/method.__9b4-RmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__9b4-hmtEeCMbfVQrOfmzQ" name="ensureProjectExists" patternFilePath="templates/pattern.__9b48BmtEeCMbfVQrOfmzQ/method.__9b4-hmtEeCMbfVQrOfmzQ.pt"/>

             <methods xmi:id="__9b4_BmtEeCMbfVQrOfmzQ" name="doGenerate" patternFilePath="templates/pattern.__9b48BmtEeCMbfVQrOfmzQ/method.__9b4_BmtEeCMbfVQrOfmzQ.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C1xGVULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C1xGWULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_UzBPACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Uzw14CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_cjQNwChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C1xGW0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_U0Nh0CSWEemxeP6B0lLOpA"

                 called="#__9b4_BmtEeCMbfVQrOfmzQ"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C1xGXELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C1xGXULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_U0WrwCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_U0qNwCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

         </libraries>

         <libraries xmi:id="_08-MQGJ-Ed-FqczH3ESmRw" name="org.eclipse.egf.emf.pattern.editor.call.Editor">

-          <elements xmi:id="_08-MQWJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/Editor.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.editor.call.Editor.Editor.addItemProviderFactories.insert&#xA;"

+          <elements xmi:id="_08-MQWJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/Editor.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.editor.call.Editor.Editor.addItemProviderFactories.insert&#xA;"

               name="Editor.addItemProviderFactories.override" headerMethod="#_08-MQ2J-Ed-FqczH3ESmRw"

               conditionMethod="#_CC6qtXLZEd-09ds9dfYpFw" initMethod="#_08-MRGJ-Ed-FqczH3ESmRw"

               footerMethod="#_08-MRmJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DRD7MkLpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_hw4zoCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_08-MQ2J-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._08-MQWJ-Ed-FqczH3ESmRw/method._08-MQ2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_08-MRGJ-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._08-MQWJ-Ed-FqczH3ESmRw/method._08-MRGJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CC6qtXLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._08-MQWJ-Ed-FqczH3ESmRw/method._CC6qtXLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_08-MRmJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._08-MQWJ-Ed-FqczH3ESmRw/method._08-MRmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_08-MXGJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._08-MQWJ-Ed-FqczH3ESmRw/method._08-MXGJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DREiRELpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DREiRULpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DREiRkLpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DREiR0LpEei0i9bcSdIGKw" name="importedOperationClassName"

+            <parameters xmi:id="_hy-eUCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_hzIPUCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_hzRZQCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_hzkUMCSWEemxeP6B0lLOpA" name="importedOperationClassName"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiSELpEei0i9bcSdIGKw" name="operationMethodName"

+            <parameters xmi:id="_hzuFMCSWEemxeP6B0lLOpA" name="operationMethodName"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiSULpEei0i9bcSdIGKw" name="_ArrayListOfObject"

+            <parameters xmi:id="_hz32MCSWEemxeP6B0lLOpA" name="_ArrayListOfObject"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiSkLpEei0i9bcSdIGKw" name="_ArrayListOfSelectionChangedListener"

+            <parameters xmi:id="_h0BAICSWEemxeP6B0lLOpA" name="_ArrayListOfSelectionChangedListener"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiS0LpEei0i9bcSdIGKw" name="_CollectionOfSelectionChangedListener"

+            <parameters xmi:id="_h0UiICSWEemxeP6B0lLOpA" name="_CollectionOfSelectionChangedListener"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiTELpEei0i9bcSdIGKw" name="_ListOfResource" type="java.lang.String"/>

-            <parameters xmi:id="_DREiTULpEei0i9bcSdIGKw" name="_ArrayListOfResource"

+            <parameters xmi:id="_h0dsECSWEemxeP6B0lLOpA" name="_ListOfResource" type="java.lang.String"/>

+            <parameters xmi:id="_h0ndECSWEemxeP6B0lLOpA" name="_ArrayListOfResource"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiTkLpEei0i9bcSdIGKw" name="_CollectionOfResource"

+            <parameters xmi:id="_h06YACSWEemxeP6B0lLOpA" name="_CollectionOfResource"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiT0LpEei0i9bcSdIGKw" name="_MapOfResourceToDiagnostic"

+            <parameters xmi:id="_h1EJACSWEemxeP6B0lLOpA" name="_MapOfResourceToDiagnostic"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiUELpEei0i9bcSdIGKw" name="_HashMapOfResourceToBoolean"

+            <parameters xmi:id="_h1NS8CSWEemxeP6B0lLOpA" name="_HashMapOfResourceToBoolean"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiUULpEei0i9bcSdIGKw" name="_MapOfObjectToObject"

+            <parameters xmi:id="_h1g08CSWEemxeP6B0lLOpA" name="_MapOfObjectToObject"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiUkLpEei0i9bcSdIGKw" name="_HashMapOfObjectToObject"

+            <parameters xmi:id="_h1p-4CSWEemxeP6B0lLOpA" name="_HashMapOfObjectToObject"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiU0LpEei0i9bcSdIGKw" name="_LinkedHashMapOfResourceToDiagnostic"

+            <parameters xmi:id="_h19g4CSWEemxeP6B0lLOpA" name="_LinkedHashMapOfResourceToDiagnostic"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiVELpEei0i9bcSdIGKw" name="_CollectionOfAnything"

+            <parameters xmi:id="_h2Gq0CSWEemxeP6B0lLOpA" name="_CollectionOfAnything"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiVULpEei0i9bcSdIGKw" name="_ListOfAnything" type="java.lang.String"/>

-            <parameters xmi:id="_DREiVkLpEei0i9bcSdIGKw" name="useExtendedLabelProvider"

+            <parameters xmi:id="_h2Qb0CSWEemxeP6B0lLOpA" name="_ListOfAnything" type="java.lang.String"/>

+            <parameters xmi:id="_h2jWwCSWEemxeP6B0lLOpA" name="useExtendedLabelProvider"

                 type="java.lang.Boolean"/>

-            <parameters xmi:id="_DREiV0LpEei0i9bcSdIGKw" name="useStyledLabelProvider"

+            <parameters xmi:id="_h2tHwCSWEemxeP6B0lLOpA" name="useStyledLabelProvider"

                 type="java.lang.Boolean"/>

-            <parameters xmi:id="_DREiWELpEei0i9bcSdIGKw" name="_AdapterFactoryLabelProvider"

+            <parameters xmi:id="_h22RsCSWEemxeP6B0lLOpA" name="_AdapterFactoryLabelProvider"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiWULpEei0i9bcSdIGKw" name="_DelegatingAdapterFactoryLabelProvider"

+            <parameters xmi:id="_h3JzsCSWEemxeP6B0lLOpA" name="_DelegatingAdapterFactoryLabelProvider"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiWkLpEei0i9bcSdIGKw" name="_DecoratingColumLabelProvider"

+            <parameters xmi:id="_h3S9oCSWEemxeP6B0lLOpA" name="_DecoratingColumLabelProvider"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiW0LpEei0i9bcSdIGKw" name="_DiagnosticDecorator"

+            <parameters xmi:id="_h3cuoCSWEemxeP6B0lLOpA" name="_DiagnosticDecorator"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiXELpEei0i9bcSdIGKw" name="_ArrayListOfString"

+            <parameters xmi:id="_h3l4kCSWEemxeP6B0lLOpA" name="_ArrayListOfString"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiXULpEei0i9bcSdIGKw" name="_ListOfString" type="java.lang.String"/>

-            <parameters xmi:id="_DREiXkLpEei0i9bcSdIGKw" name="_ListOfPropertySheetPage"

+            <parameters xmi:id="_h35akCSWEemxeP6B0lLOpA" name="_ListOfString" type="java.lang.String"/>

+            <parameters xmi:id="_h4CkgCSWEemxeP6B0lLOpA" name="_ListOfPropertySheetPage"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DREiX0LpEei0i9bcSdIGKw" name="_ArrayListOfPropertySheetPage"

+            <parameters xmi:id="_h4MVgCSWEemxeP6B0lLOpA" name="_ArrayListOfPropertySheetPage"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DREiQ0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DREiYULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_hy1UYCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_h4pBcCSWEemxeP6B0lLOpA"

                 called="#_08-MXGJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_09RHMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/editor/Editor.javajet&quot;&#xA;"

+          <elements xmi:id="_09RHMGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/editor/Editor.javajet&quot;&#xA;"

               name="Editor.addItemProviderFactories.insert" headerMethod="#_09RHMmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CHY7BHLZEd-09ds9dfYpFw" initMethod="#_09RHM2J-Ed-FqczH3ESmRw"

               footerMethod="#_09RHNWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DROTQULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_h5YoUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_09RHMmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._09RHMGJ-Ed-FqczH3ESmRw/method._09RHMmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_09RHM2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._09RHMGJ-Ed-FqczH3ESmRw/method._09RHM2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CHY7BHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._09RHMGJ-Ed-FqczH3ESmRw/method._CHY7BHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_09RHNWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._09RHMGJ-Ed-FqczH3ESmRw/method._09RHNWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_09RHS2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._09RHMGJ-Ed-FqczH3ESmRw/method._09RHS2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DROTSELpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DROTSULpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DROTSkLpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <parameters xmi:id="_DROTS0LpEei0i9bcSdIGKw" name="importedOperationClassName"

+            <parameters xmi:id="_h7UiACSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_h7eTACSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_h7xN8CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <parameters xmi:id="_h76-8CSWEemxeP6B0lLOpA" name="importedOperationClassName"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTTELpEei0i9bcSdIGKw" name="operationMethodName"

+            <parameters xmi:id="_h8EI4CSWEemxeP6B0lLOpA" name="operationMethodName"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTTULpEei0i9bcSdIGKw" name="_ArrayListOfObject"

+            <parameters xmi:id="_h8N54CSWEemxeP6B0lLOpA" name="_ArrayListOfObject"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTTkLpEei0i9bcSdIGKw" name="_ArrayListOfSelectionChangedListener"

+            <parameters xmi:id="_h8g00CSWEemxeP6B0lLOpA" name="_ArrayListOfSelectionChangedListener"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTT0LpEei0i9bcSdIGKw" name="_CollectionOfSelectionChangedListener"

+            <parameters xmi:id="_h8ql0CSWEemxeP6B0lLOpA" name="_CollectionOfSelectionChangedListener"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTUELpEei0i9bcSdIGKw" name="_ListOfResource" type="java.lang.String"/>

-            <parameters xmi:id="_DROTUULpEei0i9bcSdIGKw" name="_ArrayListOfResource"

+            <parameters xmi:id="_h8zvwCSWEemxeP6B0lLOpA" name="_ListOfResource" type="java.lang.String"/>

+            <parameters xmi:id="_h89gwCSWEemxeP6B0lLOpA" name="_ArrayListOfResource"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTUkLpEei0i9bcSdIGKw" name="_CollectionOfResource"

+            <parameters xmi:id="_h9QbsCSWEemxeP6B0lLOpA" name="_CollectionOfResource"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTU0LpEei0i9bcSdIGKw" name="_MapOfResourceToDiagnostic"

+            <parameters xmi:id="_h9aMsCSWEemxeP6B0lLOpA" name="_MapOfResourceToDiagnostic"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTVELpEei0i9bcSdIGKw" name="_HashMapOfResourceToBoolean"

+            <parameters xmi:id="_h9jWoCSWEemxeP6B0lLOpA" name="_HashMapOfResourceToBoolean"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTVULpEei0i9bcSdIGKw" name="_MapOfObjectToObject"

+            <parameters xmi:id="_h9tHoCSWEemxeP6B0lLOpA" name="_MapOfObjectToObject"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTVkLpEei0i9bcSdIGKw" name="_HashMapOfObjectToObject"

+            <parameters xmi:id="_h-ACkCSWEemxeP6B0lLOpA" name="_HashMapOfObjectToObject"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTV0LpEei0i9bcSdIGKw" name="_LinkedHashMapOfResourceToDiagnostic"

+            <parameters xmi:id="_h-JzkCSWEemxeP6B0lLOpA" name="_LinkedHashMapOfResourceToDiagnostic"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTWELpEei0i9bcSdIGKw" name="_CollectionOfAnything"

+            <parameters xmi:id="_h-TkkCSWEemxeP6B0lLOpA" name="_CollectionOfAnything"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTWULpEei0i9bcSdIGKw" name="_ListOfAnything" type="java.lang.String"/>

-            <parameters xmi:id="_DROTWkLpEei0i9bcSdIGKw" name="useExtendedLabelProvider"

+            <parameters xmi:id="_h-mfgCSWEemxeP6B0lLOpA" name="_ListOfAnything" type="java.lang.String"/>

+            <parameters xmi:id="_h-vpcCSWEemxeP6B0lLOpA" name="useExtendedLabelProvider"

                 type="java.lang.Boolean"/>

-            <parameters xmi:id="_DROTW0LpEei0i9bcSdIGKw" name="useStyledLabelProvider"

+            <parameters xmi:id="_h-5acCSWEemxeP6B0lLOpA" name="useStyledLabelProvider"

                 type="java.lang.Boolean"/>

-            <parameters xmi:id="_DROTXELpEei0i9bcSdIGKw" name="_AdapterFactoryLabelProvider"

+            <parameters xmi:id="_h_DLcCSWEemxeP6B0lLOpA" name="_AdapterFactoryLabelProvider"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTXULpEei0i9bcSdIGKw" name="_DelegatingAdapterFactoryLabelProvider"

+            <parameters xmi:id="_h_WGYCSWEemxeP6B0lLOpA" name="_DelegatingAdapterFactoryLabelProvider"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTXkLpEei0i9bcSdIGKw" name="_DecoratingColumLabelProvider"

+            <parameters xmi:id="_h_f3YCSWEemxeP6B0lLOpA" name="_DecoratingColumLabelProvider"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTX0LpEei0i9bcSdIGKw" name="_DiagnosticDecorator"

+            <parameters xmi:id="_h_pBUCSWEemxeP6B0lLOpA" name="_DiagnosticDecorator"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTYELpEei0i9bcSdIGKw" name="_ArrayListOfString"

+            <parameters xmi:id="_h_yyUCSWEemxeP6B0lLOpA" name="_ArrayListOfString"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTYULpEei0i9bcSdIGKw" name="_ListOfString" type="java.lang.String"/>

-            <parameters xmi:id="_DROTYkLpEei0i9bcSdIGKw" name="_ListOfPropertySheetPage"

+            <parameters xmi:id="_iAFtQCSWEemxeP6B0lLOpA" name="_ListOfString" type="java.lang.String"/>

+            <parameters xmi:id="_iAPeQCSWEemxeP6B0lLOpA" name="_ListOfPropertySheetPage"

                 type="java.lang.String"/>

-            <parameters xmi:id="_DROTY0LpEei0i9bcSdIGKw" name="_ArrayListOfPropertySheetPage"

+            <parameters xmi:id="_iAYoMCSWEemxeP6B0lLOpA" name="_ArrayListOfPropertySheetPage"

                 type="java.lang.String"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DROTR0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DROTZULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_h7KxACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_iA1UICSWEemxeP6B0lLOpA"

                 called="#_09RHS2J-Ed-FqczH3ESmRw"/>

           </elements>

         </libraries>

       </viewpoints>

     </viewpointContainer>

     <orchestration xmi:type="fprod:ProductionPlan" xmi:id="_Prg8djG0Ed-kc8dEZsdm2w">

-      <invocations xmi:id="_DU7uqULpEei0i9bcSdIGKw" name="EMF Editor Pattern" invokedActivity="ftask:Task platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_jT-SgD1hEd-m5uHrCQ1Jew">

-        <invocationContractContainer xmi:id="_DU7uqkLpEei0i9bcSdIGKw">

-          <invocationContracts xmi:id="_DU8VoELpEei0i9bcSdIGKw" factoryComponentContract="#_Prg8ezG0Ed-kc8dEZsdm2w"

+      <invocations xmi:id="_jVn80CSWEemxeP6B0lLOpA" name="EMF Editor Pattern" invokedActivity="ftask:Task platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_jT-SgD1hEd-m5uHrCQ1Jew">

+        <invocationContractContainer xmi:id="_jV63wCSWEemxeP6B0lLOpA">

+          <invocationContracts xmi:id="_jWXjsCSWEemxeP6B0lLOpA" factoryComponentContract="#_Prg8ezG0Ed-kc8dEZsdm2w"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_DgB2IP6fEd64XaYPo3s6sPg"/>

-          <invocationContracts xmi:id="_DU8VpELpEei0i9bcSdIGKw" factoryComponentContract="#_pCqEMFIIEd-eGOdO3WtsxA"

+          <invocationContracts xmi:id="_jXQ7kCSWEemxeP6B0lLOpA" factoryComponentContract="#_pCqEMFIIEd-eGOdO3WtsxA"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_L6JSwAHAEd-4faJMEplCjxw">

-            <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_DU8VpULpEei0i9bcSdIGKw"

+            <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_jXaskCSWEemxeP6B0lLOpA"

                 value="org.eclipse.egf.emf.pattern.base.ContentTypePatternExecutionReporter"/>

           </invocationContracts>

-          <invocationContracts xmi:id="_DU8VqELpEei0i9bcSdIGKw" factoryComponentContract="#_Tx5xMlkTEd-bv5aydwO2Qw"

+          <invocationContracts xmi:id="_jYAicCSWEemxeP6B0lLOpA" factoryComponentContract="#_Tx5xMlkTEd-bv5aydwO2Qw"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_nz1HkSCaEd-Sse0r9LJWbA">

-            <type xmi:type="pattern:TypePatternList" xmi:id="_DU8VqULpEei0i9bcSdIGKw"

+            <type xmi:type="pattern:TypePatternList" xmi:id="_jYTdYCSWEemxeP6B0lLOpA"

                 elements="#_PkqGczG0Ed-kc8dEZsdm2w"/>

           </invocationContracts>

-          <invocationContracts xmi:id="_DU8VrELpEei0i9bcSdIGKw" factoryComponentContract="#_Y3EukFHVEd-dr9AWwNwIMQ"

+          <invocationContracts xmi:id="_jY56UCSWEemxeP6B0lLOpA" factoryComponentContract="#_Y3EukFHVEd-dr9AWwNwIMQ"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_NFhJ4UMgEd-Ixul1H5ANhg"/>

-          <invocationContracts xmi:id="_DU8Vr0LpEei0i9bcSdIGKw" factoryComponentContract="#_NcZ6I_MqEd-6tr0C8ZV8Ew"

+          <invocationContracts xmi:id="_jZphMCSWEemxeP6B0lLOpA" factoryComponentContract="#_NcZ6I_MqEd-6tr0C8ZV8Ew"

               invokedContract="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_JWI2sPI7Ed-Pp8S8RvVOuQ"/>

-          <invocationContracts xmi:id="_DU8VskLpEei0i9bcSdIGKw" factoryComponentContract="#_FqdyEFLNEd-ZSLMRjxSbVQ"

+          <invocationContracts xmi:id="_jaZIECSWEemxeP6B0lLOpA" factoryComponentContract="#_FqdyEFLNEd-ZSLMRjxSbVQ"

               invokedContract="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_vtlEAFLMEd-ZSLMRjxSbVQ"/>

         </invocationContractContainer>

       </invocations>

@@ -5321,38 +5751,38 @@
   <fcore:FactoryComponent xmi:id="_PoF08DG0Ed-kc8dEZsdm2w" name="EMF Tests Pattern">

     <contractContainer xmi:id="_Prg8hTG0Ed-kc8dEZsdm2w">

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_Prg8hjG0Ed-kc8dEZsdm2w"

-          description="EMF Tests Pattern" name="genModel" mandatory="true" invocationContracts="#_DU8VuELpEei0i9bcSdIGKw">

-        <type xmi:type="domain:TypeDomain" xmi:id="_DU8Vu0LpEei0i9bcSdIGKw"/>

+          description="EMF Tests Pattern" name="genModel" mandatory="true" invocationContracts="#_jcL30CSWEemxeP6B0lLOpA">

+        <type xmi:type="domain:TypeDomain" xmi:id="_jcxtsCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_tvg04FIIEd-eGOdO3WtsxA"

-          description="EMF Tests Pattern" name="pattern.execution.reporter" invocationContracts="#_DU8VvELpEei0i9bcSdIGKw">

-        <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_DU8Vv0LpEei0i9bcSdIGKw"/>

+          description="EMF Tests Pattern" name="pattern.execution.reporter" invocationContracts="#_jdEooCSWEemxeP6B0lLOpA">

+        <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_jdhUkCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_Tx5xR1kTEd-bv5aydwO2Qw"

-          description="EMF Tests Pattern" name="pattern.ids" invocationContracts="#_DU8VwELpEei0i9bcSdIGKw">

-        <type xmi:type="pattern:TypePatternList" xmi:id="_DU8Vw0LpEei0i9bcSdIGKw"/>

+          description="EMF Tests Pattern" name="pattern.ids" invocationContracts="#_jd02kCSWEemxeP6B0lLOpA">

+        <type xmi:type="pattern:TypePatternList" xmi:id="_jeQ7cCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_eYFgEFHVEd-dr9AWwNwIMQ"

-          description="EMF Tests Pattern" name="pattern.substitutions" invocationContracts="#_DU8VxELpEei0i9bcSdIGKw">

-        <type xmi:type="pattern:TypePatternSubstitution" xmi:id="_DU8VxkLpEei0i9bcSdIGKw"/>

+          description="EMF Tests Pattern" name="pattern.substitutions" invocationContracts="#_jekdcCSWEemxeP6B0lLOpA">

+        <type xmi:type="pattern:TypePatternSubstitution" xmi:id="_jfBJYCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_NcjD0vMqEd-6tr0C8ZV8Ew"

-          description="EMF Tests Pattern" name="usedGenPackages" invocationContracts="#_DU8Vx0LpEei0i9bcSdIGKw">

-        <type xmi:type="domain:TypeGenPackages" xmi:id="_DU8VyULpEei0i9bcSdIGKw"/>

+          description="EMF Tests Pattern" name="usedGenPackages" invocationContracts="#_jfdOQCSWEemxeP6B0lLOpA">

+        <type xmi:type="domain:TypeGenPackages" xmi:id="_jfwwQCSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_LnCeMFLNEd-ZSLMRjxSbVQ"

-          description="EMF Tests Pattern" name="mergeRulesURI" invocationContracts="#_DU8VykLpEei0i9bcSdIGKw">

-        <type xmi:type="types:TypeURI" xmi:id="_DU8VzELpEei0i9bcSdIGKw"/>

+          description="EMF Tests Pattern" name="mergeRulesURI" invocationContracts="#_jgNcMCSWEemxeP6B0lLOpA">

+        <type xmi:type="types:TypeURI" xmi:id="_jggXICSWEemxeP6B0lLOpA"/>

       </contracts>

     </contractContainer>

     <viewpointContainer xmi:id="_PoO-4DG0Ed-kc8dEZsdm2w">

       <viewpoints xmi:type="pattern:PatternViewpoint" xmi:id="_PoO-4TG0Ed-kc8dEZsdm2w">

         <libraries xmi:id="_PoO-4jG0Ed-kc8dEZsdm2w" name="org.eclipse.egf.emf.pattern.tests">

-          <elements xmi:id="_PoO-4zG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/plugin.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

+          <elements xmi:id="_PoO-4zG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/plugin.xmljet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderXml&#xA;"

               name="PluginXML" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#_PoO-5TG0Ed-kc8dEZsdm2w" conditionMethod="#_-pXU9HLYEd-09ds9dfYpFw"

               initMethod="#_PoO-5jG0Ed-kc8dEZsdm2w" footerMethod="#_PoO-6DG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C4QZoULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_VYHgICSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PoO-5TG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PoO-4zG0Ed-kc8dEZsdm2w/method._PoO-5TG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PoO-5jG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PoO-4zG0Ed-kc8dEZsdm2w/method._PoO-5jG0Ed-kc8dEZsdm2w.pt"/>

@@ -5363,20 +5793,20 @@
             <methods xmi:id="_SxaSKGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PoO-4zG0Ed-kc8dEZsdm2w/method._SxaSKGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_1A1QOWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PoO-4zG0Ed-kc8dEZsdm2w/method._1A1QOWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PoO-7DG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PoO-4zG0Ed-kc8dEZsdm2w/method._PoO-7DG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C4QZp0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C4QZq0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_VaEA4CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VaznwCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C4QZrULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VbQTsCSWEemxeP6B0lLOpA"

                 called="#_PoO-7DG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C4QZrkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C4QZr0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_VbZdoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VbjOoCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PoYv4DG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/build.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

+          <elements xmi:id="_PoYv4DG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/build.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

               name="BuildProperties" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#_PoYv4jG0Ed-kc8dEZsdm2w" conditionMethod="#_-iWuBHLYEd-09ds9dfYpFw"

               initMethod="#_PoYv4zG0Ed-kc8dEZsdm2w" footerMethod="#_PoYv5TG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C38QkULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_VTgF4CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PoYv4jG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PoYv4DG0Ed-kc8dEZsdm2w/method._PoYv4jG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PoYv4zG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PoYv4DG0Ed-kc8dEZsdm2w/method._PoYv4zG0Ed-kc8dEZsdm2w.pt"/>

@@ -5387,20 +5817,20 @@
             <methods xmi:id="_SxHXPGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PoYv4DG0Ed-kc8dEZsdm2w/method._SxHXPGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_1AsGTWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PoYv4DG0Ed-kc8dEZsdm2w/method._1AsGTWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PoYv6TG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PoYv4DG0Ed-kc8dEZsdm2w/method._PoYv6TG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C38Ql0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C383oELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_VWCcgCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VWyDYCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C383okLpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VXE-UCSWEemxeP6B0lLOpA"

                 called="#_PoYv6TG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C383o0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C383pELpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_VXX5QCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VXhqQCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_Po1b0DG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/manifest.mfjet&quot;&#xA;"

+          <elements xmi:id="_Po1b0DG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/manifest.mfjet&quot;&#xA;"

               name="ManifestMF" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_ZTUvECg7Ed-ROrlGa8LEeQ"

               headerMethod="#_Po1b0jG0Ed-kc8dEZsdm2w" conditionMethod="#_-e7mmHLYEd-09ds9dfYpFw"

               initMethod="#_Po1b0zG0Ed-kc8dEZsdm2w" footerMethod="#_Po1b1TG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C3rx5ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_VcJEgCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_Po1b0jG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Po1b0DG0Ed-kc8dEZsdm2w/method._Po1b0jG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_Po1b0zG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Po1b0DG0Ed-kc8dEZsdm2w/method._Po1b0zG0Ed-kc8dEZsdm2w.pt"/>

@@ -5411,20 +5841,20 @@
             <methods xmi:id="_SxRIOGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._Po1b0DG0Ed-kc8dEZsdm2w/method._SxRIOGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_1BIyOWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Po1b0DG0Ed-kc8dEZsdm2w/method._1BIyOWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_Po1b2TG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Po1b0DG0Ed-kc8dEZsdm2w/method._Po1b2TG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C3rx60LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C3sY80LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Vd70QCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VerbICSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_mwzm4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C3sY9ULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VfIHECSWEemxeP6B0lLOpA"

                 called="#_Po1b2TG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C3sY9kLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C3sY90LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_VfRRACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VfbCACSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PplCsDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/plugin.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

+          <elements xmi:id="_PplCsDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/plugin.propertiesjet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderProperties&#xA;"

               name="PluginProperties" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_xxtwkCg7Ed-ROrlGa8LEeQ"

               headerMethod="#_PplCsjG0Ed-kc8dEZsdm2w" conditionMethod="#_-uRqJHLYEd-09ds9dfYpFw"

               initMethod="#_PplCszG0Ed-kc8dEZsdm2w" footerMethod="#_PplCtTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C4itgULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_VgBe8CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PplCsjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PplCsDG0Ed-kc8dEZsdm2w/method._PplCsjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PplCszG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PplCsDG0Ed-kc8dEZsdm2w/method._PplCszG0Ed-kc8dEZsdm2w.pt"/>

@@ -5435,20 +5865,20 @@
             <methods xmi:id="_SxkDKGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PplCsDG0Ed-kc8dEZsdm2w/method._SxkDKGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_1BR8KWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PplCsDG0Ed-kc8dEZsdm2w/method._1BR8KWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PplCuTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PplCsDG0Ed-kc8dEZsdm2w/method._PplCuTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C4ith0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C4jUk0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Vh9YoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Vis_gCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_pQ16sChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C4jUlULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Vi_6cCSWEemxeP6B0lLOpA"

                 called="#_PplCuTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C4jUlkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C4jUl0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_VjJrcCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VjS1YCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_Pp39oDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.implementedGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.implementedGenOperation.override&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.insert&#xA;"

+          <elements xmi:id="_Pp39oDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.implementedGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.implementedGenOperation.override&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.insert&#xA;"

               name="TestCase" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_hYG6UCg6Ed-ROrlGa8LEeQ"

               headerMethod="#_Pp39ojG0Ed-kc8dEZsdm2w" conditionMethod="#_-w9xxHLYEd-09ds9dfYpFw"

               initMethod="#_Pp39ozG0Ed-kc8dEZsdm2w" footerMethod="#_Pp39pTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C4ylIULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_VryqECSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_Pp39ojG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Pp39oDG0Ed-kc8dEZsdm2w/method._Pp39ojG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_Pp39ozG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Pp39oDG0Ed-kc8dEZsdm2w/method._Pp39ozG0Ed-kc8dEZsdm2w.pt"/>

@@ -5459,20 +5889,20 @@
             <methods xmi:id="_Sx2-GGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._Pp39oDG0Ed-kc8dEZsdm2w/method._Sx2-GGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_1BuoGWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Pp39oDG0Ed-kc8dEZsdm2w/method._1BuoGWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PqBuojG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Pp39oDG0Ed-kc8dEZsdm2w/method._PqBuojG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C4ylJ0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C4ylK0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Vt4UwCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Vun7oCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_Chxo4ChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C4ylLULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VvEnkCSWEemxeP6B0lLOpA"

                 called="#_PqBuojG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C4ylLkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C4ylL0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_VvNxgCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VvXigCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PqeakDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/PackageExample.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PqeakDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/PackageExample.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="PackageExample" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PqeakjG0Ed-kc8dEZsdm2w" conditionMethod="#_-0r0JHLYEd-09ds9dfYpFw"

               initMethod="#_PqeakzG0Ed-kc8dEZsdm2w" footerMethod="#_PqealTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C5RtUULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Vv9_cCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PqeakjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PqeakDG0Ed-kc8dEZsdm2w/method._PqeakjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PqeakzG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PqeakDG0Ed-kc8dEZsdm2w/method._PqeakzG0Ed-kc8dEZsdm2w.pt"/>

@@ -5483,20 +5913,20 @@
             <methods xmi:id="_Sxt0KGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PqeakDG0Ed-kc8dEZsdm2w/method._Sxt0KGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_1Bk3GWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PqeakDG0Ed-kc8dEZsdm2w/method._1Bk3GWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PqeamTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PqeakDG0Ed-kc8dEZsdm2w/method._PqeamTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C5SUZULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C5SUaULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_VxwIICSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_V0bosCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C5SUa0LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_V04UoCSWEemxeP6B0lLOpA"

                 called="#_PqeamTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C5SUbELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C5SUbULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_V1CFoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_V1LPkCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_Pq6fcDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/ModelTestSuite.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_Pq6fcDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/ModelTestSuite.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="ModelTestSuite" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_F0In8Cg6Ed-ROrlGa8LEeQ"

               headerMethod="#_Pq6fcjG0Ed-kc8dEZsdm2w" conditionMethod="#_-7Y5FHLYEd-09ds9dfYpFw"

               initMethod="#_Pq6fczG0Ed-kc8dEZsdm2w" footerMethod="#_Pq6fdTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C5g94ULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_VnxFsCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_Pq6fcjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._Pq6fcDG0Ed-kc8dEZsdm2w/method._Pq6fcjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_Pq6fczG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._Pq6fcDG0Ed-kc8dEZsdm2w/method._Pq6fczG0Ed-kc8dEZsdm2w.pt"/>

@@ -5507,20 +5937,20 @@
             <methods xmi:id="_SyAvGGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._Pq6fcDG0Ed-kc8dEZsdm2w/method._SyAvGGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_1BbtKWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._Pq6fcDG0Ed-kc8dEZsdm2w/method._1BbtKWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_Pq6feTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._Pq6fcDG0Ed-kc8dEZsdm2w/method._Pq6feTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C5g950LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C5g960LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Vps_YCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VqcmQCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_cjQNwChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C5g97ULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Vq5SMCSWEemxeP6B0lLOpA"

                 called="#_Pq6feTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C5g97kLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C5g970LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_VrDDMCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VrV-ICSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_DrPLUChGEd-zj5CV40Ozyg"/>

           </elements>

-          <elements xmi:id="_PrOBcDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/PackageTestSuite.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

+          <elements xmi:id="_PrOBcDG0Ed-kc8dEZsdm2w" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/PackageTestSuite.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.base.HeaderJava&#xA;"

               name="PackageTestSuite" superPattern="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_VlOiICg6Ed-ROrlGa8LEeQ"

               headerMethod="#_PrOBcjG0Ed-kc8dEZsdm2w" conditionMethod="#_-5ATdHLYEd-09ds9dfYpFw"

               initMethod="#_PrOBczG0Ed-kc8dEZsdm2w" footerMethod="#_PrOBdTG0Ed-kc8dEZsdm2w">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_C5CcwULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_Vj5SUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_PrOBcjG0Ed-kc8dEZsdm2w" name="header" patternFilePath="templates/pattern._PrOBcDG0Ed-kc8dEZsdm2w/method._PrOBcjG0Ed-kc8dEZsdm2w.pt"/>

             <methods xmi:id="_PrOBczG0Ed-kc8dEZsdm2w" name="init" patternFilePath="templates/pattern._PrOBcDG0Ed-kc8dEZsdm2w/method._PrOBczG0Ed-kc8dEZsdm2w.pt"/>

@@ -5531,418 +5961,418 @@
             <methods xmi:id="_SyKgGGKPEd-2a5uccsiuZA" name="setArgument" patternFilePath="templates/pattern._PrOBcDG0Ed-kc8dEZsdm2w/method._SyKgGGKPEd-2a5uccsiuZA.pt"/>

             <methods xmi:id="_1B4ZGWKMEd-_wNQtGaQ-lw" name="ensureProjectExists" patternFilePath="templates/pattern._PrOBcDG0Ed-kc8dEZsdm2w/method._1B4ZGWKMEd-_wNQtGaQ-lw.pt"/>

             <methods xmi:id="_PrOBeTG0Ed-kc8dEZsdm2w" name="doGenerate" patternFilePath="templates/pattern._PrOBcDG0Ed-kc8dEZsdm2w/method._PrOBeTG0Ed-kc8dEZsdm2w.pt"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_C5DD0ULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C5DD1ULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_Vl1MACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Vmky4CSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_QRYMcChGEd-zj5CV40Ozyg"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C5DD10LpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_Vm3t0CSWEemxeP6B0lLOpA"

                 called="#_PrOBeTG0Ed-kc8dEZsdm2w"/>

-            <orchestration xmi:type="pattern:BackCall" xmi:id="_C5DD2ELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_C5DD2ULpEei0i9bcSdIGKw"

+            <orchestration xmi:type="pattern:BackCall" xmi:id="_VnBe0CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_VnUZwCSWEemxeP6B0lLOpA"

                 called="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_MeyroChGEd-zj5CV40Ozyg"/>

           </elements>

         </libraries>

         <libraries xmi:id="_09kCIGJ-Ed-FqczH3ESmRw" name="org.eclipse.egf.emf.pattern.tests.call.TestCase">

-          <elements xmi:id="_09kCIWJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.getGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.setGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.unsetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.isSetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.implementedGenFeature.insert&#xA;"

+          <elements xmi:id="_09kCIWJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.getGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.setGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.unsetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.isSetGenFeature.override&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.implementedGenFeature.insert&#xA;"

               name="TestCase.implementedGenFeature.override" headerMethod="#_09kCI2J-Ed-FqczH3ESmRw"

               conditionMethod="#_CIbc1XLZEd-09ds9dfYpFw" initMethod="#_09kCJGJ-Ed-FqczH3ESmRw"

               footerMethod="#_09kCJmJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DRZ5ckLpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_iBbxECSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_09kCI2J-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._09kCIWJ-Ed-FqczH3ESmRw/method._09kCI2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_09kCJGJ-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._09kCIWJ-Ed-FqczH3ESmRw/method._09kCJGJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CIbc1XLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._09kCIWJ-Ed-FqczH3ESmRw/method._CIbc1XLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_09kCJmJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._09kCIWJ-Ed-FqczH3ESmRw/method._09kCJmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_09kCLGJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._09kCIWJ-Ed-FqczH3ESmRw/method._09kCLGJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DRZ5eULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DRZ5ekLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DRZ5e0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DRZ5fELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DRZ5fULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DRZ5eELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DRZ5f0LpEei0i9bcSdIGKw"

+            <parameters xmi:id="_iDg0sCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_iD0WsCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_iD9goCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_iEHRoCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_iERCoCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_iDXqwCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_iEtHgCSWEemxeP6B0lLOpA"

                 called="#_09kCLGJ-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_093kIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.getGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.getGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_093kIGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.getGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.getGenFeature.TODO.override&#xA;"

               name="TestCase.getGenFeature.override" headerMethod="#_093kImJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CKEblHLZEd-09ds9dfYpFw" initMethod="#_093kI2J-Ed-FqczH3ESmRw"

               footerMethod="#_093kJWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DRjDYULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_iFJzcCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_093kImJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._093kIGJ-Ed-FqczH3ESmRw/method._093kImJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_093kI2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._093kIGJ-Ed-FqczH3ESmRw/method._093kI2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CKEblHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._093kIGJ-Ed-FqczH3ESmRw/method._CKEblHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_093kJWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._093kIGJ-Ed-FqczH3ESmRw/method._093kJWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_093kK2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._093kIGJ-Ed-FqczH3ESmRw/method._093kK2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DRjqdkLpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DRjqd0LpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DRjqeELpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DRjqeULpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DRjqekLpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DRjqdULpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DRjqfELpEei0i9bcSdIGKw"

+            <parameters xmi:id="_iHFtICSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_iHZPICSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_iHiZECSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_iHsKECSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_iH17ECSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_iG8jMCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_iIR_8CSWEemxeP6B0lLOpA"

                 called="#_093kK2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0-KfEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

+          <elements xmi:id="_0-KfEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

               name="TestCase.getGenFeature.annotations.insert" headerMethod="#_0-KfEmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CLQuZHLZEd-09ds9dfYpFw" initMethod="#_0-KfE2J-Ed-FqczH3ESmRw"

               footerMethod="#_0-KfFWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DRvQoULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_iIur4CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0-KfEmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0-KfEGJ-Ed-FqczH3ESmRw/method._0-KfEmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0-KfE2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0-KfEGJ-Ed-FqczH3ESmRw/method._0-KfE2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CLQuZHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0-KfEGJ-Ed-FqczH3ESmRw/method._CLQuZHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0-KfFWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0-KfEGJ-Ed-FqczH3ESmRw/method._0-KfFWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0-KfG2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0-KfEGJ-Ed-FqczH3ESmRw/method._0-KfG2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DRv3tULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DRv3tkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DRv3t0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DRv3uELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DRv3uULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DRv3tELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DRv3u0LpEei0i9bcSdIGKw"

+            <parameters xmi:id="_iK-HkCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_iLHRgCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_iLRCgCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_iLazgCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_iLtucCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_iKqlkCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_iMApYCSWEemxeP6B0lLOpA"

                 called="#_0-KfG2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0-UQEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

+          <elements xmi:id="_0-UQEGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

               name="TestCase.getGenFeature.TODO.override" headerMethod="#_0-UQEmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CMmyNHLZEd-09ds9dfYpFw" initMethod="#_0-UQE2J-Ed-FqczH3ESmRw"

               footerMethod="#_0-UQFWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DR4akULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_iMdVUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0-UQEmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0-UQEGJ-Ed-FqczH3ESmRw/method._0-UQEmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0-UQE2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0-UQEGJ-Ed-FqczH3ESmRw/method._0-UQE2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CMmyNHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0-UQEGJ-Ed-FqczH3ESmRw/method._CMmyNHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0-UQFWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0-UQEGJ-Ed-FqczH3ESmRw/method._0-UQFWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0-UQG2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0-UQEGJ-Ed-FqczH3ESmRw/method._0-UQG2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DR4amELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DR4amULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DR4amkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DR4am0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DR4anELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DR4al0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DR4ankLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_iOjAACSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_iOsJ8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_iO_r8CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_iPI14CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_iPSm4CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_iOPeACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_iPvS0CSWEemxeP6B0lLOpA"

                 called="#_0-UQG2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0-daAGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.setGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.setGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0-daAGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.setGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.setGenFeature.TODO.override&#xA;"

               name="TestCase.setGenFeature.override" headerMethod="#_0-daAmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CPu-tHLZEd-09ds9dfYpFw" initMethod="#_0-daA2J-Ed-FqczH3ESmRw"

               footerMethod="#_0-daBWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DSCLkULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_iQL-wCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0-daAmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0-daAGJ-Ed-FqczH3ESmRw/method._0-daAmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0-daA2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0-daAGJ-Ed-FqczH3ESmRw/method._0-daA2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CPu-tHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0-daAGJ-Ed-FqczH3ESmRw/method._CPu-tHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0-daBWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0-daAGJ-Ed-FqczH3ESmRw/method._0-daBWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0-daC2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0-daAGJ-Ed-FqczH3ESmRw/method._0-daC2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DSCLmELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DSCLmULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DSCLmkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DSCLm0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DSCLnELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DSCLl0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DSCLnkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_iSkkYCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_iS3fUCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_iTBQUCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_iTKaQCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_iTdVMCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_iSazYCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_iTw3MCSWEemxeP6B0lLOpA"

                 called="#_0-daC2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0-wU8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

+          <elements xmi:id="_0-wU8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

               name="TestCase.setGenFeature.annotations.insert" headerMethod="#_0-wU8mJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CRq4ZHLZEd-09ds9dfYpFw" initMethod="#_0-wU82J-Ed-FqczH3ESmRw"

               footerMethod="#_0-wU9WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DSLVgULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_iVGT8CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0-wU8mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0-wU8GJ-Ed-FqczH3ESmRw/method._0-wU8mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0-wU82J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0-wU8GJ-Ed-FqczH3ESmRw/method._0-wU82J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CRq4ZHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0-wU8GJ-Ed-FqczH3ESmRw/method._CRq4ZHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0-wU9WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0-wU8GJ-Ed-FqczH3ESmRw/method._0-wU9WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0-wU-2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0-wU8GJ-Ed-FqczH3ESmRw/method._0-wU-2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DSL8lELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DSL8lULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DSL8lkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DSL8l0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DSL8mELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DSL8k0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DSL8mkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_iXL-oCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_iXVvoCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_iXoqkCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_iXybkCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_iX7lgCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_iXCNoCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_iYYRcCSWEemxeP6B0lLOpA"

                 called="#_0-wU-2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0-6F8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

+          <elements xmi:id="_0-6F8GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

               name="TestCase.setGenFeature.TODO.override" headerMethod="#_0-6F8mJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CStaNHLZEd-09ds9dfYpFw" initMethod="#_0-6F82J-Ed-FqczH3ESmRw"

               footerMethod="#_0-6F9WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DSVGgULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_iY09YCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0-6F8mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0-6F8GJ-Ed-FqczH3ESmRw/method._0-6F8mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0-6F82J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0-6F8GJ-Ed-FqczH3ESmRw/method._0-6F82J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CStaNHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0-6F8GJ-Ed-FqczH3ESmRw/method._CStaNHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0-6F9WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0-6F8GJ-Ed-FqczH3ESmRw/method._0-6F9WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0-6F-2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0-6F8GJ-Ed-FqczH3ESmRw/method._0-6F-2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DSVGiELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DSVGiULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DSVGikLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DSVGi0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DSVGjELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DSVGh0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DSVGjkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_ia6oECSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ibDyACSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ibNjACSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_ibgd8CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_ibqO8CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ianGECSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_ib9J4CSWEemxeP6B0lLOpA"

                 called="#_0-6F-2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_0_NA4GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.unsetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.unsetGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_0_NA4GJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.unsetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.unsetGenFeature.TODO.override&#xA;"

               name="TestCase.unsetGenFeature.override" headerMethod="#_0_NA4mJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CUDeBHLZEd-09ds9dfYpFw" initMethod="#_0_NA42J-Ed-FqczH3ESmRw"

               footerMethod="#_0_NA5WJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DSe3gELpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_icjm0CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_0_NA4mJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._0_NA4GJ-Ed-FqczH3ESmRw/method._0_NA4mJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0_NA42J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._0_NA4GJ-Ed-FqczH3ESmRw/method._0_NA42J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CUDeBHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._0_NA4GJ-Ed-FqczH3ESmRw/method._CUDeBHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_0_NA5WJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._0_NA4GJ-Ed-FqczH3ESmRw/method._0_NA5WJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_0_NA62J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._0_NA4GJ-Ed-FqczH3ESmRw/method._0_NA62J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DSe3h0LpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DSe3iELpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DSe3iULpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DSe3ikLpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DSe3i0LpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DSe3hkLpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DSe3jULpEei0i9bcSdIGKw"

+            <parameters xmi:id="_iefggCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ieybcCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ie8McCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_ifFWYCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_ifPHYCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ieVvgCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_ifrzUCSWEemxeP6B0lLOpA"

                 called="#_0_NA62J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_1BcckGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

+          <elements xmi:id="_1BcckGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

               name="TestCase.unsetGenFeature.annotations.insert" headerMethod="#_1BcckmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CVZh1HLZEd-09ds9dfYpFw" initMethod="#_1Bcck2J-Ed-FqczH3ESmRw"

               footerMethod="#_1BcclWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DSqdsULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_igIfQCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_1BcckmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._1BcckGJ-Ed-FqczH3ESmRw/method._1BcckmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1Bcck2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._1BcckGJ-Ed-FqczH3ESmRw/method._1Bcck2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CVZh1HLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._1BcckGJ-Ed-FqczH3ESmRw/method._CVZh1HLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_1BcclWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._1BcckGJ-Ed-FqczH3ESmRw/method._1BcclWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1Bccm2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._1BcckGJ-Ed-FqczH3ESmRw/method._1Bccm2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DSqduELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DSqduULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DSqdukLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DSqdu0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DSqdvELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DSqdt0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DSqdvkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_iiEY8CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_iiXT4CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_iihE4CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_iiqO0CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_iiz_0CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ih6n8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_ijQrwCSWEemxeP6B0lLOpA"

                 called="#_1Bccm2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_1BlmgGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

+          <elements xmi:id="_1BlmgGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

               name="TestCase.unsetGenFeature.TODO.override" headerMethod="#_1BlmgmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CWSSpHLZEd-09ds9dfYpFw" initMethod="#_1Blmg2J-Ed-FqczH3ESmRw"

               footerMethod="#_1BlmhWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DS9YoULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_ijtXsCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_1BlmgmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._1BlmgGJ-Ed-FqczH3ESmRw/method._1BlmgmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1Blmg2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._1BlmgGJ-Ed-FqczH3ESmRw/method._1Blmg2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CWSSpHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._1BlmgGJ-Ed-FqczH3ESmRw/method._CWSSpHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_1BlmhWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._1BlmgGJ-Ed-FqczH3ESmRw/method._1BlmhWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1Blmi2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._1BlmgGJ-Ed-FqczH3ESmRw/method._1Blmi2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DS9_tULpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DS9_tkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DS9_t0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DS9_uELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DS9_uULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DS9_tELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DS9_u0LpEei0i9bcSdIGKw"

+            <parameters xmi:id="_ilybUCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_il8MUCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_imF9UCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_imY4QCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_imiCMCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ilpRYCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_im-uICSWEemxeP6B0lLOpA"

                 called="#_1Blmi2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_1BvXgGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.isSetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.isSetGenFeature.TODO.override&#xA;"

+          <elements xmi:id="_1BvXgGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.isSetGenFeature.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.isSetGenFeature.TODO.override&#xA;"

               name="TestCase.isSetGenFeature.override" headerMethod="#_1BvXgmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CY-aRHLZEd-09ds9dfYpFw" initMethod="#_1BvXg2J-Ed-FqczH3ESmRw"

               footerMethod="#_1BvXhWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DTQTkULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_inbaECSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_1BvXgmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._1BvXgGJ-Ed-FqczH3ESmRw/method._1BvXgmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1BvXg2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._1BvXgGJ-Ed-FqczH3ESmRw/method._1BvXg2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CY-aRHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._1BvXgGJ-Ed-FqczH3ESmRw/method._CY-aRHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_1BvXhWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._1BvXgGJ-Ed-FqczH3ESmRw/method._1BvXhWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1BvXi2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._1BvXgGJ-Ed-FqczH3ESmRw/method._1BvXi2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DTQTmELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DTQTmULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DTQTmkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DTQTm0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DTQTnELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DTQTl0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DTQTnkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_iphEwCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ipq1wCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ip9wsCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_iqG6oCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_iqQroCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_ipXTwCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_iqtXkCSWEemxeP6B0lLOpA"

                 called="#_1BvXi2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_1CMDcGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

+          <elements xmi:id="_1CMDcGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

               name="TestCase.isSetGenFeature.annotations.insert" headerMethod="#_1CMDcmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CanZBHLZEd-09ds9dfYpFw" initMethod="#_1CMDc2J-Ed-FqczH3ESmRw"

               footerMethod="#_1CMDdWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DTbSsULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_irKDgCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_1CMDcmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._1CMDcGJ-Ed-FqczH3ESmRw/method._1CMDcmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1CMDc2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._1CMDcGJ-Ed-FqczH3ESmRw/method._1CMDc2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CanZBHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._1CMDcGJ-Ed-FqczH3ESmRw/method._CanZBHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_1CMDdWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._1CMDcGJ-Ed-FqczH3ESmRw/method._1CMDdWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1CMDe2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._1CMDcGJ-Ed-FqczH3ESmRw/method._1CMDe2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DTbSuELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DTbSuULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DTbSukLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DTbSu0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DTbSvELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DTbSt0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DTbSvkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_itPuMCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_itY4ICSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_itrzECSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_it1kECSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_it_VECSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_itF9MCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_iucBACSWEemxeP6B0lLOpA"

                 called="#_1CMDe2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_1Ce-YGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

+          <elements xmi:id="_1Ce-YGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

               name="TestCase.isSetGenFeature.TODO.override" headerMethod="#_1Ce-YmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CcGmxHLZEd-09ds9dfYpFw" initMethod="#_1Ce-Y2J-Ed-FqczH3ESmRw"

               footerMethod="#_1Ce-ZWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DToHAULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_iu4F4CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_1Ce-YmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._1Ce-YGJ-Ed-FqczH3ESmRw/method._1Ce-YmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1Ce-Y2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._1Ce-YGJ-Ed-FqczH3ESmRw/method._1Ce-Y2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CcGmxHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._1Ce-YGJ-Ed-FqczH3ESmRw/method._CcGmxHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_1Ce-ZWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._1Ce-YGJ-Ed-FqczH3ESmRw/method._1Ce-ZWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1Ce-a2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._1Ce-YGJ-Ed-FqczH3ESmRw/method._1Ce-a2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DToHCELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DToHCULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DToHCkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DToHC0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DToHDELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DToHB0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DToHDkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_ixHhkCSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_ixQrgCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_ixkNgCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_ixtXcCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_ix3IcCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_iw0moCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_iyT0YCSWEemxeP6B0lLOpA"

                 called="#_1Ce-a2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_1CovYGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

+          <elements xmi:id="_1CovYGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

               name="TestCase.implementedGenFeature.insert" headerMethod="#_1CovYmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CdcDhHLZEd-09ds9dfYpFw" initMethod="#_1CovY2J-Ed-FqczH3ESmRw"

               footerMethod="#_1CovZWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DTx4AULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_iywgUCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_1CovYmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._1CovYGJ-Ed-FqczH3ESmRw/method._1CovYmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1CovY2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._1CovYGJ-Ed-FqczH3ESmRw/method._1CovY2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CdcDhHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._1CovYGJ-Ed-FqczH3ESmRw/method._CdcDhHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_1CovZWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._1CovYGJ-Ed-FqczH3ESmRw/method._1CovZWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1Cova2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._1CovYGJ-Ed-FqczH3ESmRw/method._1Cova2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DTx4CELpEei0i9bcSdIGKw" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

-            <parameters xmi:id="_DTx4CULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DTx4CkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DTx4C0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DTx4DELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DTx4B0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DTx4DkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_i0_U8CSWEemxeP6B0lLOpA" name="genFeature" type="org.eclipse.emf.codegen.ecore.genmodel.GenFeature"/>

+            <parameters xmi:id="_i1JF8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_i1cA4CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_i1lx4CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_i1u70CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_i01j8CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_i2LnwCSWEemxeP6B0lLOpA"

                 called="#_1Cova2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_1Cx5UGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.genOperation.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.implementedGenOperation.TODO.override&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.implementedGenOperation.insert&#xA;"

+          <elements xmi:id="_1Cx5UGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;This pattern calls:&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.genOperation.annotations.insert&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.implementedGenOperation.TODO.override&#xA;    * org.eclipse.egf.emf.pattern.tests.call.TestCase.TestCase.implementedGenOperation.insert&#xA;"

               name="TestCase.implementedGenOperation.override" headerMethod="#_1Cx5UmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CeVbZHLZEd-09ds9dfYpFw" initMethod="#_1Cx5U2J-Ed-FqczH3ESmRw"

               footerMethod="#_1Cx5VWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DT9eMULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_i2oTsCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_1Cx5UmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._1Cx5UGJ-Ed-FqczH3ESmRw/method._1Cx5UmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1Cx5U2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._1Cx5UGJ-Ed-FqczH3ESmRw/method._1Cx5U2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CeVbZHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._1Cx5UGJ-Ed-FqczH3ESmRw/method._CeVbZHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_1Cx5VWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._1Cx5UGJ-Ed-FqczH3ESmRw/method._1Cx5VWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1Cx5W2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._1Cx5UGJ-Ed-FqczH3ESmRw/method._1Cx5W2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DT9eOELpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DT9eOULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DT9eOkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DT9eO0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DT9ePELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DT9eN0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DT9ePkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_i43IUCSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_i5A5UCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_i5KqUCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_i5T0QCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_i5mvMCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_i4kNYCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_i56RMCSWEemxeP6B0lLOpA"

                 called="#_1Cx5W2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_1C7qUGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

+          <elements xmi:id="_1C7qUGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

               name="TestCase.genOperation.annotations.insert" headerMethod="#_1C7qUmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CgILJHLZEd-09ds9dfYpFw" initMethod="#_1C7qU2J-Ed-FqczH3ESmRw"

               footerMethod="#_1C7qVWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DUJrcULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_i6gHECSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_1C7qUmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._1C7qUGJ-Ed-FqczH3ESmRw/method._1C7qUmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1C7qU2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._1C7qUGJ-Ed-FqczH3ESmRw/method._1C7qU2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CgILJHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._1C7qUGJ-Ed-FqczH3ESmRw/method._CgILJHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_1C7qVWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._1C7qUGJ-Ed-FqczH3ESmRw/method._1C7qVWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1C7qW2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._1C7qUGJ-Ed-FqczH3ESmRw/method._1C7qW2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DUJreELpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DUJreULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DUJrekLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DUJre0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DUJrfELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DUJrd0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DUJrfkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_i8cAwCSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_i8viwCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_i84ssCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_i9CdsCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_i9MOsCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_i8S20CSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_i9oTkCSWEemxeP6B0lLOpA"

                 called="#_1C7qW2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_1DFbUGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

+          <elements xmi:id="_1DFbUGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

               name="TestCase.implementedGenOperation.TODO.override" headerMethod="#_1DFbUmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_CjtDlHLZEd-09ds9dfYpFw" initMethod="#_1DFbU2J-Ed-FqczH3ESmRw"

               footerMethod="#_1DFbVWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DUSOUULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_i-E_gCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_1DFbUmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._1DFbUGJ-Ed-FqczH3ESmRw/method._1DFbUmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1DFbU2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._1DFbUGJ-Ed-FqczH3ESmRw/method._1DFbU2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_CjtDlHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._1DFbUGJ-Ed-FqczH3ESmRw/method._CjtDlHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_1DFbVWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._1DFbUGJ-Ed-FqczH3ESmRw/method._1DFbVWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1DFbW2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._1DFbUGJ-Ed-FqczH3ESmRw/method._1DFbW2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DUS1ZULpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DUS1ZkLpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DUS1Z0LpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DUS1aELpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DUS1aULpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DUS1ZELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DUS1a0LpEei0i9bcSdIGKw"

+            <parameters xmi:id="_jAKqMCSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_jAUbMCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_jAdlICSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_jAxHICSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_jA6RECSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_jAA5MCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_jBNMACSWEemxeP6B0lLOpA"

                 called="#_1DFbW2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_1DOlQGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

+          <elements xmi:id="_1DOlQGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

               name="TestCase.implementedGenOperation.insert" headerMethod="#_1DOlQmJ-Ed-FqczH3ESmRw"

               conditionMethod="#_Ckl0ZHLZEd-09ds9dfYpFw" initMethod="#_1DOlQ2J-Ed-FqczH3ESmRw"

               footerMethod="#_1DOlRWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DUdNcULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_jBzo8CSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_1DOlQmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._1DOlQGJ-Ed-FqczH3ESmRw/method._1DOlQmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1DOlQ2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._1DOlQGJ-Ed-FqczH3ESmRw/method._1DOlQ2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_Ckl0ZHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._1DOlQGJ-Ed-FqczH3ESmRw/method._Ckl0ZHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_1DOlRWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._1DOlQGJ-Ed-FqczH3ESmRw/method._1DOlRWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1DOlS2J-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._1DOlQGJ-Ed-FqczH3ESmRw/method._1DOlS2J-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DUdNeELpEei0i9bcSdIGKw" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

-            <parameters xmi:id="_DUdNeULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DUdNekLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DUdNe0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DUdNfELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DUdNd0LpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DUdNfkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_jEfJgCSWEemxeP6B0lLOpA" name="genOperation" type="org.eclipse.emf.codegen.ecore.genmodel.GenOperation"/>

+            <parameters xmi:id="_jEo6gCSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_jE71cCSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_jFFmcCSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_jFOwYCSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_jEV_kCSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_jFrcUCSWEemxeP6B0lLOpA"

                 called="#_1DOlS2J-Ed-FqczH3ESmRw"/>

           </elements>

-          <elements xmi:id="_1DYWQGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.14.0.v20180123-1048 from EMF 2.14.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

+          <elements xmi:id="_1DYWQGJ-Ed-FqczH3ESmRw" description="This pattern was generated from : &#xA;    * Bundle org.eclipse.emf.codegen.ecore 2.17.0.qualifier from EMF 2.17.&#xA;    * Template &quot;templates/model.tests/TestCase.javajet&quot;&#xA;"

               name="TestCase.insert" headerMethod="#_1DYWQmJ-Ed-FqczH3ESmRw" conditionMethod="#_ClCgVHLZEd-09ds9dfYpFw"

               initMethod="#_1DYWQ2J-Ed-FqczH3ESmRw" footerMethod="#_1DYWRWJ-Ed-FqczH3ESmRw">

-            <nature xmi:type="jetpattern:JetNature" xmi:id="_DUseAULpEei0i9bcSdIGKw"

+            <nature xmi:type="jetpattern:JetNature" xmi:id="_jGIIQCSWEemxeP6B0lLOpA"

                 name="JET"/>

             <methods xmi:id="_1DYWQmJ-Ed-FqczH3ESmRw" name="header" patternFilePath="templates/pattern._1DYWQGJ-Ed-FqczH3ESmRw/method._1DYWQmJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1DYWQ2J-Ed-FqczH3ESmRw" name="init" patternFilePath="templates/pattern._1DYWQGJ-Ed-FqczH3ESmRw/method._1DYWQ2J-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_ClCgVHLZEd-09ds9dfYpFw" name="preCondition" patternFilePath="templates/pattern._1DYWQGJ-Ed-FqczH3ESmRw/method._ClCgVHLZEd-09ds9dfYpFw.pt"/>

             <methods xmi:id="_1DYWRWJ-Ed-FqczH3ESmRw" name="footer" patternFilePath="templates/pattern._1DYWQGJ-Ed-FqczH3ESmRw/method._1DYWRWJ-Ed-FqczH3ESmRw.pt"/>

             <methods xmi:id="_1DYWSmJ-Ed-FqczH3ESmRw" name="doGenerate" patternFilePath="templates/pattern._1DYWQGJ-Ed-FqczH3ESmRw/method._1DYWSmJ-Ed-FqczH3ESmRw.pt"/>

-            <parameters xmi:id="_DUtFFULpEei0i9bcSdIGKw" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

-            <parameters xmi:id="_DUtFFkLpEei0i9bcSdIGKw" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

-            <parameters xmi:id="_DUtFF0LpEei0i9bcSdIGKw" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

-            <parameters xmi:id="_DUtFGELpEei0i9bcSdIGKw" name="isJDK50" type="java.lang.Boolean"/>

-            <orchestration xmi:type="pattern:SuperCall" xmi:id="_DUtFFELpEei0i9bcSdIGKw"/>

-            <orchestration xmi:type="pattern:MethodCall" xmi:id="_DUtFGkLpEei0i9bcSdIGKw"

+            <parameters xmi:id="_jINy8CSWEemxeP6B0lLOpA" name="genClass" type="org.eclipse.emf.codegen.ecore.genmodel.GenClass"/>

+            <parameters xmi:id="_jIW84CSWEemxeP6B0lLOpA" name="genPackage" type="org.eclipse.emf.codegen.ecore.genmodel.GenPackage"/>

+            <parameters xmi:id="_jIqe4CSWEemxeP6B0lLOpA" name="genModel" type="org.eclipse.emf.codegen.ecore.genmodel.GenModel"/>

+            <parameters xmi:id="_jI9Z0CSWEemxeP6B0lLOpA" name="isJDK50" type="java.lang.Boolean"/>

+            <orchestration xmi:type="pattern:SuperCall" xmi:id="_jH64ACSWEemxeP6B0lLOpA"/>

+            <orchestration xmi:type="pattern:MethodCall" xmi:id="_jJQUwCSWEemxeP6B0lLOpA"

                 called="#_1DYWSmJ-Ed-FqczH3ESmRw"/>

           </elements>

         </libraries>

       </viewpoints>

     </viewpointContainer>

     <orchestration xmi:type="fprod:ProductionPlan" xmi:id="_Prg8gTG0Ed-kc8dEZsdm2w">

-      <invocations xmi:id="_DU8VtkLpEei0i9bcSdIGKw" name="EMF Tests Pattern" invokedActivity="ftask:Task platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_jT-SgD1hEd-m5uHrCQ1Jew">

-        <invocationContractContainer xmi:id="_DU8Vt0LpEei0i9bcSdIGKw">

-          <invocationContracts xmi:id="_DU8VuELpEei0i9bcSdIGKw" factoryComponentContract="#_Prg8hjG0Ed-kc8dEZsdm2w"

+      <invocations xmi:id="_jbcQ8CSWEemxeP6B0lLOpA" name="EMF Tests Pattern" invokedActivity="ftask:Task platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_jT-SgD1hEd-m5uHrCQ1Jew">

+        <invocationContractContainer xmi:id="_jbvL4CSWEemxeP6B0lLOpA">

+          <invocationContracts xmi:id="_jcL30CSWEemxeP6B0lLOpA" factoryComponentContract="#_Prg8hjG0Ed-kc8dEZsdm2w"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_DgB2IP6fEd64XaYPo3s6sPg"/>

-          <invocationContracts xmi:id="_DU8VvELpEei0i9bcSdIGKw" factoryComponentContract="#_tvg04FIIEd-eGOdO3WtsxA"

+          <invocationContracts xmi:id="_jdEooCSWEemxeP6B0lLOpA" factoryComponentContract="#_tvg04FIIEd-eGOdO3WtsxA"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_L6JSwAHAEd-4faJMEplCjxw">

-            <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_DU8VvULpEei0i9bcSdIGKw"

+            <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_jdOZoCSWEemxeP6B0lLOpA"

                 value="org.eclipse.egf.emf.pattern.base.ContentTypePatternExecutionReporter"/>

           </invocationContracts>

-          <invocationContracts xmi:id="_DU8VwELpEei0i9bcSdIGKw" factoryComponentContract="#_Tx5xR1kTEd-bv5aydwO2Qw"

+          <invocationContracts xmi:id="_jd02kCSWEemxeP6B0lLOpA" factoryComponentContract="#_Tx5xR1kTEd-bv5aydwO2Qw"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_nz1HkSCaEd-Sse0r9LJWbA">

-            <type xmi:type="pattern:TypePatternList" xmi:id="_DU8VwULpEei0i9bcSdIGKw"

+            <type xmi:type="pattern:TypePatternList" xmi:id="_jd-AgCSWEemxeP6B0lLOpA"

                 elements="#_PoO-4jG0Ed-kc8dEZsdm2w"/>

           </invocationContracts>

-          <invocationContracts xmi:id="_DU8VxELpEei0i9bcSdIGKw" factoryComponentContract="#_eYFgEFHVEd-dr9AWwNwIMQ"

+          <invocationContracts xmi:id="_jekdcCSWEemxeP6B0lLOpA" factoryComponentContract="#_eYFgEFHVEd-dr9AWwNwIMQ"

               invokedContract="platform:/plugin/org.eclipse.egf.pattern.ftask/egf/Model_driven_pattern_strategy_task.fcore#_NFhJ4UMgEd-Ixul1H5ANhg"/>

-          <invocationContracts xmi:id="_DU8Vx0LpEei0i9bcSdIGKw" factoryComponentContract="#_NcjD0vMqEd-6tr0C8ZV8Ew"

+          <invocationContracts xmi:id="_jfdOQCSWEemxeP6B0lLOpA" factoryComponentContract="#_NcjD0vMqEd-6tr0C8ZV8Ew"

               invokedContract="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_JWI2sPI7Ed-Pp8S8RvVOuQ"/>

-          <invocationContracts xmi:id="_DU8VykLpEei0i9bcSdIGKw" factoryComponentContract="#_LnCeMFLNEd-ZSLMRjxSbVQ"

+          <invocationContracts xmi:id="_jgNcMCSWEemxeP6B0lLOpA" factoryComponentContract="#_LnCeMFLNEd-ZSLMRjxSbVQ"

               invokedContract="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#_vtlEAFLMEd-ZSLMRjxSbVQ"/>

         </invocationContractContainer>

       </invocations>

@@ -5951,80 +6381,80 @@
   <fcore:FactoryComponent xmi:id="_Prz3UDG0Ed-kc8dEZsdm2w" name="EMF Pattern">

     <contractContainer xmi:id="_Prz3UTG0Ed-kc8dEZsdm2w">

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_Prz3UjG0Ed-kc8dEZsdm2w"

-          description="EMF Pattern" name="genModel" mandatory="true" invocationContracts="#_DU9jx0LpEei0i9bcSdIGKw #_DU9j1kLpEei0i9bcSdIGKw #_DU9j3ULpEei0i9bcSdIGKw #_DU9j5ELpEei0i9bcSdIGKw">

-        <type xmi:type="domain:TypeDomain" xmi:id="_DU9jxkLpEei0i9bcSdIGKw"/>

+          description="EMF Pattern" name="genModel" mandatory="true" invocationContracts="#_jhGNBCSWEemxeP6B0lLOpA #_jicQ0SSWEemxeP6B0lLOpA #_jjojoSSWEemxeP6B0lLOpA #_jk-ncSSWEemxeP6B0lLOpA">

+        <type xmi:type="domain:TypeDomain" xmi:id="_jhGNAySWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_yqrHUFIIEd-eGOdO3WtsxA"

-          description="EMF Pattern" name="pattern.execution.reporter" invocationContracts="#_DU9jykLpEei0i9bcSdIGKw #_DU9j10LpEei0i9bcSdIGKw #_DU9j3kLpEei0i9bcSdIGKw #_DU9j5ULpEei0i9bcSdIGKw">

-        <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_DU9jyULpEei0i9bcSdIGKw"/>

+          description="EMF Pattern" name="pattern.execution.reporter" invocationContracts="#_jhZvAiSWEemxeP6B0lLOpA #_jimB0CSWEemxeP6B0lLOpA #_jjyUoCSWEemxeP6B0lLOpA #_jlHxYCSWEemxeP6B0lLOpA">

+        <type xmi:type="pattern:TypePatternExecutionReporter" xmi:id="_jhZvASSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_JBH151eTEd-ExtSXfVloug"

-          description="EMF Pattern" name="pattern.substitutions" invocationContracts="#_DU9jzULpEei0i9bcSdIGKw #_DU9j2ELpEei0i9bcSdIGKw #_DU9j30LpEei0i9bcSdIGKw #_DU9j5kLpEei0i9bcSdIGKw">

-        <type xmi:type="pattern:TypePatternSubstitution" xmi:id="_DU9jzELpEei0i9bcSdIGKw"/>

+          description="EMF Pattern" name="pattern.substitutions" invocationContracts="#_jhi48iSWEemxeP6B0lLOpA #_ji48wCSWEemxeP6B0lLOpA #_jj7ekCSWEemxeP6B0lLOpA #_jlasUCSWEemxeP6B0lLOpA">

+        <type xmi:type="pattern:TypePatternSubstitution" xmi:id="_jhi48SSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_k-TskPI7Ed-Pp8S8RvVOuQ"

-          description="EMF Pattern" name="usedGenPackages" invocationContracts="#_DU9j0ELpEei0i9bcSdIGKw #_DU9j2ULpEei0i9bcSdIGKw #_DU9j4ELpEei0i9bcSdIGKw #_DU9j50LpEei0i9bcSdIGKw">

-        <type xmi:type="domain:TypeGenPackages" xmi:id="_DU9jz0LpEei0i9bcSdIGKw"/>

+          description="EMF Pattern" name="usedGenPackages" invocationContracts="#_jh1z4iSWEemxeP6B0lLOpA #_jjCGsCSWEemxeP6B0lLOpA #_jkYKgCSWEemxeP6B0lLOpA #_jlkdUCSWEemxeP6B0lLOpA">

+        <type xmi:type="domain:TypeGenPackages" xmi:id="_jh1z4SSWEemxeP6B0lLOpA"/>

       </contracts>

       <contracts xmi:type="fcore:FactoryComponentContract" xmi:id="_TK4DEFLNEd-ZSLMRjxSbVQ"

-          description="EMF Pattern" name="mergeRulesURI" invocationContracts="#_DU9j00LpEei0i9bcSdIGKw #_DU9j2kLpEei0i9bcSdIGKw #_DU9j4ULpEei0i9bcSdIGKw #_DU9j6ELpEei0i9bcSdIGKw">

-        <type xmi:type="types:TypeURI" xmi:id="_DU9j0kLpEei0i9bcSdIGKw"/>

+          description="EMF Pattern" name="mergeRulesURI" invocationContracts="#_jh_k4iSWEemxeP6B0lLOpA #_jjL3sCSWEemxeP6B0lLOpA #_jkh7gCSWEemxeP6B0lLOpA #_jluOUCSWEemxeP6B0lLOpA">

+        <type xmi:type="types:TypeURI" xmi:id="_jh_k4SSWEemxeP6B0lLOpA"/>

       </contracts>

     </contractContainer>

     <orchestration xmi:type="fprod:ProductionPlan" xmi:id="_Prz3VDG0Ed-kc8dEZsdm2w">

-      <invocations xmi:id="_DU9jwkLpEei0i9bcSdIGKw" invokedActivity="#_Pcm9sDG0Ed-kc8dEZsdm2w">

-        <invocationContractContainer xmi:id="_DU9jw0LpEei0i9bcSdIGKw">

-          <invocationContracts xmi:id="_DU9jx0LpEei0i9bcSdIGKw" factoryComponentContract="#_Prz3UjG0Ed-kc8dEZsdm2w"

+      <invocations xmi:id="_jg9DEiSWEemxeP6B0lLOpA" invokedActivity="#_Pcm9sDG0Ed-kc8dEZsdm2w">

+        <invocationContractContainer xmi:id="_jhGNACSWEemxeP6B0lLOpA">

+          <invocationContracts xmi:id="_jhGNBCSWEemxeP6B0lLOpA" factoryComponentContract="#_Prz3UjG0Ed-kc8dEZsdm2w"

               invokedContract="#_Prg8ZTG0Ed-kc8dEZsdm2w"/>

-          <invocationContracts xmi:id="_DU9jykLpEei0i9bcSdIGKw" factoryComponentContract="#_yqrHUFIIEd-eGOdO3WtsxA"

+          <invocationContracts xmi:id="_jhZvAiSWEemxeP6B0lLOpA" factoryComponentContract="#_yqrHUFIIEd-eGOdO3WtsxA"

               invokedContract="#_WRxYEFIIEd-eGOdO3WtsxA"/>

-          <invocationContracts xmi:id="_DU9jzULpEei0i9bcSdIGKw" factoryComponentContract="#_JBH151eTEd-ExtSXfVloug"

+          <invocationContracts xmi:id="_jhi48iSWEemxeP6B0lLOpA" factoryComponentContract="#_JBH151eTEd-ExtSXfVloug"

               invokedContract="#_OVsagFHVEd-dr9AWwNwIMQ"/>

-          <invocationContracts xmi:id="_DU9j0ELpEei0i9bcSdIGKw" factoryComponentContract="#_k-TskPI7Ed-Pp8S8RvVOuQ"

+          <invocationContracts xmi:id="_jh1z4iSWEemxeP6B0lLOpA" factoryComponentContract="#_k-TskPI7Ed-Pp8S8RvVOuQ"

               invokedContract="#_RcQCMPI7Ed-Pp8S8RvVOuQ"/>

-          <invocationContracts xmi:id="_DU9j00LpEei0i9bcSdIGKw" factoryComponentContract="#_TK4DEFLNEd-ZSLMRjxSbVQ"

+          <invocationContracts xmi:id="_jh_k4iSWEemxeP6B0lLOpA" factoryComponentContract="#_TK4DEFLNEd-ZSLMRjxSbVQ"

               invokedContract="#_sluXsVLLEd-ZSLMRjxSbVQ"/>

         </invocationContractContainer>

       </invocations>

-      <invocations xmi:id="_DU9j1ELpEei0i9bcSdIGKw" invokedActivity="#_PiIW4DG0Ed-kc8dEZsdm2w">

-        <invocationContractContainer xmi:id="_DU9j1ULpEei0i9bcSdIGKw">

-          <invocationContracts xmi:id="_DU9j1kLpEei0i9bcSdIGKw" factoryComponentContract="#_Prz3UjG0Ed-kc8dEZsdm2w"

+      <invocations xmi:id="_jiSf0CSWEemxeP6B0lLOpA" invokedActivity="#_PiIW4DG0Ed-kc8dEZsdm2w">

+        <invocationContractContainer xmi:id="_jicQ0CSWEemxeP6B0lLOpA">

+          <invocationContracts xmi:id="_jicQ0SSWEemxeP6B0lLOpA" factoryComponentContract="#_Prz3UjG0Ed-kc8dEZsdm2w"

               invokedContract="#_Prg8cDG0Ed-kc8dEZsdm2w"/>

-          <invocationContracts xmi:id="_DU9j10LpEei0i9bcSdIGKw" factoryComponentContract="#_yqrHUFIIEd-eGOdO3WtsxA"

+          <invocationContracts xmi:id="_jimB0CSWEemxeP6B0lLOpA" factoryComponentContract="#_yqrHUFIIEd-eGOdO3WtsxA"

               invokedContract="#_jzYi8FIIEd-eGOdO3WtsxA"/>

-          <invocationContracts xmi:id="_DU9j2ELpEei0i9bcSdIGKw" factoryComponentContract="#_JBH151eTEd-ExtSXfVloug"

+          <invocationContracts xmi:id="_ji48wCSWEemxeP6B0lLOpA" factoryComponentContract="#_JBH151eTEd-ExtSXfVloug"

               invokedContract="#_UCnhEFHVEd-dr9AWwNwIMQ"/>

-          <invocationContracts xmi:id="_DU9j2ULpEei0i9bcSdIGKw" factoryComponentContract="#_k-TskPI7Ed-Pp8S8RvVOuQ"

+          <invocationContracts xmi:id="_jjCGsCSWEemxeP6B0lLOpA" factoryComponentContract="#_k-TskPI7Ed-Pp8S8RvVOuQ"

               invokedContract="#_dgkvsPI7Ed-Pp8S8RvVOuQ"/>

-          <invocationContracts xmi:id="_DU9j2kLpEei0i9bcSdIGKw" factoryComponentContract="#_TK4DEFLNEd-ZSLMRjxSbVQ"

+          <invocationContracts xmi:id="_jjL3sCSWEemxeP6B0lLOpA" factoryComponentContract="#_TK4DEFLNEd-ZSLMRjxSbVQ"

               invokedContract="#_9wHxsFLMEd-ZSLMRjxSbVQ"/>

         </invocationContractContainer>

       </invocations>

-      <invocations xmi:id="_DU9j20LpEei0i9bcSdIGKw" invokedActivity="#_PkqGcDG0Ed-kc8dEZsdm2w">

-        <invocationContractContainer xmi:id="_DU9j3ELpEei0i9bcSdIGKw">

-          <invocationContracts xmi:id="_DU9j3ULpEei0i9bcSdIGKw" factoryComponentContract="#_Prz3UjG0Ed-kc8dEZsdm2w"

+      <invocations xmi:id="_jjVosCSWEemxeP6B0lLOpA" invokedActivity="#_PkqGcDG0Ed-kc8dEZsdm2w">

+        <invocationContractContainer xmi:id="_jjojoCSWEemxeP6B0lLOpA">

+          <invocationContracts xmi:id="_jjojoSSWEemxeP6B0lLOpA" factoryComponentContract="#_Prz3UjG0Ed-kc8dEZsdm2w"

               invokedContract="#_Prg8ezG0Ed-kc8dEZsdm2w"/>

-          <invocationContracts xmi:id="_DU9j3kLpEei0i9bcSdIGKw" factoryComponentContract="#_yqrHUFIIEd-eGOdO3WtsxA"

+          <invocationContracts xmi:id="_jjyUoCSWEemxeP6B0lLOpA" factoryComponentContract="#_yqrHUFIIEd-eGOdO3WtsxA"

               invokedContract="#_pCqEMFIIEd-eGOdO3WtsxA"/>

-          <invocationContracts xmi:id="_DU9j30LpEei0i9bcSdIGKw" factoryComponentContract="#_JBH151eTEd-ExtSXfVloug"

+          <invocationContracts xmi:id="_jj7ekCSWEemxeP6B0lLOpA" factoryComponentContract="#_JBH151eTEd-ExtSXfVloug"

               invokedContract="#_Y3EukFHVEd-dr9AWwNwIMQ"/>

-          <invocationContracts xmi:id="_DU9j4ELpEei0i9bcSdIGKw" factoryComponentContract="#_k-TskPI7Ed-Pp8S8RvVOuQ"

+          <invocationContracts xmi:id="_jkYKgCSWEemxeP6B0lLOpA" factoryComponentContract="#_k-TskPI7Ed-Pp8S8RvVOuQ"

               invokedContract="#_NcZ6I_MqEd-6tr0C8ZV8Ew"/>

-          <invocationContracts xmi:id="_DU9j4ULpEei0i9bcSdIGKw" factoryComponentContract="#_TK4DEFLNEd-ZSLMRjxSbVQ"

+          <invocationContracts xmi:id="_jkh7gCSWEemxeP6B0lLOpA" factoryComponentContract="#_TK4DEFLNEd-ZSLMRjxSbVQ"

               invokedContract="#_FqdyEFLNEd-ZSLMRjxSbVQ"/>

         </invocationContractContainer>

       </invocations>

-      <invocations xmi:id="_DU9j4kLpEei0i9bcSdIGKw" invokedActivity="#_PoF08DG0Ed-kc8dEZsdm2w">

-        <invocationContractContainer xmi:id="_DU9j40LpEei0i9bcSdIGKw">

-          <invocationContracts xmi:id="_DU9j5ELpEei0i9bcSdIGKw" factoryComponentContract="#_Prz3UjG0Ed-kc8dEZsdm2w"

+      <invocations xmi:id="_jk02cCSWEemxeP6B0lLOpA" invokedActivity="#_PoF08DG0Ed-kc8dEZsdm2w">

+        <invocationContractContainer xmi:id="_jk-ncCSWEemxeP6B0lLOpA">

+          <invocationContracts xmi:id="_jk-ncSSWEemxeP6B0lLOpA" factoryComponentContract="#_Prz3UjG0Ed-kc8dEZsdm2w"

               invokedContract="#_Prg8hjG0Ed-kc8dEZsdm2w"/>

-          <invocationContracts xmi:id="_DU9j5ULpEei0i9bcSdIGKw" factoryComponentContract="#_yqrHUFIIEd-eGOdO3WtsxA"

+          <invocationContracts xmi:id="_jlHxYCSWEemxeP6B0lLOpA" factoryComponentContract="#_yqrHUFIIEd-eGOdO3WtsxA"

               invokedContract="#_tvg04FIIEd-eGOdO3WtsxA"/>

-          <invocationContracts xmi:id="_DU9j5kLpEei0i9bcSdIGKw" factoryComponentContract="#_JBH151eTEd-ExtSXfVloug"

+          <invocationContracts xmi:id="_jlasUCSWEemxeP6B0lLOpA" factoryComponentContract="#_JBH151eTEd-ExtSXfVloug"

               invokedContract="#_eYFgEFHVEd-dr9AWwNwIMQ"/>

-          <invocationContracts xmi:id="_DU9j50LpEei0i9bcSdIGKw" factoryComponentContract="#_k-TskPI7Ed-Pp8S8RvVOuQ"

+          <invocationContracts xmi:id="_jlkdUCSWEemxeP6B0lLOpA" factoryComponentContract="#_k-TskPI7Ed-Pp8S8RvVOuQ"

               invokedContract="#_NcjD0vMqEd-6tr0C8ZV8Ew"/>

-          <invocationContracts xmi:id="_DU9j6ELpEei0i9bcSdIGKw" factoryComponentContract="#_TK4DEFLNEd-ZSLMRjxSbVQ"

+          <invocationContracts xmi:id="_jluOUCSWEemxeP6B0lLOpA" factoryComponentContract="#_TK4DEFLNEd-ZSLMRjxSbVQ"

               invokedContract="#_LnCeMFLNEd-ZSLMRjxSbVQ"/>

         </invocationContractContainer>

       </invocations>

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
index 73af4f5..e2734ce 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/BuildProperties.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -33,12 +33,14 @@
 	protected final String TEXT_4 = NL + "               icons/,\\";

 	protected final String TEXT_5 = NL + "               META-INF/,\\";

 	protected final String TEXT_6 = NL + "               plugin.xml,\\";

-	protected final String TEXT_7 = NL + "               plugin.properties" + NL + "jars.compile.order = ";

-	protected final String TEXT_8 = NL + "source.";

-	protected final String TEXT_9 = " = ";

-	protected final String TEXT_10 = NL + "output.";

-	protected final String TEXT_11 = " = bin/" + NL;

-	protected final String TEXT_12 = NL;

+	protected final String TEXT_7 = NL + "               ";

+	protected final String TEXT_8 = ".properties";

+	protected final String TEXT_9 = NL + "jars.compile.order = ";

+	protected final String TEXT_10 = NL + "source.";

+	protected final String TEXT_11 = " = ";

+	protected final String TEXT_12 = NL + "output.";

+	protected final String TEXT_13 = " = bin/" + NL;

+	protected final String TEXT_14 = NL;

 

 	public BuildProperties() {

 		//Here is the constructor

@@ -74,8 +76,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_12);

-		stringBuffer.append(TEXT_12);

+		stringBuffer.append(TEXT_14);

+		stringBuffer.append(TEXT_14);

 		return stringBuffer.toString();

 	}

 

@@ -149,9 +151,9 @@
 		/**

 		 * Copyright (c) 2002-2010 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

@@ -188,7 +190,17 @@
 		if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {

 			stringBuffer.append(TEXT_6);

 		}

-		stringBuffer.append(TEXT_7);

+		String editBundleLocalization = genModel.getEditBundleLocalization();

+		int index = editBundleLocalization.indexOf("/");

+		if (index == -1) {

+			stringBuffer.append(TEXT_7);

+			stringBuffer.append(editBundleLocalization);

+			stringBuffer.append(TEXT_8);

+		} else {

+			stringBuffer.append(TEXT_7);

+			stringBuffer.append(editBundleLocalization.substring(0, index + 1));

+		}

+		stringBuffer.append(TEXT_9);

 		stringBuffer.append(pluginClassesLocation);

 		boolean first = true;

 		for (Iterator<String> i = sourceFolders.iterator(); i.hasNext();) {

@@ -197,18 +209,18 @@
 				sourceFolder += ",\\";

 			}

 			if (first) {

-				stringBuffer.append(TEXT_8);

+				stringBuffer.append(TEXT_10);

 				stringBuffer.append(pluginClassesLocation);

-				stringBuffer.append(TEXT_9);

+				stringBuffer.append(TEXT_11);

 				stringBuffer.append(sourceFolder);

 				first = false;

 			} else {

 				stringBuffer.append(sourceFolder);

 			}

 		}

-		stringBuffer.append(TEXT_10);

+		stringBuffer.append(TEXT_12);

 		stringBuffer.append(pluginClassesLocation);

-		stringBuffer.append(TEXT_11);

+		stringBuffer.append(TEXT_13);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/CreateChildIconsForGenClass.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/CreateChildIconsForGenClass.java
index 7fb70b1..49dc7a9 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/CreateChildIconsForGenClass.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/CreateChildIconsForGenClass.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/CreateChildIconsForGenPackage.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/CreateChildIconsForGenPackage.java
index d1b8de0..a91db21 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/CreateChildIconsForGenPackage.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/CreateChildIconsForGenPackage.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
index a09ee8c..333772d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Images.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -150,9 +150,9 @@
 		/**

 		 * Copyright (c) 2010 Ed Merks and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   Ed Merks - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemIcon.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemIcon.java
index 9171921..f053ae2 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemIcon.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemIcon.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
index 39265a2..854f7bc 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProvider.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -297,9 +297,9 @@
 		/**

 		 * Copyright (c) 2002-2007 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
index fbef4d7..db135a7 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ItemProviderAdapterFactory.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -132,127 +132,133 @@
 	protected final String TEXT_70 = "Adapter();" + NL + "\t}" + NL;

 	protected final String TEXT_71 = NL + "\t/**" + NL

 			+ "\t * This returns the root adapter factory that contains this factory." + NL

-			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

-			+ NL + "\tpublic ComposeableAdapterFactory getRootAdapterFactory()" + NL + "\t{" + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

+			+ "\t */";

+	protected final String TEXT_72 = NL + "\tpublic ComposeableAdapterFactory getRootAdapterFactory()" + NL + "\t{" + NL

 			+ "\t\treturn parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();" + NL

 			+ "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This sets the composed adapter factory that contains this factory." + NL

-			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

-			+ NL + "\tpublic void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)" + NL + "\t{"

-			+ NL + "\t\tthis.parentAdapterFactory = parentAdapterFactory;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_72 = NL + "\tpublic boolean isFactoryForType(Object type)" + NL + "\t{" + NL

+	protected final String TEXT_73 = NL

+			+ "\tpublic void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)" + NL + "\t{" + NL

+			+ "\t\tthis.parentAdapterFactory = parentAdapterFactory;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

+			+ "\t */";

+	protected final String TEXT_74 = NL + "\tpublic boolean isFactoryForType(Object type)" + NL + "\t{" + NL

 			+ "\t\treturn supportedTypes.contains(type) || super.isFactoryForType(type);" + NL + "\t}" + NL + "" + NL

 			+ "\t/**" + NL + "\t * This implementation substitutes the factory itself as the key for the adapter." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_73 = NL + "\tpublic Adapter adapt(Notifier notifier, Object type)" + NL + "\t{" + NL

+	protected final String TEXT_75 = NL + "\tpublic Adapter adapt(Notifier notifier, Object type)" + NL + "\t{" + NL

 			+ "\t\treturn super.adapt(notifier, this);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_74 = NL + "\tpublic Object adapt(Object object, Object type)" + NL + "\t{" + NL

+	protected final String TEXT_76 = NL + "\tpublic Object adapt(Object object, Object type)" + NL + "\t{" + NL

 			+ "\t\tif (isFactoryForType(type))" + NL + "\t\t{" + NL

 			+ "\t\t\tObject adapter = super.adapt(object, type);" + NL + "\t\t\tif (!(type instanceof Class";

-	protected final String TEXT_75 = "<?>";

-	protected final String TEXT_76 = ") || ";

-	protected final String TEXT_77 = ".isInstance((Class";

-	protected final String TEXT_78 = ")type, adapter)";

-	protected final String TEXT_79 = "(((Class";

-	protected final String TEXT_80 = ")type).isInstance(adapter))";

-	protected final String TEXT_81 = ")" + NL + "\t\t\t{" + NL + "\t\t\t\treturn adapter;" + NL + "\t\t\t}" + NL

+	protected final String TEXT_77 = "<?>";

+	protected final String TEXT_78 = ") || ";

+	protected final String TEXT_79 = ".isInstance((Class";

+	protected final String TEXT_80 = ")type, adapter)";

+	protected final String TEXT_81 = "(((Class";

+	protected final String TEXT_82 = ")type).isInstance(adapter))";

+	protected final String TEXT_83 = ")" + NL + "\t\t\t{" + NL + "\t\t\t\treturn adapter;" + NL + "\t\t\t}" + NL

 			+ "\t\t}" + NL + "" + NL + "\t\treturn null;" + NL + "\t}" + NL;

-	protected final String TEXT_82 = NL + "\t/**" + NL

+	protected final String TEXT_84 = NL + "\t/**" + NL

 			+ "\t * Associates an adapter with a notifier via the base implementation, then records it to ensure it will be disposed."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_83 = NL + "\tprotected void associate(Adapter adapter, Notifier target)" + NL + "\t{"

+	protected final String TEXT_85 = NL + "\tprotected void associate(Adapter adapter, Notifier target)" + NL + "\t{"

 			+ NL + "\t\tsuper.associate(adapter, target);" + NL + "\t\tif (adapter != null)" + NL + "\t\t{" + NL

 			+ "\t\t\tdisposable.add(adapter);" + NL + "\t\t}" + NL + "\t}" + NL;

-	protected final String TEXT_84 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_86 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";

-	protected final String TEXT_85 = " getChildCreationExtenders()" + NL + "\t{" + NL

+	protected final String TEXT_87 = " getChildCreationExtenders()" + NL + "\t{" + NL

 			+ "\t\treturn childCreationExtenderManager.getChildCreationExtenders();" + 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_86 = " getNewChildDescriptors(Object object, ";

-	protected final String TEXT_87 = " editingDomain)" + NL + "\t{" + NL

+	protected final String TEXT_88 = " getNewChildDescriptors(Object object, ";

+	protected final String TEXT_89 = " editingDomain)" + NL + "\t{" + NL

 			+ "\t\treturn childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);" + 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_88 = " getResourceLocator()" + NL + "\t{" + NL

+	protected final String TEXT_90 = " getResourceLocator()" + NL + "\t{" + NL

 			+ "\t\treturn childCreationExtenderManager;" + NL + "\t}" + NL;

-	protected final String TEXT_89 = NL + "\t/**" + NL + "\t * This adds a listener." + NL

-			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

-			+ NL + "\tpublic void addListener(INotifyChangedListener notifyChangedListener)" + NL + "\t{" + NL

-			+ "\t\tchangeNotifier.addListener(notifyChangedListener);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

-			+ "\t * This removes a listener." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"

-			+ NL + "\t * @generated" + NL + "\t */" + NL

-			+ "\tpublic void removeListener(INotifyChangedListener notifyChangedListener)" + NL + "\t{" + NL

-			+ "\t\tchangeNotifier.removeListener(notifyChangedListener);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

-			+ "\t * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}." + NL

-			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

-			+ NL + "\tpublic void fireNotifyChanged(Notification notification)" + NL + "\t{" + NL

+	protected final String TEXT_91 = NL + "\t/**" + NL + "\t * This adds a listener." + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

+			+ "\t */";

+	protected final String TEXT_92 = NL + "\tpublic void addListener(INotifyChangedListener notifyChangedListener)" + NL

+			+ "\t{" + NL + "\t\tchangeNotifier.addListener(notifyChangedListener);" + NL + "\t}" + NL + "" + NL

+			+ "\t/**" + NL + "\t * This removes a listener." + NL + "\t * <!-- begin-user-doc -->" + NL

+			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

+	protected final String TEXT_93 = NL + "\tpublic void removeListener(INotifyChangedListener notifyChangedListener)"

+			+ NL + "\t{" + NL + "\t\tchangeNotifier.removeListener(notifyChangedListener);" + NL + "\t}" + NL + "" + NL

+			+ "\t/**" + NL + "\t * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}." + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

+			+ "\t */";

+	protected final String TEXT_94 = NL + "\tpublic void fireNotifyChanged(Notification notification)" + NL + "\t{" + NL

 			+ "\t\tchangeNotifier.fireNotifyChanged(notification);" + NL + "" + NL

 			+ "\t\tif (parentAdapterFactory != null)" + NL + "\t\t{" + NL

 			+ "\t\t\tparentAdapterFactory.fireNotifyChanged(notification);" + NL + "\t\t}" + NL + "\t}" + NL;

-	protected final String TEXT_90 = NL + "\t/**" + NL

+	protected final String TEXT_95 = NL + "\t/**" + NL

 			+ "\t * This disposes all of the item providers created by this factory. " + NL

-			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

-			+ NL + "\tpublic void dispose()" + NL + "\t{";

-	protected final String TEXT_91 = NL + "\t\tdisposable.dispose();";

-	protected final String TEXT_92 = NL + "\t\tif (";

-	protected final String TEXT_93 = "ItemProvider != null) ";

-	protected final String TEXT_94 = "ItemProvider.dispose();";

-	protected final String TEXT_95 = NL + "\t/**" + NL + "\t * A child creation extender for the {@link ";

-	protected final String TEXT_96 = "}." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL

-			+ "\t * @generated" + NL + "\t */" + NL + "\tpublic static class ";

-	protected final String TEXT_97 = " implements ";

-	protected final String TEXT_98 = NL + "\t{" + NL + "\t\t/**" + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

+			+ "\t */";

+	protected final String TEXT_96 = NL + "\tpublic void dispose()" + NL + "\t{";

+	protected final String TEXT_97 = NL + "\t\tdisposable.dispose();";

+	protected final String TEXT_98 = NL + "\t\tif (";

+	protected final String TEXT_99 = "ItemProvider != null) ";

+	protected final String TEXT_100 = "ItemProvider.dispose();";

+	protected final String TEXT_101 = NL + "\t/**" + NL + "\t * A child creation extender for the {@link ";

+	protected final String TEXT_102 = "}." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"

+			+ NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static class ";

+	protected final String TEXT_103 = " implements ";

+	protected final String TEXT_104 = NL + "\t{" + NL + "\t\t/**" + NL

 			+ "\t\t * The switch for creating child descriptors specific to each extended class." + NL

 			+ "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL

 			+ "\t\t */" + NL + "\t\tprotected static class CreationSwitch extends ";

-	protected final String TEXT_99 = NL + "\t\t{" + NL + "\t\t\t/**" + NL

+	protected final String TEXT_105 = NL + "\t\t{" + NL + "\t\t\t/**" + NL

 			+ "\t\t\t * The child descriptors being populated." + NL + "\t\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t\t * <!-- end-user-doc -->" + NL + "\t\t\t * @generated" + NL + "\t\t\t */" + NL

 			+ "\t\t\tprotected ";

-	protected final String TEXT_100 = " newChildDescriptors;" + NL + "" + NL + "\t\t\t/**" + NL

+	protected final String TEXT_106 = " newChildDescriptors;" + NL + "" + NL + "\t\t\t/**" + NL

 			+ "\t\t\t * The domain in which to create the children." + NL + "\t\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t\t * <!-- end-user-doc -->" + NL + "\t\t\t * @generated" + NL + "\t\t\t */" + NL

 			+ "\t\t\tprotected ";

-	protected final String TEXT_101 = " editingDomain;" + NL + "" + NL + "\t\t\t/**" + NL

+	protected final String TEXT_107 = " editingDomain;" + NL + "" + NL + "\t\t\t/**" + NL

 			+ "\t\t\t * Creates the a switch for populating child descriptors in the given domain." + NL

 			+ "\t\t\t * <!-- begin-user-doc -->" + NL + "\t\t\t * <!-- end-user-doc -->" + NL + "\t\t\t * @generated"

 			+ NL + "\t\t\t */" + NL + "\t\t\tCreationSwitch(";

-	protected final String TEXT_102 = " newChildDescriptors, ";

-	protected final String TEXT_103 = " editingDomain) " + NL + "\t\t\t{" + NL

+	protected final String TEXT_108 = " newChildDescriptors, ";

+	protected final String TEXT_109 = " editingDomain) " + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tthis.newChildDescriptors = newChildDescriptors;" + NL

 			+ "\t\t\t\tthis.editingDomain = editingDomain;" + NL + "\t\t\t}";

-	protected final String TEXT_104 = NL + "\t\t\t/**" + NL + "\t\t\t * <!-- begin-user-doc -->" + NL

-			+ "\t\t\t * <!-- end-user-doc -->" + NL + "\t\t\t * @generated" + NL + "\t\t\t */";

-	protected final String TEXT_105 = NL + "\t\t\t@Override";

-	protected final String TEXT_106 = NL + "\t\t\tpublic ";

-	protected final String TEXT_107 = "Object case";

-	protected final String TEXT_108 = " object)" + NL + "\t\t\t{";

-	protected final String TEXT_109 = NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + " ";

 	protected final String TEXT_110 = NL + "\t\t\t/**" + NL + "\t\t\t * <!-- begin-user-doc -->" + NL

+			+ "\t\t\t * <!-- end-user-doc -->" + NL + "\t\t\t * @generated" + NL + "\t\t\t */";

+	protected final String TEXT_111 = NL + "\t\t\t@Override";

+	protected final String TEXT_112 = NL + "\t\t\tpublic ";

+	protected final String TEXT_113 = "Object case";

+	protected final String TEXT_114 = " object)" + NL + "\t\t\t{";

+	protected final String TEXT_115 = NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + " ";

+	protected final String TEXT_116 = NL + "\t\t\t/**" + NL + "\t\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t\t * <!-- end-user-doc -->" + NL + "\t\t\t * @generated" + NL + "\t\t\t */" + NL

 			+ "\t\t\tprotected ";

-	protected final String TEXT_111 = " createChildParameter(Object feature, Object child)" + NL + "\t\t\t{" + NL

+	protected final String TEXT_117 = " createChildParameter(Object feature, Object child)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\treturn new ";

-	protected final String TEXT_112 = "(null, feature, child);" + NL + "\t\t\t}" + NL + "" + NL + "\t\t}" + NL + "" + NL

+	protected final String TEXT_118 = "(null, feature, child);" + NL + "\t\t\t}" + NL + "" + NL + "\t\t}" + NL + "" + NL

 			+ "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL

 			+ "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic ";

-	protected final String TEXT_113 = " editingDomain)" + NL + "\t\t{" + NL + "\t\t\t";

-	protected final String TEXT_114 = " result = new ";

-	protected final String TEXT_115 = "();" + NL + "\t\t\tnew CreationSwitch(result, editingDomain).doSwitch((";

-	protected final String TEXT_116 = ")object);" + NL + "\t\t\treturn result;" + NL + "\t\t}" + NL + "" + NL

+	protected final String TEXT_119 = " editingDomain)" + NL + "\t\t{" + NL + "\t\t\t";

+	protected final String TEXT_120 = " result = new ";

+	protected final String TEXT_121 = "();" + NL + "\t\t\tnew CreationSwitch(result, editingDomain).doSwitch((";

+	protected final String TEXT_122 = ")object);" + NL + "\t\t\treturn result;" + NL + "\t\t}" + NL + "" + NL

 			+ "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL

 			+ "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic ";

-	protected final String TEXT_117 = " getResourceLocator()" + NL + "\t\t{" + NL + "\t\t\treturn ";

-	protected final String TEXT_118 = ".INSTANCE;" + NL + "\t\t}" + NL + "\t}" + NL;

-	protected final String TEXT_119 = NL + "}";

-	protected final String TEXT_120 = NL;

+	protected final String TEXT_123 = " getResourceLocator()" + NL + "\t\t{" + NL + "\t\t\treturn ";

+	protected final String TEXT_124 = ".INSTANCE;" + NL + "\t\t}" + NL + "\t}" + NL;

+	protected final String TEXT_125 = NL + "}";

+	protected final String TEXT_126 = NL;

 

 	public ItemProviderAdapterFactory() {

 		//Here is the constructor

@@ -288,8 +294,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_120);

-		stringBuffer.append(TEXT_120);

+		stringBuffer.append(TEXT_126);

+		stringBuffer.append(TEXT_126);

 		return stringBuffer.toString();

 	}

 

@@ -361,9 +367,9 @@
 		/**

 		 * Copyright (c) 2002-2010 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

@@ -593,11 +599,11 @@
 			stringBuffer.append(TEXT_70);

 		}

 		stringBuffer.append(TEXT_71);

-		if (genModel.useClassOverrideAnnotation()) {

+		if (genModel.useInterfaceOverrideAnnotation()) {

 			stringBuffer.append(TEXT_54);

 		}

 		stringBuffer.append(TEXT_72);

-		if (genModel.useClassOverrideAnnotation()) {

+		if (genModel.useInterfaceOverrideAnnotation()) {

 			stringBuffer.append(TEXT_54);

 		}

 		stringBuffer.append(TEXT_73);

@@ -605,59 +611,83 @@
 			stringBuffer.append(TEXT_54);

 		}

 		stringBuffer.append(TEXT_74);

-		if (genModel.useGenerics()) {

-			stringBuffer.append(TEXT_75);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_54);

+		}

+		stringBuffer.append(TEXT_75);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_54);

 		}

 		stringBuffer.append(TEXT_76);

+		if (genModel.useGenerics()) {

+			stringBuffer.append(TEXT_77);

+		}

+		stringBuffer.append(TEXT_78);

 		if (genModel.getRuntimePlatform() == GenRuntimePlatform.GWT) {

 			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect"));

-			stringBuffer.append(TEXT_77);

-			if (genModel.useGenerics()) {

-				stringBuffer.append(TEXT_75);

-			}

-			stringBuffer.append(TEXT_78);

-		} else {

 			stringBuffer.append(TEXT_79);

 			if (genModel.useGenerics()) {

-				stringBuffer.append(TEXT_75);

+				stringBuffer.append(TEXT_77);

 			}

 			stringBuffer.append(TEXT_80);

-		}

-		stringBuffer.append(TEXT_81);

-		if (genPackage.isDisposableProviderFactory() && genPackage.hasStatefulProvider()) {

+		} else {

+			stringBuffer.append(TEXT_81);

+			if (genModel.useGenerics()) {

+				stringBuffer.append(TEXT_77);

+			}

 			stringBuffer.append(TEXT_82);

+		}

+		stringBuffer.append(TEXT_83);

+		if (genPackage.isDisposableProviderFactory() && genPackage.hasStatefulProvider()) {

+			stringBuffer.append(TEXT_84);

 			if (genModel.useClassOverrideAnnotation()) {

 				stringBuffer.append(TEXT_54);

 			}

-			stringBuffer.append(TEXT_83);

+			stringBuffer.append(TEXT_85);

 		}

 		if (genPackage.isExtensibleProviderFactory()) {

-			stringBuffer.append(TEXT_84);

+			stringBuffer.append(TEXT_86);

 			stringBuffer.append(genModel.getImportedName(

 					useGenerics ? "java.util.List<org.eclipse.emf.edit.provider.IChildCreationExtender>"

 							: "java.util.List"));

-			stringBuffer.append(TEXT_85);

+			stringBuffer.append(TEXT_87);

 			stringBuffer

 					.append(genModel.getImportedName(useGenerics ? "java.util.Collection<?>" : "java.util.Collection"));

-			stringBuffer.append(TEXT_86);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain"));

-			stringBuffer.append(TEXT_87);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.ResourceLocator"));

 			stringBuffer.append(TEXT_88);

-		}

-		stringBuffer.append(TEXT_89);

-		if (genPackage.isDisposableProviderFactory()) {

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain"));

+			stringBuffer.append(TEXT_89);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.ResourceLocator"));

 			stringBuffer.append(TEXT_90);

+		}

+		stringBuffer.append(TEXT_91);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_54);

+		}

+		stringBuffer.append(TEXT_92);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_54);

+		}

+		stringBuffer.append(TEXT_93);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_54);

+		}

+		stringBuffer.append(TEXT_94);

+		if (genPackage.isDisposableProviderFactory()) {

+			stringBuffer.append(TEXT_95);

+			if (genModel.useInterfaceOverrideAnnotation()) {

+				stringBuffer.append(TEXT_54);

+			}

+			stringBuffer.append(TEXT_96);

 			if (genPackage.hasStatefulProvider()) {

-				stringBuffer.append(TEXT_91);

+				stringBuffer.append(TEXT_97);

 			} else {

 				for (GenClass genClass : genPackage.getGenClasses()) {

 					if (!genClass.isAbstract() && genClass.isProviderSingleton()) {

-						stringBuffer.append(TEXT_92);

+						stringBuffer.append(TEXT_98);

 						stringBuffer.append(genClass.getUncapName());

-						stringBuffer.append(TEXT_93);

+						stringBuffer.append(TEXT_99);

 						stringBuffer.append(genClass.getUncapName());

-						stringBuffer.append(TEXT_94);

+						stringBuffer.append(TEXT_100);

 					}

 				}

 			}

@@ -666,41 +696,41 @@
 		if (genPackage.isChildCreationExtenders()) {

 			for (Map.Entry<GenPackage, Map<GenClass, List<GenClass.ChildCreationData>>> packageEntry : genPackage

 					.getExtendedChildCreationData().entrySet()) {

-				stringBuffer.append(TEXT_95);

+				stringBuffer.append(TEXT_101);

 				stringBuffer.append(packageEntry.getKey().getImportedPackageInterfaceName());

-				stringBuffer.append(TEXT_96);

+				stringBuffer.append(TEXT_102);

 				stringBuffer.append(genPackage.getChildCreationExtenderName(packageEntry.getKey()));

-				stringBuffer.append(TEXT_97);

+				stringBuffer.append(TEXT_103);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.provider.IChildCreationExtender"));

-				stringBuffer.append(TEXT_98);

+				stringBuffer.append(TEXT_104);

 				stringBuffer.append(genModel.getImportedName(packageEntry.getKey().getQualifiedSwitchClassName()));

 				stringBuffer.append(useGenerics ? "<Object>" : "");

-				stringBuffer.append(TEXT_99);

+				stringBuffer.append(TEXT_105);

 				stringBuffer

 						.append(genModel.getImportedName(useGenerics ? "java.util.List<Object>" : "java.util.List"));

-				stringBuffer.append(TEXT_100);

+				stringBuffer.append(TEXT_106);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain"));

-				stringBuffer.append(TEXT_101);

+				stringBuffer.append(TEXT_107);

 				stringBuffer

 						.append(genModel.getImportedName(useGenerics ? "java.util.List<Object>" : "java.util.List"));

-				stringBuffer.append(TEXT_102);

+				stringBuffer.append(TEXT_108);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain"));

-				stringBuffer.append(TEXT_103);

+				stringBuffer.append(TEXT_109);

 				for (Map.Entry<GenClass, List<GenClass.ChildCreationData>> classEntry : packageEntry.getValue()

 						.entrySet()) {

 					GenClass genClass = classEntry.getKey();

-					stringBuffer.append(TEXT_104);

+					stringBuffer.append(TEXT_110);

 					if (genModel.useClassOverrideAnnotation()) {

-						stringBuffer.append(TEXT_105);

+						stringBuffer.append(TEXT_111);

 					}

-					stringBuffer.append(TEXT_106);

+					stringBuffer.append(TEXT_112);

 					stringBuffer.append(genClass.getTypeParameters());

-					stringBuffer.append(TEXT_107);

+					stringBuffer.append(TEXT_113);

 					stringBuffer.append(genPackage.getClassUniqueName(genClass));

 					stringBuffer.append(TEXT_23);

 					stringBuffer.append(genClass.getImportedInterfaceName());

 					stringBuffer.append(genClass.getInterfaceTypeArguments());

-					stringBuffer.append(TEXT_108);

+					stringBuffer.append(TEXT_114);

 					for (GenClass.ChildCreationData childCreationData : classEntry.getValue()) {

 						GenFeature createFeature = childCreationData.createFeature;

 						GenFeature delegatedFeature = childCreationData.delegatedFeature;

@@ -818,30 +848,30 @@
 						}

 						stringBuffer.append(TEXT_17);

 					}

-					stringBuffer.append(TEXT_109);

+					stringBuffer.append(TEXT_115);

 				}

-				stringBuffer.append(TEXT_110);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.command.CommandParameter"));

-				stringBuffer.append(TEXT_111);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.command.CommandParameter"));

-				stringBuffer.append(TEXT_112);

-				stringBuffer.append(_Collection);

-				stringBuffer.append(TEXT_86);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain"));

-				stringBuffer.append(TEXT_113);

-				stringBuffer.append(_ArrayList);

-				stringBuffer.append(TEXT_114);

-				stringBuffer.append(_ArrayList);

-				stringBuffer.append(TEXT_115);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EObject"));

 				stringBuffer.append(TEXT_116);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.ResourceLocator"));

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.command.CommandParameter"));

 				stringBuffer.append(TEXT_117);

-				stringBuffer.append(genPackage.getImportedEditPluginClassName());

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.command.CommandParameter"));

 				stringBuffer.append(TEXT_118);

+				stringBuffer.append(_Collection);

+				stringBuffer.append(TEXT_88);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain"));

+				stringBuffer.append(TEXT_119);

+				stringBuffer.append(_ArrayList);

+				stringBuffer.append(TEXT_120);

+				stringBuffer.append(_ArrayList);

+				stringBuffer.append(TEXT_121);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EObject"));

+				stringBuffer.append(TEXT_122);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.ResourceLocator"));

+				stringBuffer.append(TEXT_123);

+				stringBuffer.append(genPackage.getImportedEditPluginClassName());

+				stringBuffer.append(TEXT_124);

 			}

 		}

-		stringBuffer.append(TEXT_119);

+		stringBuffer.append(TEXT_125);

 		genModel.emitSortedImports();

 		stringBuffer.append(TEXT_17);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ManifestMF.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ManifestMF.java
index 2620ab2..6d4d90f 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ManifestMF.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ManifestMF.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -27,31 +27,33 @@
 	}

 

 	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

-	protected final String TEXT_1 = "Manifest-Version: 1.0" + NL + "Bundle-ManifestVersion: 2" + NL

-			+ "Bundle-Name: %pluginName" + NL + "Bundle-SymbolicName: ";

-	protected final String TEXT_2 = ";singleton:=true" + NL + "Bundle-Version: 1.0.0.qualifier" + NL

-			+ "Bundle-ClassPath: ";

-	protected final String TEXT_3 = ".jar";

-	protected final String TEXT_4 = ".";

-	protected final String TEXT_5 = NL + "Bundle-Activator: ";

-	protected final String TEXT_6 = "$Implementation";

-	protected final String TEXT_7 = "$Activator";

-	protected final String TEXT_8 = NL + "Bundle-Vendor: %providerName" + NL + "Bundle-Localization: plugin";

-	protected final String TEXT_9 = NL + "Bundle-RequiredExecutionEnvironment: J2SE-1.5";

-	protected final String TEXT_10 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.6";

-	protected final String TEXT_11 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.7";

-	protected final String TEXT_12 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.8";

-	protected final String TEXT_13 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-9";

-	protected final String TEXT_14 = NL + "Export-Package: ";

-	protected final String TEXT_15 = ",";

-	protected final String TEXT_16 = NL + " ";

-	protected final String TEXT_17 = NL + "Require-Bundle: ";

-	protected final String TEXT_18 = ";resolution:=optional;x-installation:=greedy";

-	protected final String TEXT_19 = ";visibility:=reexport";

-	protected final String TEXT_20 = NL + "Import-Package: org.osgi.framework";

-	protected final String TEXT_21 = NL + "Eclipse-LazyStart: true";

-	protected final String TEXT_22 = NL + "Bundle-ActivationPolicy: lazy" + NL;

-	protected final String TEXT_23 = NL;

+	protected final String TEXT_1 = "Manifest-Version: 1.0" + NL + "Bundle-ManifestVersion: 2" + NL + "Bundle-Name: ";

+	protected final String TEXT_2 = NL + "Bundle-SymbolicName: ";

+	protected final String TEXT_3 = ";singleton:=true" + NL + "Automatic-Module-Name: ";

+	protected final String TEXT_4 = NL + "Bundle-Version: 1.0.0.qualifier" + NL + "Bundle-ClassPath: ";

+	protected final String TEXT_5 = ".jar";

+	protected final String TEXT_6 = ".";

+	protected final String TEXT_7 = NL + "Bundle-Activator: ";

+	protected final String TEXT_8 = "$Implementation";

+	protected final String TEXT_9 = "$Activator";

+	protected final String TEXT_10 = NL + "Bundle-Vendor: ";

+	protected final String TEXT_11 = NL + "Bundle-Localization: ";

+	protected final String TEXT_12 = NL + "Bundle-RequiredExecutionEnvironment: J2SE-1.5";

+	protected final String TEXT_13 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.6";

+	protected final String TEXT_14 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.7";

+	protected final String TEXT_15 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.8";

+	protected final String TEXT_16 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-9";

+	protected final String TEXT_17 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-10";

+	protected final String TEXT_18 = NL + "Export-Package: ";

+	protected final String TEXT_19 = ",";

+	protected final String TEXT_20 = NL + " ";

+	protected final String TEXT_21 = NL + "Require-Bundle: ";

+	protected final String TEXT_22 = ";resolution:=optional;x-installation:=greedy";

+	protected final String TEXT_23 = ";visibility:=reexport";

+	protected final String TEXT_24 = NL + "Import-Package: org.osgi.framework";

+	protected final String TEXT_25 = NL + "Eclipse-LazyStart: true";

+	protected final String TEXT_26 = NL + "Bundle-ActivationPolicy: lazy" + NL;

+	protected final String TEXT_27 = NL;

 

 	public ManifestMF() {

 		//Here is the constructor

@@ -87,8 +89,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_23);

-		stringBuffer.append(TEXT_23);

+		stringBuffer.append(TEXT_27);

+		stringBuffer.append(TEXT_27);

 		return stringBuffer.toString();

 	}

 

@@ -160,9 +162,9 @@
 		/**

 		 * Copyright (c) 2005-2010 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors:

 		 *   IBM - Initial API and implementation

@@ -170,81 +172,90 @@
 

 		GenModel genModel = (GenModel) argument;

 		stringBuffer.append(TEXT_1);

-		stringBuffer.append(genModel.getEditPluginID());

+		stringBuffer.append(genModel.getEditBundleNameKey());

 		stringBuffer.append(TEXT_2);

+		stringBuffer.append(genModel.getEditPluginID());

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(genModel.getEditPluginID());

+		stringBuffer.append(TEXT_4);

 		if (genModel.isRuntimeJar()) {

 			stringBuffer.append(genModel.getEditPluginID());

-			stringBuffer.append(TEXT_3);

+			stringBuffer.append(TEXT_5);

 		} else {

-			stringBuffer.append(TEXT_4);

+			stringBuffer.append(TEXT_6);

 		}

 		if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {

-			stringBuffer.append(TEXT_5);

+			stringBuffer.append(TEXT_7);

 			stringBuffer.append(genModel.getQualifiedEditPluginClassName());

-			stringBuffer.append(TEXT_6);

+			stringBuffer.append(TEXT_8);

 			if (genModel.isOSGiCompatible()) {

-				stringBuffer.append(TEXT_7);

+				stringBuffer.append(TEXT_9);

 			}

 		}

-		stringBuffer.append(TEXT_8);

+		stringBuffer.append(TEXT_10);

+		stringBuffer.append(genModel.getEditBundleVendorKey());

+		stringBuffer.append(TEXT_11);

+		stringBuffer.append(genModel.getEditBundleLocalization());

 		if (genModel.getComplianceLevel() == GenJDKLevel.JDK50_LITERAL) {

-			stringBuffer.append(TEXT_9);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK60_LITERAL) {

-			stringBuffer.append(TEXT_10);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK70_LITERAL) {

-			stringBuffer.append(TEXT_11);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK80_LITERAL) {

 			stringBuffer.append(TEXT_12);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK90_LITERAL) {

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK60_LITERAL) {

 			stringBuffer.append(TEXT_13);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK70_LITERAL) {

+			stringBuffer.append(TEXT_14);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK80_LITERAL) {

+			stringBuffer.append(TEXT_15);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK90_LITERAL) {

+			stringBuffer.append(TEXT_16);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK100_LITERAL) {

+			stringBuffer.append(TEXT_17);

 		}

 		Iterator<String> packagesIterator = genModel.getEditQualifiedPackageNames().iterator();

 		if (packagesIterator.hasNext()) {

 			String pack = packagesIterator.next();

-			stringBuffer.append(TEXT_14);

+			stringBuffer.append(TEXT_18);

 			stringBuffer.append(pack);

 			while (packagesIterator.hasNext()) {

 				pack = packagesIterator.next();

-				stringBuffer.append(TEXT_15);

-				stringBuffer.append(TEXT_16);

+				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_20);

 				stringBuffer.append(pack);

 			}

 		}

 		Iterator<String> requiredPluginIterator = genModel.getEditRequiredPlugins().iterator();

 		if (requiredPluginIterator.hasNext()) {

 			String pluginID = requiredPluginIterator.next();

-			stringBuffer.append(TEXT_17);

+			stringBuffer.append(TEXT_21);

 			stringBuffer.append(pluginID);

 			if (pluginID.startsWith("org.eclipse.core.runtime")) {

 				if (genModel.isOSGiCompatible()) {

-					stringBuffer.append(TEXT_18);

+					stringBuffer.append(TEXT_22);

 				}

 			} else {

-				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_23);

 			}

 			while (requiredPluginIterator.hasNext()) {

 				pluginID = requiredPluginIterator.next();

-				stringBuffer.append(TEXT_15);

-				stringBuffer.append(TEXT_16);

+				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_20);

 				stringBuffer.append(pluginID);

 				if (pluginID.startsWith("org.eclipse.core.runtime")) {

 					if (genModel.isOSGiCompatible()) {

-						stringBuffer.append(TEXT_18);

+						stringBuffer.append(TEXT_22);

 					}

 				} else if (!pluginID.equals("org.eclipse.xtext.xbase.lib")

 						&& !pluginID.equals("org.eclipse.emf.ecore.xcore.lib")) {

-					stringBuffer.append(TEXT_19);

+					stringBuffer.append(TEXT_23);

 				}

 			}

 		}

 		if (genModel.isOSGiCompatible()) {

-			stringBuffer.append(TEXT_20);

+			stringBuffer.append(TEXT_24);

 		}

 		if (genModel.getRuntimeVersion() == GenRuntimeVersion.EMF22

 				|| genModel.getRuntimeVersion() == GenRuntimeVersion.EMF23) {

-			stringBuffer.append(TEXT_21);

+			stringBuffer.append(TEXT_25);

 		}

-		stringBuffer.append(TEXT_22);

+		stringBuffer.append(TEXT_26);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ModuleGWTXML.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ModuleGWTXML.java
index aef9ae1..78327c6 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ModuleGWTXML.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/ModuleGWTXML.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -147,9 +147,9 @@
 		/**

 		 * Copyright (c) 2010 Ed Merks and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   Ed Merks - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
index 5e6fe62..4ce89fa 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Plugin.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -256,9 +256,9 @@
 		/**

 		 * Copyright (c) 2002-2010 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
index 4d5c2b8..3055f49 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginProperties.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -29,7 +29,7 @@
 	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

 	protected final String TEXT_1 = "";

 	protected final String TEXT_2 = NL + NL + "pluginName = ";

-	protected final String TEXT_3 = " Edit Support" + NL + "providerName = www.example.org";

+	protected final String TEXT_3 = NL + "providerName = ";

 	protected final String TEXT_4 = NL;

 	protected final String TEXT_5 = NL + "_UI_CreateChild_text = {0}" + NL + "_UI_CreateChild_text2 = {1} ";

 	protected final String TEXT_6 = "| ";

@@ -127,7 +127,8 @@
 			throws Exception {

 

 		GenModel genModel = parameter;

-		targetPathName = genModel.getEditProjectDirectory() + "/plugin.properties";

+		targetPathName = genModel.getEditProjectDirectory() + "/" + genModel.getEditBundleLocalization()

+				+ ".properties";

 

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "setReporterVariables", stringBuffer.toString());

@@ -157,9 +158,9 @@
 		/**

 		 * Copyright (c) 2002-2007 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

@@ -184,8 +185,9 @@
 		}

 

 		stringBuffer.append(TEXT_2);

-		stringBuffer.append(genModel.getModelName());

+		stringBuffer.append(genModel.getEditBundleName());

 		stringBuffer.append(TEXT_3);

+		stringBuffer.append(genModel.getEditBundleVendorName());

 		if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {

 			stringBuffer.append(TEXT_4);

 			if (genModel.isCreationCommands()) {

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
index 694c509..5138acc 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/PluginXML.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -188,9 +188,9 @@
 		/**

 		 * Copyright (c) 2002-2005 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
index 8625b47..9f13eb0 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/Properties.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -199,9 +199,9 @@
 		/**

 		 * Copyright (c) 2010 Ed Merks and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   Ed Merks - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvideraddPropertyDescriptoroverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvideraddPropertyDescriptoroverride.java
index 6a6ed85..0278f9a 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvideraddPropertyDescriptoroverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvideraddPropertyDescriptoroverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit.call.ItemProvider;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -45,13 +45,17 @@
 	protected final String TEXT_14 = ".";

 	protected final String TEXT_15 = NL + "\t\t\t\t getString(\"";

 	protected final String TEXT_16 = "\"),";

-	protected final String TEXT_17 = NL + "\t\t\t\t null));";

-	protected final String TEXT_18 = NL + "\t\t\t\t new String[] {";

-	protected final String TEXT_19 = NL + "\t\t\t\t\t\"";

-	protected final String TEXT_20 = "\"";

-	protected final String TEXT_21 = NL + "\t\t\t\t }));";

-	protected final String TEXT_22 = NL;

-	protected final String TEXT_23 = NL;

+	protected final String TEXT_17 = NL + "\t\t\t\t null," + NL + "\t\t\t\t ";

+	protected final String TEXT_18 = ".createURI(";

+	protected final String TEXT_19 = ")));";

+	protected final String TEXT_20 = NL + "\t\t\t\t null));";

+	protected final String TEXT_21 = NL + "\t\t\t\t new String[] {";

+	protected final String TEXT_22 = NL + "\t\t\t\t\t\"";

+	protected final String TEXT_23 = "\"";

+	protected final String TEXT_24 = NL + "\t\t\t\t }," + NL + "\t\t\t\t ";

+	protected final String TEXT_25 = NL + "\t\t\t\t }));";

+	protected final String TEXT_26 = NL;

+	protected final String TEXT_27 = NL;

 

 	public ItemProvideraddPropertyDescriptoroverride() {

 		//Here is the constructor

@@ -112,8 +116,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_23);

-		stringBuffer.append(TEXT_23);

+		stringBuffer.append(TEXT_27);

+		stringBuffer.append(TEXT_27);

 		return stringBuffer.toString();

 	}

 

@@ -240,24 +244,46 @@
 			stringBuffer.append(genModel.getNonNLS());

 		}

 		if (genFeature.getPropertyFilterFlags().isEmpty()) {

-			stringBuffer.append(TEXT_17);

+			if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF214_VALUE

+					&& genFeature.getPropertyEditorFactory() != null

+					&& genFeature.getPropertyEditorFactory().trim().length() != 0) {

+				stringBuffer.append(TEXT_17);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

+				stringBuffer.append(TEXT_18);

+				stringBuffer.append(org.eclipse.emf.codegen.ecore.genmodel.impl.Literals

+						.toStringLiteral(genFeature.getPropertyEditorFactory().trim(), genModel));

+				stringBuffer.append(TEXT_19);

+			} else {

+				stringBuffer.append(TEXT_20);

+			}

 		} else {

-			stringBuffer.append(TEXT_18);

-			for (Iterator<String> j = genFeature.getPropertyFilterFlags().iterator(); j.hasNext();) {

+			stringBuffer.append(TEXT_21);

+			/*}*/for (Iterator<String> j = genFeature.getPropertyFilterFlags().iterator(); j.hasNext();) {

 				String filterFlag = j.next();

 				if (filterFlag != null && filterFlag.length() > 0) {

-					stringBuffer.append(TEXT_19);

+					stringBuffer.append(TEXT_22);

 					stringBuffer.append(filterFlag);

-					stringBuffer.append(TEXT_20);

+					stringBuffer.append(TEXT_23);

 					if (j.hasNext()) {

 						stringBuffer.append(TEXT_12);

 					}

 					stringBuffer.append(genModel.getNonNLS());

 				}

 			}

-			stringBuffer.append(TEXT_21);

+			if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF214_VALUE

+					&& genFeature.getPropertyEditorFactory() != null

+					&& genFeature.getPropertyEditorFactory().trim().length() != 0) { // {

+				stringBuffer.append(TEXT_24);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

+				stringBuffer.append(TEXT_18);

+				stringBuffer.append(org.eclipse.emf.codegen.ecore.genmodel.impl.Literals

+						.toStringLiteral(genFeature.getPropertyEditorFactory().trim(), genModel));

+				stringBuffer.append(TEXT_19);

+			} else { // {

+				stringBuffer.append(TEXT_25);

+			}

 		}

-		stringBuffer.append(TEXT_22);

+		stringBuffer.append(TEXT_26);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidergetStyledTextoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidergetStyledTextoverride.java
index 87248df..2398695 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidergetStyledTextoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidergetStyledTextoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit.call.ItemProvider;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidergetTextoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidergetTextoverride.java
index 7e973e6..9d646e0 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidergetTextoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidergetTextoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit.call.ItemProvider;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProviderinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProviderinsert.java
index 3c8368b..e2955de 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProviderinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProviderinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit.call.ItemProvider;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeDelegatedFeatureinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeDelegatedFeatureinsert.java
index deb5d2e..862c95b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeDelegatedFeatureinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeDelegatedFeatureinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit.call.ItemProvider;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeDelegatedFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeDelegatedFeatureoverride.java
index b7f6a53..5505dd5 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeDelegatedFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeDelegatedFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit.call.ItemProvider;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeFeatureinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeFeatureinsert.java
index 4386772..36a7479 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeFeatureinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeFeatureinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit.call.ItemProvider;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeFeatureoverride.java
index 335e6f5..f9f7432 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsAttributeFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit.call.ItemProvider;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceDelegatedFeatureinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceDelegatedFeatureinsert.java
index 4129473..c88ce8b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceDelegatedFeatureinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceDelegatedFeatureinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit.call.ItemProvider;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceDelegatedFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceDelegatedFeatureoverride.java
index e37b287..6150eab 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceDelegatedFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceDelegatedFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit.call.ItemProvider;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceFeatureinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceFeatureinsert.java
index d24d64e..b91fa5c 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceFeatureinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceFeatureinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit.call.ItemProvider;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceFeatureoverride.java
index b103f7f..b79c846 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/edit/call/ItemProvider/ItemProvidernewChildDescriptorsReferenceFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.edit.call.ItemProvider;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
index 97b7ef7..41c971f 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ActionBarContributor.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -51,140 +51,150 @@
 	protected final String TEXT_18 = NL + "\t{" + NL + "\t\t/**" + NL

 			+ "\t\t * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)" + NL

 			+ "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL

-			+ "\t\t */" + NL + "\t\tpublic void run(";

-	protected final String TEXT_19 = " action)" + NL + "\t\t{" + NL + "\t\t\t";

-	protected final String TEXT_20 = " wizard = new ";

-	protected final String TEXT_21 = "();" + NL + "\t\t\twizard.init(getWindow().getWorkbench(), ";

-	protected final String TEXT_22 = ".EMPTY);" + NL + "\t\t\t";

-	protected final String TEXT_23 = " wizardDialog = new ";

-	protected final String TEXT_24 = "(getWindow().getShell(), wizard);" + NL + "\t\t\twizardDialog.open();" + NL

+			+ "\t\t */";

+	protected final String TEXT_19 = NL + "\t\t@Override";

+	protected final String TEXT_20 = NL + "\t\tpublic void run(";

+	protected final String TEXT_21 = " action)" + NL + "\t\t{" + NL + "\t\t\t";

+	protected final String TEXT_22 = " wizard = new ";

+	protected final String TEXT_23 = "();" + NL + "\t\t\twizard.init(getWindow().getWorkbench(), ";

+	protected final String TEXT_24 = ".EMPTY);" + NL + "\t\t\t";

+	protected final String TEXT_25 = " wizardDialog = new ";

+	protected final String TEXT_26 = "(getWindow().getShell(), wizard);" + NL + "\t\t\twizardDialog.open();" + NL

 			+ "\t\t}" + NL + "\t}" + NL;

-	protected final String TEXT_25 = NL + "\t/**" + NL + "\t * This keeps track of the active editor." + NL

+	protected final String TEXT_27 = NL + "\t/**" + NL + "\t * This keeps track of the active editor." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected ";

-	protected final String TEXT_26 = " activeEditorPart;" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_28 = " activeEditorPart;" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This keeps track of the current selection provider." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";

-	protected final String TEXT_27 = " selectionProvider;" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_29 = " selectionProvider;" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This action opens the Properties view." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";

-	protected final String TEXT_28 = " showPropertiesViewAction =" + NL + "\t\tnew ";

-	protected final String TEXT_29 = "(";

-	protected final String TEXT_30 = ".INSTANCE.getString(\"_UI_ShowPropertiesView_menu_item\"))";

-	protected final String TEXT_31 = NL + "\t\t{";

-	protected final String TEXT_32 = NL + "\t\t\t@Override";

-	protected final String TEXT_33 = NL + "\t\t\tpublic void run()" + NL + "\t\t\t{" + NL + "\t\t\t\ttry" + NL

+	protected final String TEXT_30 = " showPropertiesViewAction =" + NL + "\t\tnew ";

+	protected final String TEXT_31 = "(";

+	protected final String TEXT_32 = ".INSTANCE.getString(\"_UI_ShowPropertiesView_menu_item\"))";

+	protected final String TEXT_33 = NL + "\t\t{";

+	protected final String TEXT_34 = NL + "\t\t\t@Override";

+	protected final String TEXT_35 = NL + "\t\t\tpublic void run()" + NL + "\t\t\t{" + NL + "\t\t\t\ttry" + NL

 			+ "\t\t\t\t{" + NL + "\t\t\t\t\tgetPage().showView(\"org.eclipse.ui.views.PropertySheet\");";

-	protected final String TEXT_34 = NL + "\t\t\t\t}" + NL + "\t\t\t\tcatch (";

-	protected final String TEXT_35 = " exception)" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\t";

-	protected final String TEXT_36 = ".INSTANCE.log(exception);" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t};"

+	protected final String TEXT_36 = NL + "\t\t\t\t}" + NL + "\t\t\t\tcatch (";

+	protected final String TEXT_37 = " exception)" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\t";

+	protected final String TEXT_38 = ".INSTANCE.log(exception);" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t};"

 			+ NL + "" + NL + "\t/**" + NL + "\t * This action refreshes the viewer of the current editor if the editor"

 			+ NL + "\t * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected ";

-	protected final String TEXT_37 = " refreshViewerAction =" + NL + "\t\tnew ";

-	protected final String TEXT_38 = ".INSTANCE.getString(\"_UI_RefreshViewer_menu_item\"))";

-	protected final String TEXT_39 = NL + "\t\t\tpublic boolean isEnabled()" + NL + "\t\t\t{" + NL

+	protected final String TEXT_39 = " refreshViewerAction =" + NL + "\t\tnew ";

+	protected final String TEXT_40 = ".INSTANCE.getString(\"_UI_RefreshViewer_menu_item\"))";

+	protected final String TEXT_41 = NL + "\t\t\tpublic boolean isEnabled()" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\treturn activeEditorPart instanceof ";

-	protected final String TEXT_40 = ";" + NL + "\t\t\t}" + NL;

-	protected final String TEXT_41 = NL + "\t\t\tpublic void run()" + NL + "\t\t\t{" + NL

+	protected final String TEXT_42 = ";" + NL + "\t\t\t}" + NL;

+	protected final String TEXT_43 = NL + "\t\t\tpublic void run()" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tif (activeEditorPart instanceof ";

-	protected final String TEXT_42 = ")" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\t";

-	protected final String TEXT_43 = " viewer = ((";

-	protected final String TEXT_44 = ")activeEditorPart).getViewer();" + NL + "\t\t\t\t\tif (viewer != null)" + NL

+	protected final String TEXT_44 = ")" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\t";

+	protected final String TEXT_45 = " viewer = ((";

+	protected final String TEXT_46 = ")activeEditorPart).getViewer();" + NL + "\t\t\t\t\tif (viewer != null)" + NL

 			+ "\t\t\t\t\t{" + NL + "\t\t\t\t\t\tviewer.refresh();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL

 			+ "\t\t\t}" + NL + "\t\t};" + NL;

-	protected final String TEXT_45 = NL + "\t/**" + NL

+	protected final String TEXT_47 = NL + "\t/**" + NL

 			+ "\t * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor"

 			+ NL + "\t * generated for the current selection by the item provider." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected ";

-	protected final String TEXT_46 = " createChildActions;" + NL;

-	protected final String TEXT_47 = NL + "\t/**" + NL

+	protected final String TEXT_48 = " createChildActions;" + NL;

+	protected final String TEXT_49 = NL + "\t/**" + NL

 			+ "\t * This will contain a map of {@link org.eclipse.emf.edit.ui.action.CreateChildAction}s, keyed by sub-menu text."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */" + NL + "\tprotected ";

-	protected final String TEXT_48 = " createChildSubmenuActions;" + NL;

-	protected final String TEXT_49 = NL + "\t/**" + NL

+	protected final String TEXT_50 = " createChildSubmenuActions;" + NL;

+	protected final String TEXT_51 = NL + "\t/**" + NL

 			+ "\t * This is the menu manager into which menu contribution items should be added for CreateChild actions."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */" + NL + "\tprotected ";

-	protected final String TEXT_50 = " createChildMenuManager;" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_52 = " createChildMenuManager;" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor"

 			+ NL + "\t * generated for the current selection by the item provider." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected ";

-	protected final String TEXT_51 = " createSiblingActions;" + NL;

-	protected final String TEXT_52 = NL + "\t/**" + NL

+	protected final String TEXT_53 = " createSiblingActions;" + NL;

+	protected final String TEXT_54 = NL + "\t/**" + NL

 			+ "\t * This will contain a map of {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction}s, keyed by submenu text."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */" + NL + "\tprotected ";

-	protected final String TEXT_53 = " createSiblingSubmenuActions;" + NL;

-	protected final String TEXT_54 = NL + "\t/**" + NL

+	protected final String TEXT_55 = " createSiblingSubmenuActions;" + NL;

+	protected final String TEXT_56 = NL + "\t/**" + NL

 			+ "\t * This is the menu manager into which menu contribution items should be added for CreateSibling actions."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */" + NL + "\tprotected ";

-	protected final String TEXT_55 = " createSiblingMenuManager;" + NL;

-	protected final String TEXT_56 = NL + "\t/**" + NL + "\t * This creates an instance of the contributor." + NL

+	protected final String TEXT_57 = " createSiblingMenuManager;" + NL;

+	protected final String TEXT_58 = NL + "\t/**" + NL + "\t * This creates an instance of the contributor." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tpublic ";

-	protected final String TEXT_57 = "()" + NL + "\t{" + NL + "\t\tsuper(ADDITIONS_LAST_STYLE);" + NL

+	protected final String TEXT_59 = "()" + NL + "\t{" + NL + "\t\tsuper(ADDITIONS_LAST_STYLE);" + NL

 			+ "\t\tloadResourceAction = new ";

-	protected final String TEXT_58 = "();" + NL + "\t\tvalidateAction = new ";

-	protected final String TEXT_59 = "();";

-	protected final String TEXT_60 = NL + "\t\tliveValidationAction = new ";

-	protected final String TEXT_61 = ".LiveValidator.LiveValidationAction(";

-	protected final String TEXT_62 = ".getPlugin().getDialogSettings());";

-	protected final String TEXT_63 = NL + "\t\tcontrolAction = new ";

-	protected final String TEXT_64 = "();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_60 = "();" + NL + "\t\tvalidateAction = new ";

+	protected final String TEXT_61 = "();";

+	protected final String TEXT_62 = NL + "\t\tliveValidationAction = new ";

+	protected final String TEXT_63 = ".LiveValidator.LiveValidationAction(";

+	protected final String TEXT_64 = ".getPlugin().getDialogSettings());";

+	protected final String TEXT_65 = NL + "\t\tcontrolAction = new ";

+	protected final String TEXT_66 = NL + "\t\tfindAction = ";

+	protected final String TEXT_67 = ".create();";

+	protected final String TEXT_68 = NL + "\t\trevertAction = new ";

+	protected final String TEXT_69 = NL + "\t\texpandAllAction = new ";

+	protected final String TEXT_70 = NL + "\t\tcollapseAllAction = new ";

+	protected final String TEXT_71 = NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This adds Separators for editor additions to the tool bar." + NL + "\t * <!-- begin-user-doc -->"

 			+ NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

-	protected final String TEXT_65 = NL + "\t@Override";

-	protected final String TEXT_66 = NL + "\tpublic void contributeToToolBar(";

-	protected final String TEXT_67 = " toolBarManager)" + NL + "\t{" + NL + "\t\ttoolBarManager.add(new ";

-	protected final String TEXT_68 = "(\"";

-	protected final String TEXT_69 = "-settings\"));";

-	protected final String TEXT_70 = NL + "\t\ttoolBarManager.add(new ";

-	protected final String TEXT_71 = "-additions\"));";

-	protected final String TEXT_72 = NL + "\t}" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_72 = NL + "\t@Override";

+	protected final String TEXT_73 = NL + "\tpublic void contributeToToolBar(";

+	protected final String TEXT_74 = " toolBarManager)" + NL + "\t{" + NL

+			+ "\t\tsuper.contributeToToolBar(toolBarManager);" + NL + "\t\ttoolBarManager.add(new ";

+	protected final String TEXT_75 = "(\"";

+	protected final String TEXT_76 = "-settings\"));";

+	protected final String TEXT_77 = NL + "\t\ttoolBarManager.add(new ";

+	protected final String TEXT_78 = "-additions\"));";

+	protected final String TEXT_79 = NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This adds to the menu bar a menu and some separators for editor additions," + NL

 			+ "\t * as well as the sub-menus for object creation items." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

-	protected final String TEXT_73 = NL + "\tpublic void contributeToMenu(";

-	protected final String TEXT_74 = " menuManager)" + NL + "\t{" + NL + "\t\tsuper.contributeToMenu(menuManager);" + NL

+	protected final String TEXT_80 = NL + "\tpublic void contributeToMenu(";

+	protected final String TEXT_81 = " menuManager)" + NL + "\t{" + NL + "\t\tsuper.contributeToMenu(menuManager);" + NL

 			+ "" + NL + "\t\t";

-	protected final String TEXT_75 = " submenuManager = new ";

-	protected final String TEXT_76 = ".INSTANCE.getString(\"_UI_";

-	protected final String TEXT_77 = "_menu\"), \"";

-	protected final String TEXT_78 = "MenuID\");";

-	protected final String TEXT_79 = NL + "\t\tmenuManager.insertAfter(\"additions\", submenuManager);";

-	protected final String TEXT_80 = NL + "\t\tsubmenuManager.add(new ";

-	protected final String TEXT_81 = "(\"settings\"));";

-	protected final String TEXT_82 = "(\"actions\"));";

-	protected final String TEXT_83 = "(\"additions\"));";

-	protected final String TEXT_84 = "(\"additions-end\"));";

-	protected final String TEXT_85 = NL + "\t\t// Prepare for CreateChild item addition or removal." + NL + "\t\t//"

+	protected final String TEXT_82 = " submenuManager = new ";

+	protected final String TEXT_83 = ".INSTANCE.getString(\"_UI_";

+	protected final String TEXT_84 = "_menu\"), \"";

+	protected final String TEXT_85 = "MenuID\");";

+	protected final String TEXT_86 = NL + "\t\tmenuManager.insertAfter(\"additions\", submenuManager);";

+	protected final String TEXT_87 = NL + "\t\tsubmenuManager.add(new ";

+	protected final String TEXT_88 = "(\"settings\"));";

+	protected final String TEXT_89 = "(\"actions\"));";

+	protected final String TEXT_90 = "(\"additions\"));";

+	protected final String TEXT_91 = "(\"additions-end\"));";

+	protected final String TEXT_92 = NL + "\t\t// Prepare for CreateChild item addition or removal." + NL + "\t\t//"

 			+ NL + "\t\tcreateChildMenuManager = new ";

-	protected final String TEXT_86 = ".INSTANCE.getString(\"_UI_CreateChild_menu_item\"));";

-	protected final String TEXT_87 = NL + "\t\tsubmenuManager.insertBefore(\"additions\", createChildMenuManager);";

-	protected final String TEXT_88 = NL + NL + "\t\t// Prepare for CreateSibling item addition or removal." + NL

+	protected final String TEXT_93 = ".INSTANCE.getString(\"_UI_CreateChild_menu_item\"));";

+	protected final String TEXT_94 = NL + "\t\tsubmenuManager.insertBefore(\"additions\", createChildMenuManager);";

+	protected final String TEXT_95 = NL + NL + "\t\t// Prepare for CreateSibling item addition or removal." + NL

 			+ "\t\t//" + NL + "\t\tcreateSiblingMenuManager = new ";

-	protected final String TEXT_89 = ".INSTANCE.getString(\"_UI_CreateSibling_menu_item\"));";

-	protected final String TEXT_90 = NL + "\t\tsubmenuManager.insertBefore(\"additions\", createSiblingMenuManager);";

-	protected final String TEXT_91 = NL + NL + "\t\t// Force an update because Eclipse hides empty menus now." + NL

+	protected final String TEXT_96 = ".INSTANCE.getString(\"_UI_CreateSibling_menu_item\"));";

+	protected final String TEXT_97 = NL + "\t\tsubmenuManager.insertBefore(\"additions\", createSiblingMenuManager);";

+	protected final String TEXT_98 = NL + NL + "\t\t// Force an update because Eclipse hides empty menus now." + NL

 			+ "\t\t//" + NL + "\t\tsubmenuManager.addMenuListener" + NL + "\t\t\t(new ";

-	protected final String TEXT_92 = "()" + NL + "\t\t\t {" + NL + "\t\t\t\t public void menuAboutToShow(";

-	protected final String TEXT_93 = " menuManager)" + NL + "\t\t\t\t {" + NL

+	protected final String TEXT_99 = "()" + NL + "\t\t\t {";

+	protected final String TEXT_100 = NL + "\t\t\t\t @Override";

+	protected final String TEXT_101 = NL + "\t\t\t\t public void menuAboutToShow(";

+	protected final String TEXT_102 = " menuManager)" + NL + "\t\t\t\t {" + NL

 			+ "\t\t\t\t\t menuManager.updateAll(true);" + NL + "\t\t\t\t }" + NL + "\t\t\t });" + NL;

-	protected final String TEXT_94 = NL + "\t\t// Add your contributions." + NL

+	protected final String TEXT_103 = NL + "\t\t// Add your contributions." + NL

 			+ "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL;

-	protected final String TEXT_95 = NL + "\t\taddGlobalActions(submenuManager);" + NL + "\t}" + NL + "" + NL + "\t/**"

+	protected final String TEXT_104 = NL + "\t\taddGlobalActions(submenuManager);" + NL + "\t}" + NL + "" + NL + "\t/**"

 			+ NL

 			+ "\t * When the active editor changes, this remembers the change and registers with it as a selection provider."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_96 = NL + "\tpublic void setActiveEditor(";

-	protected final String TEXT_97 = " part)" + NL + "\t{" + NL + "\t\tsuper.setActiveEditor(part);" + NL

+	protected final String TEXT_105 = NL + "\tpublic void setActiveEditor(";

+	protected final String TEXT_106 = " part)" + NL + "\t{" + NL + "\t\tsuper.setActiveEditor(part);" + NL

 			+ "\t\tactiveEditorPart = part;" + NL + "" + NL + "\t\t// Switch to the new selection provider." + NL

 			+ "\t\t//" + NL + "\t\tif (selectionProvider != null)" + NL + "\t\t{" + NL

 			+ "\t\t\tselectionProvider.removeSelectionChangedListener(this);" + NL + "\t\t}" + NL

@@ -194,80 +204,81 @@
 			+ "\t\t\t// Fake a selection changed event to update the menus." + NL + "\t\t\t//" + NL

 			+ "\t\t\tif (selectionProvider.getSelection() != null)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tselectionChanged(new ";

-	protected final String TEXT_98 = "(selectionProvider, selectionProvider.getSelection()));" + NL + "\t\t\t}" + NL

+	protected final String TEXT_107 = "(selectionProvider, selectionProvider.getSelection()));" + NL + "\t\t\t}" + NL

 			+ "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener}," + NL

 			+ "\t * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings"

 			+ NL + "\t * that can be added to the selected object and updating the menus accordingly." + NL

-			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

-			+ NL + "\tpublic void selectionChanged(";

-	protected final String TEXT_99 = " event)" + NL + "\t{";

-	protected final String TEXT_100 = NL + "\t\t// Remove any menu items for old selection." + NL + "\t\t//" + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

+			+ "\t */";

+	protected final String TEXT_108 = NL + "\tpublic void selectionChanged(";

+	protected final String TEXT_109 = " event)" + NL + "\t{";

+	protected final String TEXT_110 = NL + "\t\t// Remove any menu items for old selection." + NL + "\t\t//" + NL

 			+ "\t\tif (createChildMenuManager != null)" + NL + "\t\t{";

-	protected final String TEXT_101 = NL

+	protected final String TEXT_111 = NL

 			+ "\t\t\tdepopulateManager(createChildMenuManager, createChildSubmenuActions);";

-	protected final String TEXT_102 = NL + "\t\t\tdepopulateManager(createChildMenuManager, createChildActions);" + NL

+	protected final String TEXT_112 = NL + "\t\t\tdepopulateManager(createChildMenuManager, createChildActions);" + NL

 			+ "\t\t}" + NL + "\t\tif (createSiblingMenuManager != null)" + NL + "\t\t{";

-	protected final String TEXT_103 = NL

+	protected final String TEXT_113 = NL

 			+ "\t\t\tdepopulateManager(createSiblingMenuManager, createSiblingSubmenuActions);";

-	protected final String TEXT_104 = NL + "\t\t\tdepopulateManager(createSiblingMenuManager, createSiblingActions);"

+	protected final String TEXT_114 = NL + "\t\t\tdepopulateManager(createSiblingMenuManager, createSiblingActions);"

 			+ NL + "\t\t}" + NL + "" + NL

 			+ "\t\t// Query the new selection for appropriate new child/sibling descriptors" + NL + "\t\t//" + NL

 			+ "\t\t";

-	protected final String TEXT_105 = " newChildDescriptors = null;" + NL + "\t\t";

-	protected final String TEXT_106 = " newSiblingDescriptors = null;" + NL + "" + NL + "\t\t";

-	protected final String TEXT_107 = " selection = event.getSelection();" + NL + "\t\tif (selection instanceof ";

-	protected final String TEXT_108 = " && ((IStructuredSelection)selection).size() == 1)" + NL + "\t\t{" + NL

+	protected final String TEXT_115 = " newChildDescriptors = null;" + NL + "\t\t";

+	protected final String TEXT_116 = " newSiblingDescriptors = null;" + NL + "" + NL + "\t\t";

+	protected final String TEXT_117 = " selection = event.getSelection();" + NL + "\t\tif (selection instanceof ";

+	protected final String TEXT_118 = " && ((IStructuredSelection)selection).size() == 1)" + NL + "\t\t{" + NL

 			+ "\t\t\tObject object = ((";

-	protected final String TEXT_109 = ")selection).getFirstElement();" + NL + "" + NL + "\t\t\t";

-	protected final String TEXT_110 = " domain = ((";

-	protected final String TEXT_111 = ")activeEditorPart).getEditingDomain();" + NL + "" + NL

+	protected final String TEXT_119 = ")selection).getFirstElement();" + NL + "" + NL + "\t\t\t";

+	protected final String TEXT_120 = " domain = ((";

+	protected final String TEXT_121 = ")activeEditorPart).getEditingDomain();" + NL + "" + NL

 			+ "\t\t\tnewChildDescriptors = domain.getNewChildDescriptors(object, null);" + NL

 			+ "\t\t\tnewSiblingDescriptors = domain.getNewChildDescriptors(null, object);" + NL + "\t\t}" + NL + "" + NL

 			+ "\t\t// Generate actions for selection; populate and redraw the menus." + NL + "\t\t//" + NL

 			+ "\t\tcreateChildActions = generateCreateChildActions(newChildDescriptors, selection);";

-	protected final String TEXT_112 = NL + "\t\tcreateChildSubmenuActions = extractSubmenuActions(createChildActions);";

-	protected final String TEXT_113 = NL

+	protected final String TEXT_122 = NL + "\t\tcreateChildSubmenuActions = extractSubmenuActions(createChildActions);";

+	protected final String TEXT_123 = NL

 			+ "\t\tcreateSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);";

-	protected final String TEXT_114 = NL

+	protected final String TEXT_124 = NL

 			+ "\t\tcreateSiblingSubmenuActions = extractSubmenuActions(createSiblingActions);";

-	protected final String TEXT_115 = NL + NL + "\t\tif (createChildMenuManager != null)" + NL + "\t\t{";

-	protected final String TEXT_116 = NL

+	protected final String TEXT_125 = NL + NL + "\t\tif (createChildMenuManager != null)" + NL + "\t\t{";

+	protected final String TEXT_126 = NL

 			+ "\t\t\tpopulateManager(createChildMenuManager, createChildSubmenuActions, null);";

-	protected final String TEXT_117 = NL + "\t\t\tpopulateManager(createChildMenuManager, createChildActions, null);"

+	protected final String TEXT_127 = NL + "\t\t\tpopulateManager(createChildMenuManager, createChildActions, null);"

 			+ NL + "\t\t\tcreateChildMenuManager.update(true);" + NL + "\t\t}" + NL

 			+ "\t\tif (createSiblingMenuManager != null)" + NL + "\t\t{";

-	protected final String TEXT_118 = NL

+	protected final String TEXT_128 = NL

 			+ "\t\t\tpopulateManager(createSiblingMenuManager, createSiblingSubmenuActions, null);";

-	protected final String TEXT_119 = NL

+	protected final String TEXT_129 = NL

 			+ "\t\t\tpopulateManager(createSiblingMenuManager, createSiblingActions, null);" + NL

 			+ "\t\t\tcreateSiblingMenuManager.update(true);" + NL + "\t\t}";

-	protected final String TEXT_120 = NL + "\t\t// Add your contributions." + NL

+	protected final String TEXT_130 = NL + "\t\t// Add your contributions." + NL

 			+ "\t\t// Ensure that you remove @generated or mark it @generated NOT";

-	protected final String TEXT_121 = NL + "\t}" + NL;

-	protected final String TEXT_122 = NL + "\t/**" + NL

+	protected final String TEXT_131 = NL + "\t}" + NL;

+	protected final String TEXT_132 = NL + "\t/**" + NL

 			+ "\t * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,"

 			+ NL + "\t * and returns the collection of these actions." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";

-	protected final String TEXT_123 = " generateCreateChildActions(";

-	protected final String TEXT_124 = " descriptors, ";

-	protected final String TEXT_125 = " selection)" + NL + "\t{" + NL + "\t\t";

-	protected final String TEXT_126 = " actions = new ";

-	protected final String TEXT_127 = "();" + NL + "\t\tif (descriptors != null)" + NL + "\t\t{";

-	protected final String TEXT_128 = NL + "\t\t\tfor (";

-	protected final String TEXT_129 = " descriptor : descriptors)";

-	protected final String TEXT_130 = " i = descriptors.iterator(); i.hasNext(); )";

-	protected final String TEXT_131 = NL + "\t\t\t{" + NL + "\t\t\t\tactions.add(new ";

-	protected final String TEXT_132 = "(activeEditorPart, selection, ";

-	protected final String TEXT_133 = "descriptor";

-	protected final String TEXT_134 = "i.next()";

-	protected final String TEXT_135 = "));" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn actions;" + NL + "\t}"

+	protected final String TEXT_133 = " generateCreateChildActions(";

+	protected final String TEXT_134 = " descriptors, ";

+	protected final String TEXT_135 = " selection)" + NL + "\t{" + NL + "\t\t";

+	protected final String TEXT_136 = " actions = new ";

+	protected final String TEXT_137 = "();" + NL + "\t\tif (descriptors != null)" + NL + "\t\t{";

+	protected final String TEXT_138 = NL + "\t\t\tfor (";

+	protected final String TEXT_139 = " descriptor : descriptors)";

+	protected final String TEXT_140 = " i = descriptors.iterator(); i.hasNext(); )";

+	protected final String TEXT_141 = NL + "\t\t\t{" + NL + "\t\t\t\tactions.add(new ";

+	protected final String TEXT_142 = "(activeEditorPart, selection, ";

+	protected final String TEXT_143 = "descriptor";

+	protected final String TEXT_144 = "i.next()";

+	protected final String TEXT_145 = "));" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn actions;" + NL + "\t}"

 			+ NL + "" + NL + "\t/**" + NL

 			+ "\t * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,"

 			+ NL + "\t * and returns the collection of these actions." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";

-	protected final String TEXT_136 = " generateCreateSiblingActions(";

-	protected final String TEXT_137 = "));" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn actions;" + NL + "\t}"

+	protected final String TEXT_146 = " generateCreateSiblingActions(";

+	protected final String TEXT_147 = "));" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn actions;" + NL + "\t}"

 			+ NL + "" + NL + "\t/**" + NL

 			+ "\t * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s"

 			+ NL

@@ -276,15 +287,15 @@
 			+ "\t * If <code>contributionID</code> is <code>null</code>, they are simply added." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected void populateManager(";

-	protected final String TEXT_138 = " manager, ";

-	protected final String TEXT_139 = " actions, String contributionID)" + NL + "\t{" + NL + "\t\tif (actions != null)"

+	protected final String TEXT_148 = " manager, ";

+	protected final String TEXT_149 = " actions, String contributionID)" + NL + "\t{" + NL + "\t\tif (actions != null)"

 			+ NL + "\t\t{";

-	protected final String TEXT_140 = " action : actions)";

-	protected final String TEXT_141 = " i = actions.iterator(); i.hasNext(); )";

-	protected final String TEXT_142 = NL + "\t\t\t{";

-	protected final String TEXT_143 = NL + "\t\t\t\t";

-	protected final String TEXT_144 = " action = (IAction)i.next();";

-	protected final String TEXT_145 = NL + "\t\t\t\tif (contributionID != null)" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_150 = " action : actions)";

+	protected final String TEXT_151 = " i = actions.iterator(); i.hasNext(); )";

+	protected final String TEXT_152 = NL + "\t\t\t{";

+	protected final String TEXT_153 = NL + "\t\t\t\t";

+	protected final String TEXT_154 = " action = (IAction)i.next();";

+	protected final String TEXT_155 = NL + "\t\t\t\tif (contributionID != null)" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\tmanager.insertBefore(contributionID, action);" + NL + "\t\t\t\t}" + NL + "\t\t\t\telse" + NL

 			+ "\t\t\t\t{" + NL + "\t\t\t\t\tmanager.add(action);" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t}"

 			+ NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL

@@ -293,42 +304,42 @@
 			+ "\t * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */" + NL + "\tprotected void depopulateManager(";

-	protected final String TEXT_146 = " actions)" + NL + "\t{" + NL + "\t\tif (actions != null)" + NL + "\t\t{" + NL

+	protected final String TEXT_156 = " actions)" + NL + "\t{" + NL + "\t\tif (actions != null)" + NL + "\t\t{" + NL

 			+ "\t\t\t";

-	protected final String TEXT_147 = "[] items = manager.getItems();" + NL

+	protected final String TEXT_157 = "[] items = manager.getItems();" + NL

 			+ "\t\t\tfor (int i = 0; i < items.length; i++)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\t// Look into SubContributionItems" + NL + "\t\t\t\t//" + NL + "\t\t\t\t";

-	protected final String TEXT_148 = " contributionItem = items[i];" + NL

+	protected final String TEXT_158 = " contributionItem = items[i];" + NL

 			+ "\t\t\t\twhile (contributionItem instanceof ";

-	protected final String TEXT_149 = ")" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\tcontributionItem = ((";

-	protected final String TEXT_150 = ")contributionItem).getInnerItem();" + NL + "\t\t\t\t}" + NL + "" + NL

+	protected final String TEXT_159 = ")" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\tcontributionItem = ((";

+	protected final String TEXT_160 = ")contributionItem).getInnerItem();" + NL + "\t\t\t\t}" + NL + "" + NL

 			+ "\t\t\t\t// Delete the ActionContributionItems with matching action." + NL + "\t\t\t\t//" + NL

 			+ "\t\t\t\tif (contributionItem instanceof ";

-	protected final String TEXT_151 = " action = ((";

-	protected final String TEXT_152 = ")contributionItem).getAction();" + NL + "\t\t\t\t\tif (actions.contains(action))"

+	protected final String TEXT_161 = " action = ((";

+	protected final String TEXT_162 = ")contributionItem).getAction();" + NL + "\t\t\t\t\tif (actions.contains(action))"

 			+ NL + "\t\t\t\t\t{" + NL + "\t\t\t\t\t\tmanager.remove(contributionItem);" + NL + "\t\t\t\t\t}" + NL

 			+ "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL;

-	protected final String TEXT_153 = NL + "\t/**" + NL

+	protected final String TEXT_163 = NL + "\t/**" + NL

 			+ "\t * This extracts those actions in the <code>submenuActions</code> collection whose text is qualified and returns"

 			+ NL + "\t * a map of these actions, keyed by submenu text." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";

-	protected final String TEXT_154 = " extractSubmenuActions(";

-	protected final String TEXT_155 = " createActions)" + NL + "\t{" + NL + "\t\t";

-	protected final String TEXT_156 = " createSubmenuActions = new ";

-	protected final String TEXT_157 = "();" + NL + "\t\tif (createActions != null)" + NL + "\t\t{" + NL + "\t\t\tfor (";

-	protected final String TEXT_158 = " actions = createActions.iterator(); actions.hasNext(); )" + NL + "\t\t\t{" + NL

+	protected final String TEXT_164 = " extractSubmenuActions(";

+	protected final String TEXT_165 = " createActions)" + NL + "\t{" + NL + "\t\t";

+	protected final String TEXT_166 = " createSubmenuActions = new ";

+	protected final String TEXT_167 = "();" + NL + "\t\tif (createActions != null)" + NL + "\t\t{" + NL + "\t\t\tfor (";

+	protected final String TEXT_168 = " actions = createActions.iterator(); actions.hasNext(); )" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\t";

-	protected final String TEXT_159 = " action = ";

-	protected final String TEXT_160 = ")";

-	protected final String TEXT_161 = "actions.next();" + NL + "\t\t\t\t";

-	protected final String TEXT_162 = " st = new ";

-	protected final String TEXT_163 = "(action.getText(), \"|\");";

-	protected final String TEXT_164 = NL + "\t\t\t\tif (st.countTokens() == 2)" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_169 = " action = ";

+	protected final String TEXT_170 = ")";

+	protected final String TEXT_171 = "actions.next();" + NL + "\t\t\t\t";

+	protected final String TEXT_172 = " st = new ";

+	protected final String TEXT_173 = "(action.getText(), \"|\");";

+	protected final String TEXT_174 = NL + "\t\t\t\tif (st.countTokens() == 2)" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\tString text = st.nextToken().trim();" + NL + "\t\t\t\t\t";

-	protected final String TEXT_165 = " submenuActions = ";

-	protected final String TEXT_166 = "createSubmenuActions.get(text);" + NL + "\t\t\t\t\tif (submenuActions == null)"

+	protected final String TEXT_175 = " submenuActions = ";

+	protected final String TEXT_176 = "createSubmenuActions.get(text);" + NL + "\t\t\t\t\tif (submenuActions == null)"

 			+ NL + "\t\t\t\t\t{" + NL + "\t\t\t\t\t\tcreateSubmenuActions.put(text, submenuActions = new ";

-	protected final String TEXT_167 = "());" + NL + "\t\t\t\t\t}" + NL

+	protected final String TEXT_177 = "());" + NL + "\t\t\t\t\t}" + NL

 			+ "\t\t\t\t\taction.setText(st.nextToken().trim());" + NL + "\t\t\t\t\tsubmenuActions.add(action);" + NL

 			+ "\t\t\t\t\tactions.remove();" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t}" + NL

 			+ "\t\treturn createSubmenuActions;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

@@ -341,19 +352,19 @@
 			+ "\t * If <code>contributionID</code> is <code>null</code>, they are simply added." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected void populateManager(";

-	protected final String TEXT_168 = " submenuActions, String contributionID)" + NL + "\t{" + NL

+	protected final String TEXT_178 = " submenuActions, String contributionID)" + NL + "\t{" + NL

 			+ "\t\tif (submenuActions != null)" + NL + "\t\t{";

-	protected final String TEXT_169 = " entry : submenuActions.entrySet())" + NL + "\t\t\t{";

-	protected final String TEXT_170 = " entries = submenuActions.entrySet().iterator(); entries.hasNext();)" + NL

+	protected final String TEXT_179 = " entry : submenuActions.entrySet())" + NL + "\t\t\t{";

+	protected final String TEXT_180 = " entries = submenuActions.entrySet().iterator(); entries.hasNext();)" + NL

 			+ "\t\t\t{" + NL + "\t\t\t\t";

-	protected final String TEXT_171 = " entry = (";

-	protected final String TEXT_172 = ")entries.next();";

-	protected final String TEXT_173 = "(String)";

-	protected final String TEXT_174 = "entry.getKey());" + NL + "\t\t\t\tif (contributionID != null)" + NL + "\t\t\t\t{"

+	protected final String TEXT_181 = " entry = (";

+	protected final String TEXT_182 = ")entries.next();";

+	protected final String TEXT_183 = "(String)";

+	protected final String TEXT_184 = "entry.getKey());" + NL + "\t\t\t\tif (contributionID != null)" + NL + "\t\t\t\t{"

 			+ NL + "\t\t\t\t\tmanager.insertBefore(contributionID, submenuManager);" + NL + "\t\t\t\t}" + NL

 			+ "\t\t\t\telse" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\tmanager.add(submenuManager);" + NL + "\t\t\t\t}" + NL

 			+ "\t\t\t\tpopulateManager(submenuManager, ";

-	protected final String TEXT_175 = "entry.getValue(), null);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL + ""

+	protected final String TEXT_185 = "entry.getValue(), null);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL + ""

 			+ NL + "\t/**" + NL

 			+ "\t * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.MenuManager}s and their"

 			+ NL

@@ -361,51 +372,51 @@
 			+ NL + "\t * contained in the <code>submenuActions</code> map." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprotected void depopulateManager(";

-	protected final String TEXT_176 = " submenuActions)" + NL + "\t{" + NL + "\t\tif (submenuActions != null)" + NL

+	protected final String TEXT_186 = " submenuActions)" + NL + "\t{" + NL + "\t\tif (submenuActions != null)" + NL

 			+ "\t\t{" + NL + "\t\t\t";

-	protected final String TEXT_177 = "[] items = manager.getItems();" + NL

+	protected final String TEXT_187 = "[] items = manager.getItems();" + NL

 			+ "\t\t\tfor (int i = 0; i < items.length; i++)" + NL + "\t\t\t{" + NL + "\t\t\t\t";

-	protected final String TEXT_178 = " contributionItem = items[i];" + NL + "\t\t\t\tif (contributionItem instanceof ";

-	protected final String TEXT_179 = " submenuManager = (";

-	protected final String TEXT_180 = ")contributionItem;" + NL

+	protected final String TEXT_188 = " contributionItem = items[i];" + NL + "\t\t\t\tif (contributionItem instanceof ";

+	protected final String TEXT_189 = " submenuManager = (";

+	protected final String TEXT_190 = ")contributionItem;" + NL

 			+ "\t\t\t\t\tif (submenuActions.containsKey(submenuManager.getMenuText()))" + NL + "\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\tdepopulateManager(submenuManager, ";

-	protected final String TEXT_181 = "submenuActions.get(contributionItem));" + NL

+	protected final String TEXT_191 = "submenuActions.get(submenuManager.getMenuText()));" + NL

 			+ "\t\t\t\t\t\tmanager.remove(contributionItem);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t}"

 			+ NL + "\t\t}" + NL + "\t}" + NL;

-	protected final String TEXT_182 = NL + "\t/**" + NL + "\t * This populates the pop-up menu before it appears." + NL

+	protected final String TEXT_192 = NL + "\t/**" + NL + "\t * This populates the pop-up menu before it appears." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_183 = NL + "\tpublic void menuAboutToShow(";

-	protected final String TEXT_184 = " menuManager)" + NL + "\t{" + NL + "\t\tsuper.menuAboutToShow(menuManager);";

-	protected final String TEXT_185 = NL + "\t\t";

-	protected final String TEXT_186 = " submenuManager = null;" + NL + "" + NL + "\t\tsubmenuManager = new ";

-	protected final String TEXT_187 = NL + "\t\tpopulateManager(submenuManager, createChildSubmenuActions, null);";

-	protected final String TEXT_188 = NL + "\t\tpopulateManager(submenuManager, createChildActions, null);" + NL

+	protected final String TEXT_193 = NL + "\tpublic void menuAboutToShow(";

+	protected final String TEXT_194 = " menuManager)" + NL + "\t{" + NL + "\t\tsuper.menuAboutToShow(menuManager);";

+	protected final String TEXT_195 = NL + "\t\t";

+	protected final String TEXT_196 = " submenuManager = null;" + NL + "" + NL + "\t\tsubmenuManager = new ";

+	protected final String TEXT_197 = NL + "\t\tpopulateManager(submenuManager, createChildSubmenuActions, null);";

+	protected final String TEXT_198 = NL + "\t\tpopulateManager(submenuManager, createChildActions, null);" + NL

 			+ "\t\tmenuManager.insertBefore(\"edit\", submenuManager);";

-	protected final String TEXT_189 = NL + NL + "\t\tsubmenuManager = new ";

-	protected final String TEXT_190 = NL + "\t\tpopulateManager(submenuManager, createSiblingSubmenuActions, null);";

-	protected final String TEXT_191 = NL + "\t\tpopulateManager(submenuManager, createSiblingActions, null);" + NL

+	protected final String TEXT_199 = NL + NL + "\t\tsubmenuManager = new ";

+	protected final String TEXT_200 = NL + "\t\tpopulateManager(submenuManager, createSiblingSubmenuActions, null);";

+	protected final String TEXT_201 = NL + "\t\tpopulateManager(submenuManager, createSiblingActions, null);" + NL

 			+ "\t\tmenuManager.insertBefore(\"edit\", submenuManager);";

-	protected final String TEXT_192 = NL + "\t}" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_202 = NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This inserts global actions before the \"additions-end\" separator." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_193 = NL + "\tprotected void addGlobalActions(";

-	protected final String TEXT_194 = " menuManager)" + NL + "\t{" + NL

+	protected final String TEXT_203 = NL + "\tprotected void addGlobalActions(";

+	protected final String TEXT_204 = " menuManager)" + NL + "\t{" + NL

 			+ "\t\tmenuManager.insertAfter(\"additions-end\", new ";

-	protected final String TEXT_195 = "(\"ui-actions\"));";

-	protected final String TEXT_196 = NL + "\t\tmenuManager.insertAfter(\"ui-actions\", showPropertiesViewAction);";

-	protected final String TEXT_197 = NL + NL

+	protected final String TEXT_205 = "(\"ui-actions\"));";

+	protected final String TEXT_206 = NL + "\t\tmenuManager.insertAfter(\"ui-actions\", showPropertiesViewAction);";

+	protected final String TEXT_207 = NL + NL

 			+ "\t\trefreshViewerAction.setEnabled(refreshViewerAction.isEnabled());\t\t" + NL

 			+ "\t\tmenuManager.insertAfter(\"ui-actions\", refreshViewerAction);";

-	protected final String TEXT_198 = NL + NL + "\t\tsuper.addGlobalActions(menuManager);" + NL + "\t}" + NL + "" + NL

+	protected final String TEXT_208 = NL + NL + "\t\tsuper.addGlobalActions(menuManager);" + NL + "\t}" + NL + "" + NL

 			+ "\t/**" + NL + "\t * This ensures that a delete action will clean up all references to deleted objects."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_199 = NL + "\tprotected boolean removeAllReferencesOnDelete()" + NL + "\t{" + NL

+	protected final String TEXT_209 = NL + "\tprotected boolean removeAllReferencesOnDelete()" + NL + "\t{" + NL

 			+ "\t\treturn true;" + NL + "\t}" + NL + "" + NL + "}";

-	protected final String TEXT_200 = NL;

+	protected final String TEXT_210 = NL;

 

 	public ActionBarContributor() {

 		//Here is the constructor

@@ -441,8 +452,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_200);

-		stringBuffer.append(TEXT_200);

+		stringBuffer.append(TEXT_210);

+		stringBuffer.append(TEXT_210);

 		return stringBuffer.toString();

 	}

 

@@ -514,9 +525,9 @@
 		/**

 		 * Copyright (c) 2002-2007 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

@@ -611,480 +622,513 @@
 			stringBuffer

 					.append(genModel.getImportedName("org.eclipse.emf.common.ui.action.WorkbenchWindowActionDelegate"));

 			stringBuffer.append(TEXT_18);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IAction"));

-			stringBuffer.append(TEXT_19);

-			stringBuffer.append(genPackage.getModelWizardClassName());

+			if (genModel.useInterfaceOverrideAnnotation()) {

+				stringBuffer.append(TEXT_19);

+			}

 			stringBuffer.append(TEXT_20);

-			stringBuffer.append(genPackage.getModelWizardClassName());

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IAction"));

 			stringBuffer.append(TEXT_21);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.StructuredSelection"));

+			stringBuffer.append(genPackage.getModelWizardClassName());

 			stringBuffer.append(TEXT_22);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.wizard.WizardDialog"));

+			stringBuffer.append(genPackage.getModelWizardClassName());

 			stringBuffer.append(TEXT_23);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.wizard.WizardDialog"));

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.StructuredSelection"));

 			stringBuffer.append(TEXT_24);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.wizard.WizardDialog"));

+			stringBuffer.append(TEXT_25);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.wizard.WizardDialog"));

+			stringBuffer.append(TEXT_26);

 		}

-		stringBuffer.append(TEXT_25);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.ui.IEditorPart"));

-		stringBuffer.append(TEXT_26);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.ISelectionProvider"));

 		stringBuffer.append(TEXT_27);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IAction"));

+		stringBuffer.append(genModel.getImportedName("org.eclipse.ui.IEditorPart"));

 		stringBuffer.append(TEXT_28);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Action"));

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.ISelectionProvider"));

 		stringBuffer.append(TEXT_29);

-		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-		stringBuffer.append(TEXT_30);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_31);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_32);

-		}

-		stringBuffer.append(TEXT_33);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_34);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.ui.PartInitException"));

-		stringBuffer.append(TEXT_35);

-		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-		stringBuffer.append(TEXT_36);

 		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IAction"));

-		stringBuffer.append(TEXT_37);

+		stringBuffer.append(TEXT_30);

 		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Action"));

-		stringBuffer.append(TEXT_29);

+		stringBuffer.append(TEXT_31);

+		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+		stringBuffer.append(TEXT_32);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_33);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_34);

+		}

+		stringBuffer.append(TEXT_35);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_36);

+		stringBuffer.append(genModel.getImportedName("org.eclipse.ui.PartInitException"));

+		stringBuffer.append(TEXT_37);

 		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 		stringBuffer.append(TEXT_38);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_31);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_32);

-		}

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IAction"));

 		stringBuffer.append(TEXT_39);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.ui.viewer.IViewerProvider"));

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Action"));

+		stringBuffer.append(TEXT_31);

+		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 		stringBuffer.append(TEXT_40);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_33);

 		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_32);

+			stringBuffer.append(TEXT_34);

 		}

 		stringBuffer.append(TEXT_41);

 		stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.ui.viewer.IViewerProvider"));

 		stringBuffer.append(TEXT_42);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.Viewer"));

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_34);

+		}

 		stringBuffer.append(TEXT_43);

 		stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.ui.viewer.IViewerProvider"));

 		stringBuffer.append(TEXT_44);

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.Viewer"));

+		stringBuffer.append(TEXT_45);

+		stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.ui.viewer.IViewerProvider"));

+		stringBuffer.append(TEXT_46);

 		if (genModel.isCreationCommands()) {

-			stringBuffer.append(TEXT_45);

+			stringBuffer.append(TEXT_47);

 			stringBuffer.append(_CollectionOfIAction);

-			stringBuffer.append(TEXT_46);

+			stringBuffer.append(TEXT_48);

 			if (genModel.isCreationSubmenus()) {

-				stringBuffer.append(TEXT_47);

+				stringBuffer.append(TEXT_49);

 				stringBuffer.append(_MapOfStringToCollectionOfIAction);

-				stringBuffer.append(TEXT_48);

+				stringBuffer.append(TEXT_50);

 			}

-			stringBuffer.append(TEXT_49);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IMenuManager"));

-			stringBuffer.append(TEXT_50);

-			stringBuffer.append(_CollectionOfIAction);

 			stringBuffer.append(TEXT_51);

-			if (genModel.isCreationSubmenus()) {

-				stringBuffer.append(TEXT_52);

-				stringBuffer.append(_MapOfStringToCollectionOfIAction);

-				stringBuffer.append(TEXT_53);

-			}

-			stringBuffer.append(TEXT_54);

 			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IMenuManager"));

-			stringBuffer.append(TEXT_55);

+			stringBuffer.append(TEXT_52);

+			stringBuffer.append(_CollectionOfIAction);

+			stringBuffer.append(TEXT_53);

+			if (genModel.isCreationSubmenus()) {

+				stringBuffer.append(TEXT_54);

+				stringBuffer.append(_MapOfStringToCollectionOfIAction);

+				stringBuffer.append(TEXT_55);

+			}

+			stringBuffer.append(TEXT_56);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IMenuManager"));

+			stringBuffer.append(TEXT_57);

 		}

-		stringBuffer.append(TEXT_56);

-		stringBuffer.append(genPackage.getActionBarContributorClassName());

-		stringBuffer.append(TEXT_57);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.action.LoadResourceAction"));

 		stringBuffer.append(TEXT_58);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.action.ValidateAction"));

+		stringBuffer.append(genPackage.getActionBarContributorClassName());

 		stringBuffer.append(TEXT_59);

+		stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.action.LoadResourceAction"));

+		stringBuffer.append(TEXT_60);

+		stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.action.ValidateAction"));

+		stringBuffer.append(TEXT_61);

 		if (genModel.getDecoration() == GenDecoration.LIVE) {

-			stringBuffer.append(TEXT_60);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.provider.DiagnosticDecorator"));

-			stringBuffer.append(TEXT_61);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 			stringBuffer.append(TEXT_62);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.provider.DiagnosticDecorator"));

+			stringBuffer.append(TEXT_63);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+			stringBuffer.append(TEXT_64);

 		}

-		stringBuffer.append(TEXT_63);

+		stringBuffer.append(TEXT_65);

 		stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.action.ControlAction"));

-		stringBuffer.append(TEXT_64);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_65);

+		stringBuffer.append(TEXT_61);

+		if (genModel.isFindAction()) {

+			stringBuffer.append(TEXT_66);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.action.FindAction"));

+			stringBuffer.append(TEXT_67);

 		}

-		stringBuffer.append(TEXT_66);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IToolBarManager"));

-		stringBuffer.append(TEXT_67);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Separator"));

-		stringBuffer.append(TEXT_68);

-		stringBuffer.append(genPackage.getPrefix().toLowerCase(genModel.getLocale()));

-		stringBuffer.append(TEXT_69);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_70);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Separator"));

-		stringBuffer.append(TEXT_68);

-		stringBuffer.append(genPackage.getPrefix().toLowerCase(genModel.getLocale()));

+		if (genModel.isRevertAction()) {

+			stringBuffer.append(TEXT_68);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.action.RevertAction"));

+			stringBuffer.append(TEXT_61);

+		}

+		if (genModel.isExpandAllAction()) {

+			stringBuffer.append(TEXT_69);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.action.ExpandAllAction"));

+			stringBuffer.append(TEXT_61);

+		}

+		if (genModel.isCollapseAllAction()) {

+			stringBuffer.append(TEXT_70);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.action.CollapseAllAction"));

+			stringBuffer.append(TEXT_61);

+		}

 		stringBuffer.append(TEXT_71);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_72);

 		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_65);

+			stringBuffer.append(TEXT_72);

 		}

 		stringBuffer.append(TEXT_73);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IMenuManager"));

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IToolBarManager"));

 		stringBuffer.append(TEXT_74);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IMenuManager"));

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Separator"));

 		stringBuffer.append(TEXT_75);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

-		stringBuffer.append(TEXT_29);

-		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+		stringBuffer.append(genPackage.getPrefix().toLowerCase(genModel.getLocale()));

 		stringBuffer.append(TEXT_76);

-		stringBuffer.append(genPackage.getEditorClassName());

+		stringBuffer.append(genModel.getNonNLS());

 		stringBuffer.append(TEXT_77);

-		stringBuffer.append(genPackage.getInterfacePackageName());

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Separator"));

+		stringBuffer.append(TEXT_75);

+		stringBuffer.append(genPackage.getPrefix().toLowerCase(genModel.getLocale()));

 		stringBuffer.append(TEXT_78);

 		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(genModel.getNonNLS(2));

 		stringBuffer.append(TEXT_79);

-		stringBuffer.append(genModel.getNonNLS());

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_72);

+		}

 		stringBuffer.append(TEXT_80);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Separator"));

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IMenuManager"));

 		stringBuffer.append(TEXT_81);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_80);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Separator"));

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IMenuManager"));

 		stringBuffer.append(TEXT_82);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_80);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Separator"));

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

+		stringBuffer.append(TEXT_31);

+		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 		stringBuffer.append(TEXT_83);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_80);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Separator"));

+		stringBuffer.append(genPackage.getEditorClassName());

 		stringBuffer.append(TEXT_84);

+		stringBuffer.append(genPackage.getInterfacePackageName());

+		stringBuffer.append(TEXT_85);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(genModel.getNonNLS(2));

+		stringBuffer.append(TEXT_86);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_87);

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Separator"));

+		stringBuffer.append(TEXT_88);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_87);

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Separator"));

+		stringBuffer.append(TEXT_89);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_87);

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Separator"));

+		stringBuffer.append(TEXT_90);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_87);

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Separator"));

+		stringBuffer.append(TEXT_91);

 		stringBuffer.append(genModel.getNonNLS());

 		stringBuffer.append(TEXT_15);

 		if (genModel.isCreationCommands()) {

-			stringBuffer.append(TEXT_85);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

-			stringBuffer.append(TEXT_29);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-			stringBuffer.append(TEXT_86);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_87);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_88);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

-			stringBuffer.append(TEXT_29);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-			stringBuffer.append(TEXT_89);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_90);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_91);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IMenuListener"));

 			stringBuffer.append(TEXT_92);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IMenuManager"));

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

+			stringBuffer.append(TEXT_31);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 			stringBuffer.append(TEXT_93);

-		} else {

+			stringBuffer.append(genModel.getNonNLS());

 			stringBuffer.append(TEXT_94);

-		}

-		stringBuffer.append(TEXT_95);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_65);

-		}

-		stringBuffer.append(TEXT_96);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.ui.IEditorPart"));

-		stringBuffer.append(TEXT_97);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.SelectionChangedEvent"));

-		stringBuffer.append(TEXT_98);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.SelectionChangedEvent"));

-		stringBuffer.append(TEXT_99);

-		if (genModel.isCreationCommands()) {

-			stringBuffer.append(TEXT_100);

-			if (genModel.isCreationSubmenus()) {

-				stringBuffer.append(TEXT_101);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_95);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

+			stringBuffer.append(TEXT_31);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+			stringBuffer.append(TEXT_96);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_97);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_98);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IMenuListener"));

+			stringBuffer.append(TEXT_99);

+			if (genModel.useInterfaceOverrideAnnotation()) {

+				stringBuffer.append(TEXT_100);

 			}

+			stringBuffer.append(TEXT_101);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IMenuManager"));

 			stringBuffer.append(TEXT_102);

-			if (genModel.isCreationSubmenus()) {

-				stringBuffer.append(TEXT_103);

-			}

-			stringBuffer.append(TEXT_104);

-			stringBuffer.append(_CollectionOfAnything);

-			stringBuffer.append(TEXT_105);

-			stringBuffer.append(_CollectionOfAnything);

-			stringBuffer.append(TEXT_106);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.ISelection"));

-			stringBuffer.append(TEXT_107);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.IStructuredSelection"));

-			stringBuffer.append(TEXT_108);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.IStructuredSelection"));

-			stringBuffer.append(TEXT_109);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain"));

-			stringBuffer.append(TEXT_110);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.domain.IEditingDomainProvider"));

-			stringBuffer.append(TEXT_111);

-			if (genModel.isCreationSubmenus()) {

-				stringBuffer.append(TEXT_112);

-			}

-			stringBuffer.append(TEXT_113);

-			if (genModel.isCreationSubmenus()) {

-				stringBuffer.append(TEXT_114);

-			}

-			stringBuffer.append(TEXT_115);

-			if (genModel.isCreationSubmenus()) {

-				stringBuffer.append(TEXT_116);

-			}

-			stringBuffer.append(TEXT_117);

-			if (genModel.isCreationSubmenus()) {

-				stringBuffer.append(TEXT_118);

-			}

-			stringBuffer.append(TEXT_119);

 		} else {

-			stringBuffer.append(TEXT_120);

+			stringBuffer.append(TEXT_103);

 		}

-		stringBuffer.append(TEXT_121);

+		stringBuffer.append(TEXT_104);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_72);

+		}

+		stringBuffer.append(TEXT_105);

+		stringBuffer.append(genModel.getImportedName("org.eclipse.ui.IEditorPart"));

+		stringBuffer.append(TEXT_106);

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.SelectionChangedEvent"));

+		stringBuffer.append(TEXT_107);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_72);

+		}

+		stringBuffer.append(TEXT_108);

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.SelectionChangedEvent"));

+		stringBuffer.append(TEXT_109);

 		if (genModel.isCreationCommands()) {

-			stringBuffer.append(TEXT_122);

-			stringBuffer.append(_CollectionOfIAction);

-			stringBuffer.append(TEXT_123);

+			stringBuffer.append(TEXT_110);

+			if (genModel.isCreationSubmenus()) {

+				stringBuffer.append(TEXT_111);

+			}

+			stringBuffer.append(TEXT_112);

+			if (genModel.isCreationSubmenus()) {

+				stringBuffer.append(TEXT_113);

+			}

+			stringBuffer.append(TEXT_114);

 			stringBuffer.append(_CollectionOfAnything);

-			stringBuffer.append(TEXT_124);

+			stringBuffer.append(TEXT_115);

+			stringBuffer.append(_CollectionOfAnything);

+			stringBuffer.append(TEXT_116);

 			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.ISelection"));

+			stringBuffer.append(TEXT_117);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.IStructuredSelection"));

+			stringBuffer.append(TEXT_118);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.IStructuredSelection"));

+			stringBuffer.append(TEXT_119);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain"));

+			stringBuffer.append(TEXT_120);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.domain.IEditingDomainProvider"));

+			stringBuffer.append(TEXT_121);

+			if (genModel.isCreationSubmenus()) {

+				stringBuffer.append(TEXT_122);

+			}

+			stringBuffer.append(TEXT_123);

+			if (genModel.isCreationSubmenus()) {

+				stringBuffer.append(TEXT_124);

+			}

 			stringBuffer.append(TEXT_125);

-			stringBuffer.append(_CollectionOfIAction);

-			stringBuffer.append(TEXT_126);

-			stringBuffer.append(_ArrayListOfIAction);

+			if (genModel.isCreationSubmenus()) {

+				stringBuffer.append(TEXT_126);

+			}

 			stringBuffer.append(TEXT_127);

-			if (genModel.useGenerics()) {

+			if (genModel.isCreationSubmenus()) {

 				stringBuffer.append(TEXT_128);

-				stringBuffer.append(genModel.getImportedName("java.lang.Object"));

-				stringBuffer.append(TEXT_129);

-			} else {

-				stringBuffer.append(TEXT_128);

-				stringBuffer.append(genModel.getImportedName("java.util.Iterator"));

-				stringBuffer.append(TEXT_130);

 			}

-			stringBuffer.append(TEXT_131);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.action.CreateChildAction"));

+			stringBuffer.append(TEXT_129);

+		} else {

+			stringBuffer.append(TEXT_130);

+		}

+		stringBuffer.append(TEXT_131);

+		if (genModel.isCreationCommands()) {

 			stringBuffer.append(TEXT_132);

-			if (genModel.useGenerics()) {

-				stringBuffer.append(TEXT_133);

-			} else {

-				stringBuffer.append(TEXT_134);

-			}

+			stringBuffer.append(_CollectionOfIAction);

+			stringBuffer.append(TEXT_133);

+			stringBuffer.append(_CollectionOfAnything);

+			stringBuffer.append(TEXT_134);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.ISelection"));

 			stringBuffer.append(TEXT_135);

 			stringBuffer.append(_CollectionOfIAction);

 			stringBuffer.append(TEXT_136);

-			stringBuffer.append(_CollectionOfAnything);

-			stringBuffer.append(TEXT_124);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.ISelection"));

-			stringBuffer.append(TEXT_125);

-			stringBuffer.append(_CollectionOfIAction);

-			stringBuffer.append(TEXT_126);

 			stringBuffer.append(_ArrayListOfIAction);

-			stringBuffer.append(TEXT_127);

-			if (genModel.useGenerics()) {

-				stringBuffer.append(TEXT_128);

-				stringBuffer.append(genModel.getImportedName("java.lang.Object"));

-				stringBuffer.append(TEXT_129);

-			} else {

-				stringBuffer.append(TEXT_128);

-				stringBuffer.append(genModel.getImportedName("java.util.Iterator"));

-				stringBuffer.append(TEXT_130);

-			}

-			stringBuffer.append(TEXT_131);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.action.CreateSiblingAction"));

-			stringBuffer.append(TEXT_132);

-			if (genModel.useGenerics()) {

-				stringBuffer.append(TEXT_133);

-			} else {

-				stringBuffer.append(TEXT_134);

-			}

 			stringBuffer.append(TEXT_137);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionManager"));

-			stringBuffer.append(TEXT_138);

-			stringBuffer.append(_CollectionOfExtendsIAction);

-			stringBuffer.append(TEXT_139);

 			if (genModel.useGenerics()) {

-				stringBuffer.append(TEXT_128);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IAction"));

-				stringBuffer.append(TEXT_140);

+				stringBuffer.append(TEXT_138);

+				stringBuffer.append(genModel.getImportedName("java.lang.Object"));

+				stringBuffer.append(TEXT_139);

 			} else {

-				stringBuffer.append(TEXT_128);

+				stringBuffer.append(TEXT_138);

 				stringBuffer.append(genModel.getImportedName("java.util.Iterator"));

-				stringBuffer.append(TEXT_141);

+				stringBuffer.append(TEXT_140);

 			}

+			stringBuffer.append(TEXT_141);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.action.CreateChildAction"));

 			stringBuffer.append(TEXT_142);

-			if (!genModel.useGenerics()) {

+			if (genModel.useGenerics()) {

 				stringBuffer.append(TEXT_143);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IAction"));

+			} else {

 				stringBuffer.append(TEXT_144);

 			}

 			stringBuffer.append(TEXT_145);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionManager"));

-			stringBuffer.append(TEXT_138);

-			stringBuffer.append(_CollectionOfExtendsIAction);

+			stringBuffer.append(_CollectionOfIAction);

 			stringBuffer.append(TEXT_146);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionItem"));

+			stringBuffer.append(_CollectionOfAnything);

+			stringBuffer.append(TEXT_134);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.ISelection"));

+			stringBuffer.append(TEXT_135);

+			stringBuffer.append(_CollectionOfIAction);

+			stringBuffer.append(TEXT_136);

+			stringBuffer.append(_ArrayListOfIAction);

+			stringBuffer.append(TEXT_137);

+			if (genModel.useGenerics()) {

+				stringBuffer.append(TEXT_138);

+				stringBuffer.append(genModel.getImportedName("java.lang.Object"));

+				stringBuffer.append(TEXT_139);

+			} else {

+				stringBuffer.append(TEXT_138);

+				stringBuffer.append(genModel.getImportedName("java.util.Iterator"));

+				stringBuffer.append(TEXT_140);

+			}

+			stringBuffer.append(TEXT_141);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.action.CreateSiblingAction"));

+			stringBuffer.append(TEXT_142);

+			if (genModel.useGenerics()) {

+				stringBuffer.append(TEXT_143);

+			} else {

+				stringBuffer.append(TEXT_144);

+			}

 			stringBuffer.append(TEXT_147);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionItem"));

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionManager"));

 			stringBuffer.append(TEXT_148);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.SubContributionItem"));

+			stringBuffer.append(_CollectionOfExtendsIAction);

 			stringBuffer.append(TEXT_149);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.SubContributionItem"));

-			stringBuffer.append(TEXT_150);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.ActionContributionItem"));

-			stringBuffer.append(TEXT_42);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IAction"));

-			stringBuffer.append(TEXT_151);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.ActionContributionItem"));

-			stringBuffer.append(TEXT_152);

-			if (genModel.isCreationSubmenus()) {

-				stringBuffer.append(TEXT_153);

-				stringBuffer.append(_MapOfStringToCollectionOfIAction);

-				stringBuffer.append(TEXT_154);

-				stringBuffer.append(_CollectionOfIAction);

-				stringBuffer.append(TEXT_155);

-				stringBuffer.append(_MapOfStringToCollectionOfIAction);

-				stringBuffer.append(TEXT_156);

-				stringBuffer.append(_LinkedHashMapOfStringToCollectionOfIAction);

-				stringBuffer.append(TEXT_157);

-				stringBuffer.append(_IteratorOfIAction);

-				stringBuffer.append(TEXT_158);

+			if (genModel.useGenerics()) {

+				stringBuffer.append(TEXT_138);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IAction"));

-				stringBuffer.append(TEXT_159);

-				if (!genModel.useGenerics()) {

-					stringBuffer.append(TEXT_29);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IAction"));

-					stringBuffer.append(TEXT_160);

-				}

-				stringBuffer.append(TEXT_161);

-				stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));

-				stringBuffer.append(TEXT_162);

-				stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));

+				stringBuffer.append(TEXT_150);

+			} else {

+				stringBuffer.append(TEXT_138);

+				stringBuffer.append(genModel.getImportedName("java.util.Iterator"));

+				stringBuffer.append(TEXT_151);

+			}

+			stringBuffer.append(TEXT_152);

+			if (!genModel.useGenerics()) {

+				stringBuffer.append(TEXT_153);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IAction"));

+				stringBuffer.append(TEXT_154);

+			}

+			stringBuffer.append(TEXT_155);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionManager"));

+			stringBuffer.append(TEXT_148);

+			stringBuffer.append(_CollectionOfExtendsIAction);

+			stringBuffer.append(TEXT_156);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionItem"));

+			stringBuffer.append(TEXT_157);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionItem"));

+			stringBuffer.append(TEXT_158);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.SubContributionItem"));

+			stringBuffer.append(TEXT_159);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.SubContributionItem"));

+			stringBuffer.append(TEXT_160);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.ActionContributionItem"));

+			stringBuffer.append(TEXT_44);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IAction"));

+			stringBuffer.append(TEXT_161);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.ActionContributionItem"));

+			stringBuffer.append(TEXT_162);

+			if (genModel.isCreationSubmenus()) {

 				stringBuffer.append(TEXT_163);

-				stringBuffer.append(genModel.getNonNLS());

+				stringBuffer.append(_MapOfStringToCollectionOfIAction);

 				stringBuffer.append(TEXT_164);

 				stringBuffer.append(_CollectionOfIAction);

 				stringBuffer.append(TEXT_165);

-				if (!genModel.useGenerics()) {

-					stringBuffer.append(TEXT_29);

-					stringBuffer.append(_CollectionOfIAction);

-					stringBuffer.append(TEXT_160);

-				}

+				stringBuffer.append(_MapOfStringToCollectionOfIAction);

 				stringBuffer.append(TEXT_166);

-				stringBuffer.append(_ArrayListOfIAction);

+				stringBuffer.append(_LinkedHashMapOfStringToCollectionOfIAction);

 				stringBuffer.append(TEXT_167);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionManager"));

-				stringBuffer.append(TEXT_138);

-				stringBuffer.append(_MapOfStringToCollectionOfIAction);

+				stringBuffer.append(_IteratorOfIAction);

 				stringBuffer.append(TEXT_168);

-				if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) {

-					stringBuffer.append(TEXT_128);

-					stringBuffer.append(_MapEntryOfStringToCollectionOfIAction);

-					stringBuffer.append(TEXT_169);

-				} else {

-					stringBuffer.append(TEXT_128);

-					stringBuffer.append(genModel.getImportedName("java.util.Iterator"));

+				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IAction"));

+				stringBuffer.append(TEXT_169);

+				if (!genModel.useGenerics()) {

+					stringBuffer.append(TEXT_31);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IAction"));

 					stringBuffer.append(TEXT_170);

-					stringBuffer.append(_MapEntryOfStringToCollectionOfIAction);

-					stringBuffer.append(TEXT_171);

-					stringBuffer.append(_MapEntryOfStringToCollectionOfIAction);

-					stringBuffer.append(TEXT_172);

 				}

-				stringBuffer.append(TEXT_143);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

-				stringBuffer.append(TEXT_75);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

-				stringBuffer.append(TEXT_29);

-				if (!genModel.useGenerics()) {

-					stringBuffer.append(TEXT_173);

-				}

+				stringBuffer.append(TEXT_171);

+				stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));

+				stringBuffer.append(TEXT_172);

+				stringBuffer.append(genModel.getImportedName("java.util.StringTokenizer"));

+				stringBuffer.append(TEXT_173);

+				stringBuffer.append(genModel.getNonNLS());

 				stringBuffer.append(TEXT_174);

-				if (!genModel.useGenerics()) {

-					stringBuffer.append(TEXT_29);

-					stringBuffer.append(_CollectionOfIAction);

-					stringBuffer.append(TEXT_160);

-				}

+				stringBuffer.append(_CollectionOfIAction);

 				stringBuffer.append(TEXT_175);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionManager"));

-				stringBuffer.append(TEXT_138);

-				stringBuffer.append(_MapOfStringToCollectionOfIAction);

-				stringBuffer.append(TEXT_176);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionItem"));

-				stringBuffer.append(TEXT_177);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionItem"));

-				stringBuffer.append(TEXT_178);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

-				stringBuffer.append(TEXT_42);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

-				stringBuffer.append(TEXT_179);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

-				stringBuffer.append(TEXT_180);

 				if (!genModel.useGenerics()) {

-					stringBuffer.append(TEXT_29);

+					stringBuffer.append(TEXT_31);

 					stringBuffer.append(_CollectionOfIAction);

-					stringBuffer.append(TEXT_160);

+					stringBuffer.append(TEXT_170);

 				}

-				stringBuffer.append(TEXT_181);

-			}

-		}

-		stringBuffer.append(TEXT_182);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_65);

-		}

-		stringBuffer.append(TEXT_183);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IMenuManager"));

-		stringBuffer.append(TEXT_184);

-		if (genModel.isCreationCommands()) {

-			stringBuffer.append(TEXT_185);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

-			stringBuffer.append(TEXT_186);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

-			stringBuffer.append(TEXT_29);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-			stringBuffer.append(TEXT_86);

-			stringBuffer.append(genModel.getNonNLS());

-			if (genModel.isCreationSubmenus()) {

+				stringBuffer.append(TEXT_176);

+				stringBuffer.append(_ArrayListOfIAction);

+				stringBuffer.append(TEXT_177);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionManager"));

+				stringBuffer.append(TEXT_148);

+				stringBuffer.append(_MapOfStringToCollectionOfIAction);

+				stringBuffer.append(TEXT_178);

+				if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) {

+					stringBuffer.append(TEXT_138);

+					stringBuffer.append(_MapEntryOfStringToCollectionOfIAction);

+					stringBuffer.append(TEXT_179);

+				} else {

+					stringBuffer.append(TEXT_138);

+					stringBuffer.append(genModel.getImportedName("java.util.Iterator"));

+					stringBuffer.append(TEXT_180);

+					stringBuffer.append(_MapEntryOfStringToCollectionOfIAction);

+					stringBuffer.append(TEXT_181);

+					stringBuffer.append(_MapEntryOfStringToCollectionOfIAction);

+					stringBuffer.append(TEXT_182);

+				}

+				stringBuffer.append(TEXT_153);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

+				stringBuffer.append(TEXT_82);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

+				stringBuffer.append(TEXT_31);

+				if (!genModel.useGenerics()) {

+					stringBuffer.append(TEXT_183);

+				}

+				stringBuffer.append(TEXT_184);

+				if (!genModel.useGenerics()) {

+					stringBuffer.append(TEXT_31);

+					stringBuffer.append(_CollectionOfIAction);

+					stringBuffer.append(TEXT_170);

+				}

+				stringBuffer.append(TEXT_185);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionManager"));

+				stringBuffer.append(TEXT_148);

+				stringBuffer.append(_MapOfStringToCollectionOfIAction);

+				stringBuffer.append(TEXT_186);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionItem"));

 				stringBuffer.append(TEXT_187);

-			}

-			stringBuffer.append(TEXT_188);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_189);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

-			stringBuffer.append(TEXT_29);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-			stringBuffer.append(TEXT_89);

-			stringBuffer.append(genModel.getNonNLS());

-			if (genModel.isCreationSubmenus()) {

+				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IContributionItem"));

+				stringBuffer.append(TEXT_188);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

+				stringBuffer.append(TEXT_44);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

+				stringBuffer.append(TEXT_189);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

 				stringBuffer.append(TEXT_190);

+				if (!genModel.useGenerics()) {

+					stringBuffer.append(TEXT_31);

+					stringBuffer.append(_CollectionOfIAction);

+					stringBuffer.append(TEXT_170);

+				}

+				stringBuffer.append(TEXT_191);

 			}

-			stringBuffer.append(TEXT_191);

-			stringBuffer.append(genModel.getNonNLS());

 		}

 		stringBuffer.append(TEXT_192);

 		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_65);

+			stringBuffer.append(TEXT_72);

 		}

 		stringBuffer.append(TEXT_193);

 		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IMenuManager"));

 		stringBuffer.append(TEXT_194);

+		if (genModel.isCreationCommands()) {

+			stringBuffer.append(TEXT_195);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

+			stringBuffer.append(TEXT_196);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

+			stringBuffer.append(TEXT_31);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+			stringBuffer.append(TEXT_93);

+			stringBuffer.append(genModel.getNonNLS());

+			if (genModel.isCreationSubmenus()) {

+				stringBuffer.append(TEXT_197);

+			}

+			stringBuffer.append(TEXT_198);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_199);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.MenuManager"));

+			stringBuffer.append(TEXT_31);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+			stringBuffer.append(TEXT_96);

+			stringBuffer.append(genModel.getNonNLS());

+			if (genModel.isCreationSubmenus()) {

+				stringBuffer.append(TEXT_200);

+			}

+			stringBuffer.append(TEXT_201);

+			stringBuffer.append(genModel.getNonNLS());

+		}

+		stringBuffer.append(TEXT_202);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_72);

+		}

+		stringBuffer.append(TEXT_203);

+		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.IMenuManager"));

+		stringBuffer.append(TEXT_204);

 		stringBuffer.append(genModel.getImportedName("org.eclipse.jface.action.Separator"));

-		stringBuffer.append(TEXT_195);

+		stringBuffer.append(TEXT_205);

 		stringBuffer.append(genModel.getNonNLS());

 		stringBuffer.append(genModel.getNonNLS(2));

-		stringBuffer.append(TEXT_196);

+		stringBuffer.append(TEXT_206);

 		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_197);

+		stringBuffer.append(TEXT_207);

 		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_198);

+		stringBuffer.append(TEXT_208);

 		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_65);

+			stringBuffer.append(TEXT_72);

 		}

-		stringBuffer.append(TEXT_199);

+		stringBuffer.append(TEXT_209);

 		genModel.emitSortedImports();

 		stringBuffer.append(TEXT_15);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
index 79f0c25..218c57b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Advisor.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -110,9 +110,11 @@
 			+ "\tpublic static class Application implements IApplication" + NL + "\t{" + NL + "\t\t/**" + NL

 			+ "\t\t * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)" + NL

 			+ "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL

-			+ "\t\t */" + NL + "\t\tpublic Object start(IApplicationContext context) throws Exception" + NL + "\t\t{"

-			+ NL + "\t\t\tWorkbenchAdvisor workbenchAdvisor = new ";

-	protected final String TEXT_41 = "();" + NL + "\t\t\tDisplay display = PlatformUI.createDisplay();" + NL

+			+ "\t\t */";

+	protected final String TEXT_41 = NL + "\t\t@Override";

+	protected final String TEXT_42 = NL + "\t\tpublic Object start(IApplicationContext context) throws Exception" + NL

+			+ "\t\t{" + NL + "\t\t\tWorkbenchAdvisor workbenchAdvisor = new ";

+	protected final String TEXT_43 = "();" + NL + "\t\t\tDisplay display = PlatformUI.createDisplay();" + NL

 			+ "\t\t\ttry" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tint returnCode = PlatformUI.createAndRunWorkbench(display, workbenchAdvisor);" + NL

 			+ "\t\t\t\tif (returnCode == PlatformUI.RETURN_RESTART)" + NL + "\t\t\t\t{" + NL

@@ -121,23 +123,25 @@
 			+ NL + "\t\t\t{" + NL + "\t\t\t\tdisplay.dispose();" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "" + NL

 			+ "\t\t/**" + NL + "\t\t * @see org.eclipse.equinox.app.IApplication#stop()" + NL

 			+ "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL

-			+ "\t\t */" + NL + "\t\tpublic void stop()" + NL + "\t\t{" + NL + "\t\t\t// Do nothing." + NL + "\t\t}" + NL

-			+ "\t}" + NL + "" + NL + "\t/**" + NL + "\t * RCP's perspective" + NL + "\t * <!-- begin-user-doc -->" + NL

-			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

-			+ "\tpublic static class Perspective implements IPerspectiveFactory" + NL + "\t{" + NL + "\t\t/**" + NL

+			+ "\t\t */";

+	protected final String TEXT_44 = NL + "\t\tpublic void stop()" + NL + "\t\t{" + NL + "\t\t\t// Do nothing." + NL

+			+ "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * RCP's perspective" + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

+			+ NL + "\tpublic static class Perspective implements IPerspectiveFactory" + NL + "\t{" + NL + "\t\t/**" + NL

 			+ "\t\t * Perspective ID" + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL

 			+ "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic static final String ID_PERSPECTIVE = \"";

-	protected final String TEXT_42 = "Perspective\";";

-	protected final String TEXT_43 = NL + NL + "\t\t/**" + NL

+	protected final String TEXT_45 = "Perspective\";";

+	protected final String TEXT_46 = NL + NL + "\t\t/**" + NL

 			+ "\t\t * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)" + NL

 			+ "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL

-			+ "\t\t */" + NL + "\t\tpublic void createInitialLayout(IPageLayout layout)" + NL + "\t\t{" + NL

+			+ "\t\t */";

+	protected final String TEXT_47 = NL + "\t\tpublic void createInitialLayout(IPageLayout layout)" + NL + "\t\t{" + NL

 			+ "\t\t\tlayout.setEditorAreaVisible(true);" + NL + "\t\t\tlayout.addPerspectiveShortcut(ID_PERSPECTIVE);"

 			+ NL + "" + NL

 			+ "\t\t\tIFolderLayout right = layout.createFolder(\"right\", IPageLayout.RIGHT, (float)0.66, layout.getEditorArea());";

-	protected final String TEXT_44 = NL + "\t\t\tright.addView(IPageLayout.ID_OUTLINE);" + NL + "" + NL

+	protected final String TEXT_48 = NL + "\t\t\tright.addView(IPageLayout.ID_OUTLINE);" + NL + "" + NL

 			+ "\t\t\tIFolderLayout bottonRight = layout.createFolder(\"bottonRight\", IPageLayout.BOTTOM, (float)0.60, \"right\");";

-	protected final String TEXT_45 = NL + "\t\t\tbottonRight.addView(IPageLayout.ID_PROP_SHEET);" + NL + "\t\t}" + NL

+	protected final String TEXT_49 = NL + "\t\t\tbottonRight.addView(IPageLayout.ID_PROP_SHEET);" + NL + "\t\t}" + NL

 			+ "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * RCP's window advisor" + NL + "\t * <!-- begin-user-doc -->"

 			+ NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tpublic static class WindowAdvisor extends WorkbenchWindowAdvisor" + NL + "\t{" + NL + "\t\t/**" + NL

@@ -148,17 +152,16 @@
 			+ "\t\t * @see org.eclipse.ui.application.WorkbenchWindowAdvisor#preWindowOpen()" + NL

 			+ "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL

 			+ "\t\t */";

-	protected final String TEXT_46 = NL + "\t\t@Override";

-	protected final String TEXT_47 = NL + "\t\tpublic void preWindowOpen()" + NL + "\t\t{" + NL

+	protected final String TEXT_50 = NL + "\t\tpublic void preWindowOpen()" + NL + "\t\t{" + NL

 			+ "\t\t\tIWorkbenchWindowConfigurer configurer = getWindowConfigurer();" + NL

 			+ "\t\t\tconfigurer.setInitialSize(new Point(600, 450));" + NL + "\t\t\tconfigurer.setShowCoolBar(false);"

 			+ NL + "\t\t\tconfigurer.setShowStatusLine(true);" + NL

 			+ "\t\t\tconfigurer.setTitle(getString(\"_UI_Application_title\"));";

-	protected final String TEXT_48 = NL + "\t\t}" + NL + "\t\t" + NL + "\t\t/**" + NL

+	protected final String TEXT_51 = NL + "\t\t}" + NL + "\t\t" + NL + "\t\t/**" + NL

 			+ "\t\t * @see org.eclipse.ui.application.WorkbenchWindowAdvisor#createActionBarAdvisor(org.eclipse.ui.application.IActionBarConfigurer)"

 			+ NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated"

 			+ NL + "\t\t */";

-	protected final String TEXT_49 = NL

+	protected final String TEXT_52 = NL

 			+ "\t\tpublic ActionBarAdvisor createActionBarAdvisor(IActionBarConfigurer configurer)" + NL + "\t\t{" + NL

 			+ "\t\t\treturn new WindowActionBarAdvisor(configurer);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL

 			+ "\t/**" + NL + "\t * RCP's action bar advisor" + NL + "\t * <!-- begin-user-doc -->" + NL

@@ -171,7 +174,7 @@
 			+ "\t\t * @see org.eclipse.ui.application.ActionBarAdvisor#fillMenuBar(org.eclipse.jface.action.IMenuManager)"

 			+ NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated"

 			+ NL + "\t\t */";

-	protected final String TEXT_50 = NL + "\t\tprotected void fillMenuBar(IMenuManager menuBar)" + NL + "\t\t{" + NL

+	protected final String TEXT_53 = NL + "\t\tprotected void fillMenuBar(IMenuManager menuBar)" + NL + "\t\t{" + NL

 			+ "\t\t\tIWorkbenchWindow window = getActionBarConfigurer().getWindowConfigurer().getWindow();" + NL

 			+ "\t\t\tmenuBar.add(createFileMenu(window));" + NL + "\t\t\tmenuBar.add(createEditMenu(window));" + NL

 			+ "\t\t\tmenuBar.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));" + NL

@@ -181,10 +184,10 @@
 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL

 			+ "\t\tprotected IMenuManager createFileMenu(IWorkbenchWindow window)" + NL + "\t\t{" + NL

 			+ "\t\t\tIMenuManager menu = new MenuManager(getString(\"_UI_Menu_File_label\"),";

-	protected final String TEXT_51 = NL + "\t\t\tIWorkbenchActionConstants.M_FILE);    " + NL

+	protected final String TEXT_54 = NL + "\t\t\tIWorkbenchActionConstants.M_FILE);    " + NL

 			+ "\t\t\tmenu.add(new GroupMarker(IWorkbenchActionConstants.FILE_START));" + NL + "\t" + NL

 			+ "\t\t\tIMenuManager newMenu = new MenuManager(getString(\"_UI_Menu_New_label\"), \"new\");";

-	protected final String TEXT_52 = NL + "\t\t\tnewMenu.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));"

+	protected final String TEXT_55 = NL + "\t\t\tnewMenu.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));"

 			+ NL + "\t" + NL + "\t\t\tmenu.add(newMenu);" + NL + "\t\t\tmenu.add(new Separator());" + NL

 			+ "\t\t\tmenu.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));" + NL

 			+ "\t\t\tmenu.add(new Separator());" + NL

@@ -201,7 +204,7 @@
 			+ "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL

 			+ "\t\t */" + NL + "\t\tprotected IMenuManager createEditMenu(IWorkbenchWindow window)" + NL + "\t\t{" + NL

 			+ "\t\t\tIMenuManager menu = new MenuManager(getString(\"_UI_Menu_Edit_label\"),";

-	protected final String TEXT_53 = NL + "\t\t\tIWorkbenchActionConstants.M_EDIT);" + NL

+	protected final String TEXT_56 = NL + "\t\t\tIWorkbenchActionConstants.M_EDIT);" + NL

 			+ "\t\t\tmenu.add(new GroupMarker(IWorkbenchActionConstants.EDIT_START));" + NL + "\t" + NL

 			+ "\t\t\taddToMenuAndRegister(menu, ActionFactory.UNDO.create(window));" + NL

 			+ "\t\t\taddToMenuAndRegister(menu, ActionFactory.REDO.create(window));" + NL

@@ -222,16 +225,16 @@
 			+ "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL

 			+ "\t\t */" + NL + "\t\tprotected IMenuManager createWindowMenu(IWorkbenchWindow window)" + NL + "\t\t{"

 			+ NL + "\t\t\tIMenuManager menu = new MenuManager(getString(\"_UI_Menu_Window_label\"),";

-	protected final String TEXT_54 = NL + "\t\t\tIWorkbenchActionConstants.M_WINDOW);" + NL + "\t" + NL

+	protected final String TEXT_57 = NL + "\t\t\tIWorkbenchActionConstants.M_WINDOW);" + NL + "\t" + NL

 			+ "\t\t\taddToMenuAndRegister(menu, ActionFactory.OPEN_NEW_WINDOW.create(window));" + NL

 			+ "\t\t\tmenu.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));";

-	protected final String TEXT_55 = NL + "\t\t\tmenu.add(ContributionItemFactory.OPEN_WINDOWS.create(window));";

-	protected final String TEXT_56 = NL + "\t" + NL + "\t\t\treturn menu;" + NL + "\t\t}" + NL + "\t" + NL + "\t\t/**"

+	protected final String TEXT_58 = NL + "\t\t\tmenu.add(ContributionItemFactory.OPEN_WINDOWS.create(window));";

+	protected final String TEXT_59 = NL + "\t" + NL + "\t\t\treturn menu;" + NL + "\t\t}" + NL + "\t" + NL + "\t\t/**"

 			+ NL + "\t\t * Creates the 'Help' menu." + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL

 			+ "\t\tprotected IMenuManager createHelpMenu(IWorkbenchWindow window)" + NL + "\t\t{" + NL

 			+ "\t\t\tIMenuManager menu = new MenuManager(getString(\"_UI_Menu_Help_label\"), IWorkbenchActionConstants.M_HELP);";

-	protected final String TEXT_57 = NL + "\t\t\t// Welcome or intro page would go here" + NL

+	protected final String TEXT_60 = NL + "\t\t\t// Welcome or intro page would go here" + NL

 			+ "\t\t\t// Help contents would go here" + NL + "\t\t\t// Tips and tricks page would go here" + NL

 			+ "\t\t\tmenu.add(new GroupMarker(IWorkbenchActionConstants.HELP_START));" + NL

 			+ "\t\t\tmenu.add(new GroupMarker(IWorkbenchActionConstants.HELP_END));" + NL

@@ -248,37 +251,40 @@
 			+ "\tpublic static class AboutAction extends WorkbenchWindowActionDelegate" + NL + "\t{" + NL + "\t\t/**"

 			+ NL + "\t\t * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)" + NL

 			+ "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL

-			+ "\t\t */" + NL + "\t\tpublic void run(IAction action)" + NL + "\t\t{" + NL

+			+ "\t\t */";

+	protected final String TEXT_61 = NL + "\t\tpublic void run(IAction action)" + NL + "\t\t{" + NL

 			+ "\t\t\tMessageDialog.openInformation(getWindow().getShell(), getString(\"_UI_About_title\"),";

-	protected final String TEXT_58 = NL + "\t\t\tgetString(\"_UI_About_text\"));";

-	protected final String TEXT_59 = NL + "\t\t}" + NL + "\t}" + NL + "\t";

-	protected final String TEXT_60 = NL + "\t/**" + NL + "\t * Open action for the objects from the ";

-	protected final String TEXT_61 = " model." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"

+	protected final String TEXT_62 = NL + "\t\t\tgetString(\"_UI_About_text\"));";

+	protected final String TEXT_63 = NL + "\t\t}" + NL + "\t}" + NL + "\t";

+	protected final String TEXT_64 = NL + "\t/**" + NL + "\t * Open action for the objects from the ";

+	protected final String TEXT_65 = " model." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"

 			+ NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tpublic static class OpenAction extends WorkbenchWindowActionDelegate" + NL + "\t{" + NL + "\t\t/**"

 			+ NL + "\t\t * Opens the editors for the files selected using the file dialog." + NL

 			+ "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL

-			+ "\t\t */" + NL + "\t\tpublic void run(IAction action)" + NL + "\t\t{" + NL

+			+ "\t\t */";

+	protected final String TEXT_66 = NL + "\t\tpublic void run(IAction action)" + NL + "\t\t{" + NL

 			+ "\t\t\tString[] filePaths = openFilePathDialog(getWindow().getShell(), SWT.OPEN, null);" + NL

 			+ "\t\t\tif (filePaths.length > 0)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\topenEditor(getWindow().getWorkbench(), URI.createFileURI(filePaths[0]));" + NL + "\t\t\t}" + NL

 			+ "\t\t}" + NL + "\t}";

-	protected final String TEXT_62 = NL + "\t" + NL + "\t/**" + NL + "\t * Open URI action for the objects from the ";

-	protected final String TEXT_63 = " model." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"

+	protected final String TEXT_67 = NL + "\t" + NL + "\t/**" + NL + "\t * Open URI action for the objects from the ";

+	protected final String TEXT_68 = " model." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"

 			+ NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tpublic static class OpenURIAction extends WorkbenchWindowActionDelegate" + NL + "\t{" + NL + "\t\t/**"

 			+ NL + "\t\t * Opens the editors for the files selected using the LoadResourceDialog." + NL

 			+ "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL

-			+ "\t\t */" + NL + "\t\tpublic void run(IAction action)" + NL + "\t\t{" + NL

+			+ "\t\t */";

+	protected final String TEXT_69 = NL + "\t\tpublic void run(IAction action)" + NL + "\t\t{" + NL

 			+ "\t\t\tLoadResourceAction.LoadResourceDialog loadResourceDialog = new LoadResourceAction.LoadResourceDialog(getWindow().getShell());"

 			+ NL + "\t\t\tif (Window.OK == loadResourceDialog.open())" + NL + "\t\t\t{";

-	protected final String TEXT_64 = NL + "\t\t\t\tfor (URI uri : loadResourceDialog.getURIs())" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_70 = NL + "\t\t\t\tfor (URI uri : loadResourceDialog.getURIs())" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\topenEditor(getWindow().getWorkbench(), uri);" + NL + "\t\t\t\t}";

-	protected final String TEXT_65 = NL

+	protected final String TEXT_71 = NL

 			+ "\t\t\t\tfor (Iterator i = loadResourceDialog.getURIs().iterator(); i.hasNext();)" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\topenEditor(getWindow().getWorkbench(), (URI)i.next());" + NL + "\t\t\t\t}";

-	protected final String TEXT_66 = NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL + "\t";

-	protected final String TEXT_67 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_72 = NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL + "\t";

+	protected final String TEXT_73 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tpublic static String[] openFilePathDialog(Shell shell, int style, String[] fileExtensionFilters)" + NL

 			+ "\t{" + NL

@@ -296,8 +302,8 @@
 			+ "\t\tif (includeGroupFilter || includeAllFilter)" + NL + "\t\t{" + NL

 			+ "\t\t\tint size = fileExtensionFilters.length + offset + (includeAllFilter ? 1 : 0);" + NL

 			+ "\t\t\tString[] allFilters = new String[size];" + NL + "\t\t\t";

-	protected final String TEXT_68 = " group = includeGroupFilter ? new ";

-	protected final String TEXT_69 = "() : null;" + NL + "\t\t\t" + NL

+	protected final String TEXT_74 = " group = includeGroupFilter ? new ";

+	protected final String TEXT_75 = "() : null;" + NL + "\t\t\t" + NL

 			+ "\t\t\tfor (int i = 0; i < fileExtensionFilters.length; i++)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tif (includeGroupFilter)" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\tif (i != 0)" + NL + "\t\t\t\t\t{"

 			+ NL + "\t\t\t\t\t\tgroup.append(';');" + NL + "\t\t\t\t\t}" + NL

@@ -306,7 +312,7 @@
 			+ "\t\t\tif (includeGroupFilter)" + NL + "\t\t\t{" + NL + "\t\t\t\tallFilters[0] = group.toString();" + NL

 			+ "\t\t\t}" + NL + "\t\t\tif (includeAllFilter)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tallFilters[allFilters.length - 1] = \"*.*\";";

-	protected final String TEXT_70 = NL + "\t\t\t}" + NL + "\t\t\t" + NL

+	protected final String TEXT_76 = NL + "\t\t\t}" + NL + "\t\t\t" + NL

 			+ "\t\t\tfileDialog.setFilterExtensions(allFilters);" + NL + "\t\t}" + NL + "\t\telse" + NL + "\t\t{" + NL

 			+ "\t\t\tfileDialog.setFilterExtensions(fileExtensionFilters);" + NL + "\t\t}" + NL

 			+ "\t\tfileDialog.open();" + NL + "\t\t" + NL + "\t\tString[] filenames = fileDialog.getFileNames();" + NL

@@ -327,9 +333,9 @@
 			+ "\t\t\tString filename = path + filenames[i];" + NL + "\t\t\tif (extension != null)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tint dot = filename.lastIndexOf('.');" + NL

 			+ "\t\t\t\tif (dot == -1 || !Arrays.asList(fileExtensionFilters).contains(\"*\" + filename.substring(dot)))";

-	protected final String TEXT_71 = NL + "\t\t\t\t{" + NL + "\t\t\t\t\tfilename += extension;" + NL + "\t\t\t\t}" + NL

+	protected final String TEXT_77 = NL + "\t\t\t\t{" + NL + "\t\t\t\t\tfilename += extension;" + NL + "\t\t\t\t}" + NL

 			+ "\t\t\t}" + NL + "\t\t\tresult[i] = filename;" + NL + "\t\t}" + NL + "\t\treturn result;" + NL + "\t}";

-	protected final String TEXT_72 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_78 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tpublic static boolean openEditor(IWorkbench workbench, URI uri)" + NL + "\t{" + NL

 			+ "\t\tIWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();" + NL

@@ -337,32 +343,32 @@
 			+ "\t\tIEditorDescriptor editorDescriptor = EditUIUtil.getDefaultEditor(uri, null);" + NL

 			+ "\t\tif (editorDescriptor == null)" + NL + "\t\t{" + NL + "\t\t\tMessageDialog.openError(" + NL

 			+ "\t\t\t\tworkbenchWindow.getShell()," + NL + "\t\t\t\tgetString(\"_UI_Error_title\"),";

-	protected final String TEXT_73 = NL + "\t\t\t\tgetString(\"_WARN_No_Editor\", uri.lastSegment()));";

-	protected final String TEXT_74 = NL + "\t\t\treturn false;" + NL + "\t\t}" + NL + "\t\telse" + NL + "\t\t{" + NL

+	protected final String TEXT_79 = NL + "\t\t\t\tgetString(\"_WARN_No_Editor\", uri.lastSegment()));";

+	protected final String TEXT_80 = NL + "\t\t\treturn false;" + NL + "\t\t}" + NL + "\t\telse" + NL + "\t\t{" + NL

 			+ "\t\t\ttry" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tpage.openEditor(new URIEditorInput(uri), editorDescriptor.getId());" + NL + "\t\t\t}" + NL

 			+ "\t\t\tcatch (PartInitException exception)" + NL + "\t\t\t{" + NL + "\t\t\t\tMessageDialog.openError("

 			+ NL + "\t\t\t\t\tworkbenchWindow.getShell()," + NL + "\t\t\t\t\tgetString(\"_UI_OpenEditorError_label\"),";

-	protected final String TEXT_75 = NL + "\t\t\t\t\texception.getMessage());" + NL + "\t\t\t\treturn false;" + NL

+	protected final String TEXT_81 = NL + "\t\t\t\t\texception.getMessage());" + NL + "\t\t\t\treturn false;" + NL

 			+ "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn true;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL

 			+ "\t * @see org.eclipse.ui.application.WorkbenchAdvisor#getInitialWindowPerspectiveId()" + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_76 = NL + "\tpublic String getInitialWindowPerspectiveId()" + NL + "\t{" + NL

+	protected final String TEXT_82 = NL + "\tpublic String getInitialWindowPerspectiveId()" + NL + "\t{" + NL

 			+ "\t\treturn Perspective.ID_PERSPECTIVE;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * @see org.eclipse.ui.application.WorkbenchAdvisor#initialize(org.eclipse.ui.application.IWorkbenchConfigurer)"

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_77 = NL + "\tpublic void initialize(IWorkbenchConfigurer configurer)" + NL + "\t{" + NL

+	protected final String TEXT_83 = NL + "\tpublic void initialize(IWorkbenchConfigurer configurer)" + NL + "\t{" + NL

 			+ "\t\tsuper.initialize(configurer);" + NL + "\t\tconfigurer.setSaveAndRestore(true);" + NL + "\t}" + NL

 			+ "\t" + NL + "\t/**" + NL

 			+ "\t * @see org.eclipse.ui.application.WorkbenchAdvisor#createWorkbenchWindowAdvisor(org.eclipse.ui.application.IWorkbenchWindowConfigurer)"

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_78 = NL

+	protected final String TEXT_84 = NL

 			+ "\tpublic WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer)" + NL

 			+ "\t{" + NL + "\t\treturn new WindowAdvisor(configurer);" + NL + "\t}" + NL + "}";

-	protected final String TEXT_79 = NL;

+	protected final String TEXT_85 = NL;

 

 	public Advisor() {

 		//Here is the constructor

@@ -398,8 +404,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_79);

-		stringBuffer.append(TEXT_79);

+		stringBuffer.append(TEXT_85);

+		stringBuffer.append(TEXT_85);

 		return stringBuffer.toString();

 	}

 

@@ -471,9 +477,9 @@
 		/**

 		 * Copyright (c) 2004-2010 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

@@ -588,94 +594,118 @@
 		stringBuffer.append(TEXT_39);

 		stringBuffer.append(genModel.getQualifiedEditorPluginClassName());

 		stringBuffer.append(TEXT_40);

-		stringBuffer.append(genModel.getEditorAdvisorClassName());

-		stringBuffer.append(TEXT_41);

-		stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_41);

+		}

 		stringBuffer.append(TEXT_42);

-		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(genModel.getEditorAdvisorClassName());

 		stringBuffer.append(TEXT_43);

-		stringBuffer.append(genModel.getNonNLS());

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_41);

+		}

 		stringBuffer.append(TEXT_44);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(genModel.getNonNLS(2));

+		stringBuffer.append(genModel.getQualifiedEditorAdvisorClassName());

 		stringBuffer.append(TEXT_45);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_46);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_46);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_41);

 		}

 		stringBuffer.append(TEXT_47);

 		stringBuffer.append(genModel.getNonNLS());

 		stringBuffer.append(TEXT_48);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_46);

-		}

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(genModel.getNonNLS(2));

 		stringBuffer.append(TEXT_49);

 		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_46);

+			stringBuffer.append(TEXT_41);

 		}

 		stringBuffer.append(TEXT_50);

 		stringBuffer.append(genModel.getNonNLS());

 		stringBuffer.append(TEXT_51);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(genModel.getNonNLS(2));

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_41);

+		}

 		stringBuffer.append(TEXT_52);

-		stringBuffer.append(genModel.getNonNLS());

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_41);

+		}

 		stringBuffer.append(TEXT_53);

 		stringBuffer.append(genModel.getNonNLS());

 		stringBuffer.append(TEXT_54);

-		if (!genModel.isRichAjaxPlatform()) {

-			stringBuffer.append(TEXT_55);

-		}

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(genModel.getNonNLS(2));

+		stringBuffer.append(TEXT_55);

+		stringBuffer.append(genModel.getNonNLS());

 		stringBuffer.append(TEXT_56);

 		stringBuffer.append(genModel.getNonNLS());

 		stringBuffer.append(TEXT_57);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_58);

-		stringBuffer.append(genModel.getNonNLS());

+		if (!genModel.isRichAjaxPlatform()) {

+			stringBuffer.append(TEXT_58);

+		}

 		stringBuffer.append(TEXT_59);

-		if (!genModel.isRichAjaxPlatform()) {

-			stringBuffer.append(TEXT_60);

-			stringBuffer.append(genModel.getModelName());

-			stringBuffer.append(TEXT_61);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_60);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_41);

 		}

+		stringBuffer.append(TEXT_61);

+		stringBuffer.append(genModel.getNonNLS());

 		stringBuffer.append(TEXT_62);

-		stringBuffer.append(genModel.getModelName());

+		stringBuffer.append(genModel.getNonNLS());

 		stringBuffer.append(TEXT_63);

-		if (genModel.useGenerics()) {

-			stringBuffer.append(TEXT_64);

-		} else {

-			stringBuffer.append(TEXT_65);

-		}

-		stringBuffer.append(TEXT_66);

 		if (!genModel.isRichAjaxPlatform()) {

-			stringBuffer.append(TEXT_67);

-			stringBuffer.append(_StringBuilder);

-			stringBuffer.append(TEXT_68);

-			stringBuffer.append(_StringBuilder);

-			stringBuffer.append(TEXT_69);

-			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_64);

+			stringBuffer.append(genModel.getModelName());

+			stringBuffer.append(TEXT_65);

+			if (genModel.useInterfaceOverrideAnnotation()) {

+				stringBuffer.append(TEXT_41);

+			}

+			stringBuffer.append(TEXT_66);

+		}

+		stringBuffer.append(TEXT_67);

+		stringBuffer.append(genModel.getModelName());

+		stringBuffer.append(TEXT_68);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_41);

+		}

+		stringBuffer.append(TEXT_69);

+		if (genModel.useGenerics()) {

 			stringBuffer.append(TEXT_70);

-			stringBuffer.append(genModel.getNonNLS());

+		} else {

 			stringBuffer.append(TEXT_71);

 		}

 		stringBuffer.append(TEXT_72);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_73);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_74);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_75);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_46);

-		}

-		stringBuffer.append(TEXT_76);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_46);

-		}

-		stringBuffer.append(TEXT_77);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_46);

+		if (!genModel.isRichAjaxPlatform()) {

+			stringBuffer.append(TEXT_73);

+			stringBuffer.append(_StringBuilder);

+			stringBuffer.append(TEXT_74);

+			stringBuffer.append(_StringBuilder);

+			stringBuffer.append(TEXT_75);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_76);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_77);

 		}

 		stringBuffer.append(TEXT_78);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_79);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_80);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_81);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_41);

+		}

+		stringBuffer.append(TEXT_82);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_41);

+		}

+		stringBuffer.append(TEXT_83);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_41);

+		}

+		stringBuffer.append(TEXT_84);

 		genModel.emitSortedImports();

 		stringBuffer.append(TEXT_25);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/AppEngineWebXML.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/AppEngineWebXML.java
index 2b3dba9..a43db27 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/AppEngineWebXML.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/AppEngineWebXML.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -32,7 +32,7 @@
 	protected final String TEXT_3 = NL + "<appengine-web-app xmlns=\"http://appengine.google.com/ns/1.0\">" + NL

 			+ "\t<application>";

 	protected final String TEXT_4 = "-editor</application>" + NL + "\t<version>1</version>" + NL

-			+ "</appengine-web-app>" + NL;

+			+ "\t<threadsafe>true</threadsafe>" + NL + "</appengine-web-app>" + NL;

 	protected final String TEXT_5 = NL;

 

 	public AppEngineWebXML() {

@@ -142,9 +142,9 @@
 		/**

 		 * Copyright (c) 2010 Ed Merks and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   Ed Merks - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
index e3a5542..e55a48a 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/BuildProperties.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -32,14 +32,16 @@
 	protected final String TEXT_3 = ",\\" + NL + "               icons/,\\";

 	protected final String TEXT_4 = NL + "               META-INF/,\\";

 	protected final String TEXT_5 = NL + "               plugin.xml,\\";

-	protected final String TEXT_6 = NL + "               plugin.properties" + NL + "jars.compile.order = ";

-	protected final String TEXT_7 = NL + "source.";

-	protected final String TEXT_8 = " = ";

-	protected final String TEXT_9 = NL + "output.";

-	protected final String TEXT_10 = "bin";

-	protected final String TEXT_11 = "war/WEB-INF/classes";

-	protected final String TEXT_12 = NL;

-	protected final String TEXT_13 = NL;

+	protected final String TEXT_6 = NL + "               ";

+	protected final String TEXT_7 = ".properties";

+	protected final String TEXT_8 = NL + "jars.compile.order = ";

+	protected final String TEXT_9 = NL + "source.";

+	protected final String TEXT_10 = " = ";

+	protected final String TEXT_11 = NL + "output.";

+	protected final String TEXT_12 = "bin";

+	protected final String TEXT_13 = "war/WEB-INF/classes";

+	protected final String TEXT_14 = NL;

+	protected final String TEXT_15 = NL;

 

 	public BuildProperties() {

 		//Here is the constructor

@@ -75,8 +77,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_13);

-		stringBuffer.append(TEXT_13);

+		stringBuffer.append(TEXT_15);

+		stringBuffer.append(TEXT_15);

 		return stringBuffer.toString();

 	}

 

@@ -150,9 +152,9 @@
 		/**

 		 * Copyright (c) 2002-2008 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

@@ -186,7 +188,17 @@
 		if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {

 			stringBuffer.append(TEXT_5);

 		}

-		stringBuffer.append(TEXT_6);

+		String editorBundleLocalization = genModel.getEditorBundleLocalization();

+		int index = editorBundleLocalization.indexOf("/");

+		if (index == -1) {

+			stringBuffer.append(TEXT_6);

+			stringBuffer.append(editorBundleLocalization);

+			stringBuffer.append(TEXT_7);

+		} else {

+			stringBuffer.append(TEXT_6);

+			stringBuffer.append(editorBundleLocalization.substring(0, index + 1));

+		}

+		stringBuffer.append(TEXT_8);

 		stringBuffer.append(pluginClassesLocation);

 		boolean first = true;

 		for (Iterator<String> i = sourceFolders.iterator(); i.hasNext();) {

@@ -195,24 +207,24 @@
 				sourceFolder += ",\\";

 			}

 			if (first) {

-				stringBuffer.append(TEXT_7);

+				stringBuffer.append(TEXT_9);

 				stringBuffer.append(pluginClassesLocation);

-				stringBuffer.append(TEXT_8);

+				stringBuffer.append(TEXT_10);

 				stringBuffer.append(sourceFolder);

 				first = false;

 			} else {

 				stringBuffer.append(sourceFolder);

 			}

 		}

-		stringBuffer.append(TEXT_9);

+		stringBuffer.append(TEXT_11);

 		stringBuffer.append(pluginClassesLocation);

-		stringBuffer.append(TEXT_8);

+		stringBuffer.append(TEXT_10);

 		if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {

-			stringBuffer.append(TEXT_10);

+			stringBuffer.append(TEXT_12);

 		} else {

-			stringBuffer.append(TEXT_11);

+			stringBuffer.append(TEXT_13);

 		}

-		stringBuffer.append(TEXT_12);

+		stringBuffer.append(TEXT_14);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
index 4d2d39e..3f422f1 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Editor.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -108,11 +108,10 @@
 			+ "import org.eclipse.emf.common.util.Diagnostic;" + NL + "import org.eclipse.emf.common.util.URI;" + NL;

 	protected final String TEXT_31 = NL + "import org.eclipse.emf.ecore.EObject;" + NL

 			+ "import org.eclipse.emf.ecore.EValidator;";

-	protected final String TEXT_32 = NL + NL + "import org.eclipse.emf.ecore.resource.Resource;";

-	protected final String TEXT_33 = NL + "import org.eclipse.emf.ecore.resource.ResourceSet;";

-	protected final String TEXT_34 = NL + NL + "import org.eclipse.emf.ecore.util.EContentAdapter;" + NL

-			+ "import org.eclipse.emf.ecore.util.EcoreUtil;" + NL + "" + NL

-			+ "import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;" + NL

+	protected final String TEXT_32 = NL + NL + "import org.eclipse.emf.ecore.resource.Resource;" + NL

+			+ "import org.eclipse.emf.ecore.resource.ResourceSet;" + NL + "" + NL

+			+ "import org.eclipse.emf.ecore.util.EContentAdapter;" + NL + "import org.eclipse.emf.ecore.util.EcoreUtil;"

+			+ NL + "" + NL + "import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;" + NL

 			+ "import org.eclipse.emf.edit.domain.EditingDomain;" + NL

 			+ "import org.eclipse.emf.edit.domain.IEditingDomainProvider;" + NL + "" + NL

 			+ "import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;" + NL

@@ -126,52 +125,53 @@
 			+ "import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;" + NL + "" + NL

 			+ "import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;" + NL

 			+ "import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;";

-	protected final String TEXT_35 = NL + "import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;";

-	protected final String TEXT_36 = NL + NL + "import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;";

-	protected final String TEXT_37 = NL + "import org.eclipse.emf.edit.ui.util.EditUIUtil;";

-	protected final String TEXT_38 = NL + NL + "import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;" + NL

+	protected final String TEXT_33 = NL + "import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;";

+	protected final String TEXT_34 = NL + NL + "import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;";

+	protected final String TEXT_35 = NL + "import org.eclipse.emf.edit.ui.util.EditUIUtil;";

+	protected final String TEXT_36 = NL + NL + "import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;" + NL

 			+ "" + NL + "import ";

-	protected final String TEXT_39 = ";" + NL;

-	protected final String TEXT_40 = NL + NL + NL + "/**" + NL + " * This is an example of a ";

-	protected final String TEXT_41 = " model editor." + NL + " * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_37 = ";" + NL;

+	protected final String TEXT_38 = NL + NL + NL + "/**" + NL + " * This is an example of a ";

+	protected final String TEXT_39 = " model editor." + NL + " * <!-- begin-user-doc -->" + NL

 			+ " * <!-- end-user-doc -->";

-	protected final String TEXT_42 = NL + " * ";

-	protected final String TEXT_43 = NL + " * @generated" + NL + " */";

-	protected final String TEXT_44 = NL + "@Deprecated";

-	protected final String TEXT_45 = NL + "public class ";

-	protected final String TEXT_46 = NL + "\textends MultiPageEditorPart" + NL

+	protected final String TEXT_40 = NL + " * ";

+	protected final String TEXT_41 = NL + " * @generated" + NL + " */";

+	protected final String TEXT_42 = NL + "@Deprecated";

+	protected final String TEXT_43 = NL + "public class ";

+	protected final String TEXT_44 = NL + "\textends MultiPageEditorPart" + NL

 			+ "\timplements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider";

-	protected final String TEXT_47 = ", IGotoMarker";

-	protected final String TEXT_48 = NL + "{";

-	protected final String TEXT_49 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_45 = ", IGotoMarker";

+	protected final String TEXT_46 = ", ";

+	protected final String TEXT_47 = NL + "{";

+	protected final String TEXT_48 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static final ";

-	protected final String TEXT_50 = " copyright = ";

-	protected final String TEXT_51 = ";";

-	protected final String TEXT_52 = NL + "\t/**" + NL + "\t * The filters for file extensions supported by the editor."

+	protected final String TEXT_49 = " copyright = ";

+	protected final String TEXT_50 = ";";

+	protected final String TEXT_51 = NL + "\t/**" + NL + "\t * The filters for file extensions supported by the editor."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_53 = NL + "\tpublic static final ";

-	protected final String TEXT_54 = " FILE_EXTENSION_FILTERS = prefixExtensions(";

-	protected final String TEXT_55 = ".FILE_EXTENSIONS, \"*.\");";

-	protected final String TEXT_56 = NL + "\t";

-	protected final String TEXT_57 = ".asList(";

-	protected final String TEXT_58 = ".INSTANCE.getString(\"_UI_";

-	protected final String TEXT_59 = "FilenameExtensions\").split(\"\\\\s*,\\\\s*\")), \"*.\");";

-	protected final String TEXT_60 = NL + "\t/**" + NL

+	protected final String TEXT_52 = NL + "\tpublic static final ";

+	protected final String TEXT_53 = " FILE_EXTENSION_FILTERS = prefixExtensions(";

+	protected final String TEXT_54 = ".FILE_EXTENSIONS, \"*.\");";

+	protected final String TEXT_55 = NL + "\t";

+	protected final String TEXT_56 = ".asList(";

+	protected final String TEXT_57 = ".INSTANCE.getString(\"_UI_";

+	protected final String TEXT_58 = "FilenameExtensions\").split(\"\\\\s*,\\\\s*\")), \"*.\");";

+	protected final String TEXT_59 = NL + "\t/**" + NL

 			+ "\t * Returns a new unmodifiable list containing prefixed versions of the extensions in the given list."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */" + NL + "\tprivate static ";

-	protected final String TEXT_61 = " prefixExtensions(";

-	protected final String TEXT_62 = " extensions, String prefix)" + NL + "\t{" + NL + "\t\t";

-	protected final String TEXT_63 = " result = new ";

-	protected final String TEXT_64 = "();";

-	protected final String TEXT_65 = NL + "\t\tfor (String extension : extensions)" + NL + "\t\t{" + NL

+	protected final String TEXT_60 = " prefixExtensions(";

+	protected final String TEXT_61 = " extensions, String prefix)" + NL + "\t{" + NL + "\t\t";

+	protected final String TEXT_62 = " result = new ";

+	protected final String TEXT_63 = "();";

+	protected final String TEXT_64 = NL + "\t\tfor (String extension : extensions)" + NL + "\t\t{" + NL

 			+ "\t\t\tresult.add(prefix + extension);";

-	protected final String TEXT_66 = NL + "\t\tfor (Iterator iterator = extensions.iterator() ; iterator.hasNext(); )"

+	protected final String TEXT_65 = NL + "\t\tfor (Iterator iterator = extensions.iterator() ; iterator.hasNext(); )"

 			+ NL + "\t\t{" + NL + "\t\t\tresult.add(prefix + (String)iterator.next());";

-	protected final String TEXT_67 = NL + "\t\t}" + NL + "\t\treturn Collections.unmodifiableList(result);" + NL + "\t}"

+	protected final String TEXT_66 = NL + "\t\t}" + NL + "\t\treturn Collections.unmodifiableList(result);" + NL + "\t}"

 			+ NL;

-	protected final String TEXT_68 = NL + "\t/**" + NL

+	protected final String TEXT_67 = NL + "\t/**" + NL

 			+ "\t * This keeps track of the editing domain that is used to track all changes to the model." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected AdapterFactoryEditingDomain editingDomain;" + NL + "" + NL + "\t/**" + NL

@@ -188,13 +188,13 @@
 			+ NL + "\tprotected TreeViewer contentOutlineViewer;" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This is the property sheet page." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";

-	protected final String TEXT_69 = " propertySheetPages = new ";

-	protected final String TEXT_70 = "();" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_68 = " propertySheetPages = new ";

+	protected final String TEXT_69 = "();" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This is the viewer that shadows the selection in the content outline." + NL

 			+ "\t * The parent relation must be correctly defined for this to work." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected TreeViewer selectionViewer;";

-	protected final String TEXT_71 = NL + NL + "\t/**" + NL

+	protected final String TEXT_70 = NL + NL + "\t/**" + NL

 			+ "\t * This inverts the roll of parent and child in the content provider and show parents as a tree." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected TreeViewer parentViewer;" + NL + "" + NL + "\t/**" + NL

@@ -213,7 +213,7 @@
 			+ "\t * This keeps track of the active viewer pane, in the book." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprotected ViewerPane currentViewerPane;";

-	protected final String TEXT_72 = NL + NL + "\t/**" + NL

+	protected final String TEXT_71 = NL + NL + "\t/**" + NL

 			+ "\t * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */" + NL + "\tprotected Viewer currentViewer;" + NL + "" + NL + "\t/**" + NL

@@ -223,52 +223,56 @@
 			+ "\t * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */" + NL + "\tprotected ";

-	protected final String TEXT_73 = " selectionChangedListeners = new ";

-	protected final String TEXT_74 = "();" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_72 = " selectionChangedListeners = new ";

+	protected final String TEXT_73 = "();" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This keeps track of the selection of the editor as a whole." + NL + "\t * <!-- begin-user-doc -->"

 			+ NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprotected ISelection editorSelection = StructuredSelection.EMPTY;" + NL;

-	protected final String TEXT_75 = NL + "\t/**" + NL

+	protected final String TEXT_74 = NL + "\t/**" + NL

 			+ "\t * The MarkerHelper is responsible for creating workspace resource markers presented" + NL

 			+ "\t * in Eclipse's Problems View." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprotected MarkerHelper markerHelper = new EditUIMarkerHelper();" + NL;

-	protected final String TEXT_76 = NL + "\t/**" + NL + "\t * This listens for when the outline becomes active" + NL

+	protected final String TEXT_75 = NL + "\t/**" + NL + "\t * This listens for when the outline becomes active" + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

-			+ NL + "\tprotected IPartListener partListener =" + NL + "\t\tnew IPartListener()" + NL + "\t\t{" + NL

-			+ "\t\t\tpublic void partActivated(IWorkbenchPart p)" + NL + "\t\t\t{" + NL

+			+ NL + "\tprotected IPartListener partListener =" + NL + "\t\tnew IPartListener()" + NL + "\t\t{";

+	protected final String TEXT_76 = NL + "\t\t\t@Override";

+	protected final String TEXT_77 = NL + "\t\t\tpublic void partActivated(IWorkbenchPart p)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tif (p instanceof ContentOutline)" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\tif (((ContentOutline)p).getCurrentPage() == contentOutlinePage)" + NL + "\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\tgetActionBarContributor().setActiveEditor(";

-	protected final String TEXT_77 = ".this);" + NL + "" + NL + "\t\t\t\t\t\tsetCurrentViewer(contentOutlineViewer);"

+	protected final String TEXT_78 = ".this);" + NL + "" + NL + "\t\t\t\t\t\tsetCurrentViewer(contentOutlineViewer);"

 			+ NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t\telse if (p instanceof PropertySheet)" + NL

 			+ "\t\t\t\t{" + NL + "\t\t\t\t\tif (propertySheetPages.contains(((PropertySheet)p).getCurrentPage()))" + NL

 			+ "\t\t\t\t\t{" + NL + "\t\t\t\t\t\tgetActionBarContributor().setActiveEditor(";

-	protected final String TEXT_78 = ".this);" + NL + "\t\t\t\t\t\thandleActivate();" + NL + "\t\t\t\t\t}" + NL

+	protected final String TEXT_79 = ".this);" + NL + "\t\t\t\t\t\thandleActivate();" + NL + "\t\t\t\t\t}" + NL

 			+ "\t\t\t\t}" + NL + "\t\t\t\telse if (p == ";

-	protected final String TEXT_79 = ".this)" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\thandleActivate();" + NL + "\t\t\t\t}"

-			+ NL + "\t\t\t}" + NL + "\t\t\tpublic void partBroughtToTop(IWorkbenchPart p)" + NL + "\t\t\t{" + NL

-			+ "\t\t\t\t// Ignore." + NL + "\t\t\t}" + NL + "\t\t\tpublic void partClosed(IWorkbenchPart p)" + NL

-			+ "\t\t\t{" + NL + "\t\t\t\t// Ignore." + NL + "\t\t\t}" + NL

-			+ "\t\t\tpublic void partDeactivated(IWorkbenchPart p)" + NL + "\t\t\t{" + NL + "\t\t\t\t// Ignore." + NL

-			+ "\t\t\t}" + NL + "\t\t\tpublic void partOpened(IWorkbenchPart p)" + NL + "\t\t\t{" + NL

+	protected final String TEXT_80 = ".this)" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\thandleActivate();" + NL + "\t\t\t\t}"

+			+ NL + "\t\t\t}";

+	protected final String TEXT_81 = NL + "\t\t\tpublic void partBroughtToTop(IWorkbenchPart p)" + NL + "\t\t\t{" + NL

+			+ "\t\t\t\t// Ignore." + NL + "\t\t\t}";

+	protected final String TEXT_82 = NL + "\t\t\tpublic void partClosed(IWorkbenchPart p)" + NL + "\t\t\t{" + NL

+			+ "\t\t\t\t// Ignore." + NL + "\t\t\t}";

+	protected final String TEXT_83 = NL + "\t\t\tpublic void partDeactivated(IWorkbenchPart p)" + NL + "\t\t\t{" + NL

+			+ "\t\t\t\t// Ignore." + NL + "\t\t\t}";

+	protected final String TEXT_84 = NL + "\t\t\tpublic void partOpened(IWorkbenchPart p)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\t// Ignore." + NL + "\t\t\t}" + NL + "\t\t};" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Resources that have been removed since last activation." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";

-	protected final String TEXT_80 = " removedResources = new ";

-	protected final String TEXT_81 = "();" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_85 = " removedResources = new ";

+	protected final String TEXT_86 = "();" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Resources that have been changed since last activation." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";

-	protected final String TEXT_82 = " changedResources = new ";

-	protected final String TEXT_83 = "();" + NL + "" + NL + "\t/**" + NL + "\t * Resources that have been saved." + NL

+	protected final String TEXT_87 = " changedResources = new ";

+	protected final String TEXT_88 = "();" + NL + "" + NL + "\t/**" + NL + "\t * Resources that have been saved." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected ";

-	protected final String TEXT_84 = " savedResources = new ";

-	protected final String TEXT_85 = "();" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_89 = " savedResources = new ";

+	protected final String TEXT_90 = "();" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Map to store the diagnostic associated with a resource." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";

-	protected final String TEXT_86 = " resourceToDiagnosticMap = new ";

-	protected final String TEXT_87 = "();" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_91 = " resourceToDiagnosticMap = new ";

+	protected final String TEXT_92 = "();" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Controls whether the problem indication should be updated." + NL + "\t * <!-- begin-user-doc -->"

 			+ NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprotected boolean updateProblemIndication = true;" + NL + "" + NL + "\t/**" + NL

@@ -276,8 +280,7 @@
 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected EContentAdapter problemIndicationAdapter =" + NL + "\t\tnew EContentAdapter()" + NL

 			+ "\t\t{" + NL + "\t\t\tprotected boolean dispatching;" + NL;

-	protected final String TEXT_88 = NL + "\t\t\t@Override";

-	protected final String TEXT_89 = NL + "\t\t\tpublic void notifyChanged(Notification notification)" + NL + "\t\t\t{"

+	protected final String TEXT_93 = NL + "\t\t\tpublic void notifyChanged(Notification notification)" + NL + "\t\t\t{"

 			+ NL + "\t\t\t\tif (notification.getNotifier() instanceof Resource)" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\tswitch (notification.getFeatureID(Resource.class))" + NL + "\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\tcase Resource.RESOURCE__IS_LOADED:" + NL + "\t\t\t\t\t\tcase Resource.RESOURCE__ERRORS:" + NL

@@ -294,78 +297,84 @@
 			+ "\t\t\tprotected void dispatchUpdateProblemIndication()" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tif (updateProblemIndication && !dispatching)" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\tdispatching = true;" + NL + "\t\t\t\t\tgetSite().getShell().getDisplay().asyncExec" + NL

-			+ "\t\t\t\t\t\t(new Runnable()" + NL + "\t\t\t\t\t\t {" + NL + "\t\t\t\t\t\t\t public void run()" + NL

-			+ "\t\t\t\t\t\t\t {" + NL + "\t\t\t\t\t\t\t\t dispatching = false;" + NL

-			+ "\t\t\t\t\t\t\t\t updateProblemIndication();" + NL + "\t\t\t\t\t\t\t }" + NL + "\t\t\t\t\t\t });" + NL

-			+ "\t\t\t\t}" + NL + "\t\t\t}" + NL;

-	protected final String TEXT_90 = NL + "\t\t\tprotected void setTarget(Resource target)" + NL + "\t\t\t{" + NL

+			+ "\t\t\t\t\t\t(new Runnable()" + NL + "\t\t\t\t\t\t {";

+	protected final String TEXT_94 = NL + "\t\t\t\t\t\t\t @Override";

+	protected final String TEXT_95 = NL + "\t\t\t\t\t\t\t public void run()" + NL + "\t\t\t\t\t\t\t {" + NL

+			+ "\t\t\t\t\t\t\t\t dispatching = false;" + NL + "\t\t\t\t\t\t\t\t updateProblemIndication();" + NL

+			+ "\t\t\t\t\t\t\t }" + NL + "\t\t\t\t\t\t });" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL;

+	protected final String TEXT_96 = NL + "\t\t\tprotected void setTarget(Resource target)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tbasicSetTarget(target);" + NL + "\t\t\t}" + NL;

-	protected final String TEXT_91 = NL + "\t\t\tprotected void unsetTarget(Resource target)" + NL + "\t\t\t{" + NL

+	protected final String TEXT_97 = NL + "\t\t\tprotected void unsetTarget(Resource target)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tbasicUnsetTarget(target);" + NL + "\t\t\t\tresourceToDiagnosticMap.remove(target);" + NL

 			+ "\t\t\t\tdispatchUpdateProblemIndication();" + NL + "\t\t\t}" + NL + "\t\t};";

-	protected final String TEXT_92 = NL + NL + "\t/**" + NL + "\t * This listens for workspace changes." + NL

+	protected final String TEXT_98 = NL + NL + "\t/**" + NL + "\t * This listens for workspace changes." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected IResourceChangeListener resourceChangeListener =" + NL

-			+ "\t\tnew IResourceChangeListener()" + NL + "\t\t{" + NL

-			+ "\t\t\tpublic void resourceChanged(IResourceChangeEvent event)" + NL + "\t\t\t{" + NL

-			+ "\t\t\t\tIResourceDelta delta = event.getDelta();" + NL + "\t\t\t\ttry" + NL + "\t\t\t\t{" + NL

-			+ "\t\t\t\t\tclass ResourceDeltaVisitor implements IResourceDeltaVisitor" + NL + "\t\t\t\t\t{" + NL

-			+ "\t\t\t\t\t\tprotected ResourceSet resourceSet = editingDomain.getResourceSet();" + NL

-			+ "\t\t\t\t\t\tprotected ";

-	protected final String TEXT_93 = "();" + NL + "\t\t\t\t\t\tprotected ";

-	protected final String TEXT_94 = "();" + NL + "" + NL + "\t\t\t\t\t\tpublic boolean visit(";

-	protected final String TEXT_95 = "final ";

-	protected final String TEXT_96 = "IResourceDelta delta)" + NL + "\t\t\t\t\t\t{" + NL

+			+ "\t\tnew IResourceChangeListener()" + NL + "\t\t{";

+	protected final String TEXT_99 = NL + "\t\t\tpublic void resourceChanged(IResourceChangeEvent event)" + NL

+			+ "\t\t\t{" + NL + "\t\t\t\tIResourceDelta delta = event.getDelta();" + NL + "\t\t\t\ttry" + NL

+			+ "\t\t\t\t{" + NL + "\t\t\t\t\tclass ResourceDeltaVisitor implements IResourceDeltaVisitor" + NL

+			+ "\t\t\t\t\t{" + NL + "\t\t\t\t\t\tprotected ResourceSet resourceSet = editingDomain.getResourceSet();"

+			+ NL + "\t\t\t\t\t\tprotected ";

+	protected final String TEXT_100 = "();" + NL + "\t\t\t\t\t\tprotected ";

+	protected final String TEXT_101 = "();" + NL;

+	protected final String TEXT_102 = NL + "\t\t\t\t\t\t@Override";

+	protected final String TEXT_103 = NL + "\t\t\t\t\t\tpublic boolean visit(";

+	protected final String TEXT_104 = "final ";

+	protected final String TEXT_105 = "IResourceDelta delta)" + NL + "\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\tif (delta.getResource().getType() == IResource.FILE)" + NL + "\t\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\t\tif (delta.getKind() == IResourceDelta.REMOVED ||" + NL

 			+ "\t\t\t\t\t\t\t\t    delta.getKind() == IResourceDelta.CHANGED";

-	protected final String TEXT_97 = " && delta.getFlags() != IResourceDelta.MARKERS";

-	protected final String TEXT_98 = ")" + NL + "\t\t\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\t\t\t";

-	protected final String TEXT_99 = "Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);"

+	protected final String TEXT_106 = " && delta.getFlags() != IResourceDelta.MARKERS";

+	protected final String TEXT_107 = ")" + NL + "\t\t\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\t\t\t";

+	protected final String TEXT_108 = "Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);"

 			+ NL + "\t\t\t\t\t\t\t\t\tif (resource != null)" + NL + "\t\t\t\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\t\t\t\tif (delta.getKind() == IResourceDelta.REMOVED)" + NL + "\t\t\t\t\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\t\t\t\t\tremovedResources.add(resource);" + NL + "\t\t\t\t\t\t\t\t\t\t}";

-	protected final String TEXT_100 = NL + "\t\t\t\t\t\t\t\t\t\telse if (!savedResources.remove(resource))" + NL

+	protected final String TEXT_109 = NL + "\t\t\t\t\t\t\t\t\t\telse if (!savedResources.remove(resource))" + NL

 			+ "\t\t\t\t\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\t\t\t\t\tchangedResources.add(resource);" + NL

 			+ "\t\t\t\t\t\t\t\t\t\t}";

-	protected final String TEXT_101 = NL + "\t\t\t\t\t\t\t\t\t\telse" + NL + "\t\t\t\t\t\t\t\t\t\t{" + NL

+	protected final String TEXT_110 = NL + "\t\t\t\t\t\t\t\t\t\telse" + NL + "\t\t\t\t\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\t\t\t\t\tif ((delta.getFlags() & IResourceDelta.MARKERS) != 0)" + NL

 			+ "\t\t\t\t\t\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\t\t\t\t\t\t";

-	protected final String TEXT_102 = ".DiagnosticAdapter.update(resource, markerHelper.getMarkerDiagnostics(resource, (IFile)delta.getResource()";

-	protected final String TEXT_103 = ", false";

-	protected final String TEXT_104 = "));" + NL + "\t\t\t\t\t\t\t\t\t\t\t}" + NL

+	protected final String TEXT_111 = ".DiagnosticAdapter.update(resource, markerHelper.getMarkerDiagnostics(resource, (IFile)delta.getResource()";

+	protected final String TEXT_112 = ", false";

+	protected final String TEXT_113 = "));" + NL + "\t\t\t\t\t\t\t\t\t\t\t}" + NL

 			+ "\t\t\t\t\t\t\t\t\t\t\tif ((delta.getFlags() & IResourceDelta.CONTENT) != 0)" + NL

 			+ "\t\t\t\t\t\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\t\t\t\t\t\tif (!savedResources.remove(resource))" + NL

 			+ "\t\t\t\t\t\t\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\t\t\t\t\t\t\tchangedResources.add(resource);" + NL

 			+ "\t\t\t\t\t\t\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t\t\t\t\t}";

-	protected final String TEXT_105 = NL + "\t\t\t\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t\t\t}" + NL

+	protected final String TEXT_114 = NL + "\t\t\t\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t\t\t}" + NL

 			+ "\t\t\t\t\t\t\t\treturn false;" + NL + "\t\t\t\t\t\t\t}" + NL + "" + NL + "\t\t\t\t\t\t\treturn true;"

 			+ NL + "\t\t\t\t\t\t}" + NL + "" + NL + "\t\t\t\t\t\tpublic ";

-	protected final String TEXT_106 = " getChangedResources()" + NL + "\t\t\t\t\t\t{" + NL

+	protected final String TEXT_115 = " getChangedResources()" + NL + "\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\treturn changedResources;" + NL + "\t\t\t\t\t\t}" + NL + "" + NL + "\t\t\t\t\t\tpublic ";

-	protected final String TEXT_107 = " getRemovedResources()" + NL + "\t\t\t\t\t\t{" + NL

+	protected final String TEXT_116 = " getRemovedResources()" + NL + "\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\treturn removedResources;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}" + NL + "" + NL

 			+ "\t\t\t\t\tfinal ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();" + NL

 			+ "\t\t\t\t\tdelta.accept(visitor);" + NL + "" + NL

 			+ "\t\t\t\t\tif (!visitor.getRemovedResources().isEmpty())" + NL + "\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\tgetSite().getShell().getDisplay().asyncExec" + NL + "\t\t\t\t\t\t\t(new Runnable()" + NL

-			+ "\t\t\t\t\t\t\t {" + NL + "\t\t\t\t\t\t\t\t public void run()" + NL + "\t\t\t\t\t\t\t\t {" + NL

+			+ "\t\t\t\t\t\t\t {";

+	protected final String TEXT_117 = NL + "\t\t\t\t\t\t\t\t @Override";

+	protected final String TEXT_118 = NL + "\t\t\t\t\t\t\t\t public void run()" + NL + "\t\t\t\t\t\t\t\t {" + NL

 			+ "\t\t\t\t\t\t\t\t\t removedResources.addAll(visitor.getRemovedResources());" + NL

 			+ "\t\t\t\t\t\t\t\t\t if (!isDirty())" + NL + "\t\t\t\t\t\t\t\t\t {" + NL

 			+ "\t\t\t\t\t\t\t\t\t\t getSite().getPage().closeEditor(";

-	protected final String TEXT_108 = ".this, false);" + NL + "\t\t\t\t\t\t\t\t\t }" + NL + "\t\t\t\t\t\t\t\t }" + NL

+	protected final String TEXT_119 = ".this, false);" + NL + "\t\t\t\t\t\t\t\t\t }" + NL + "\t\t\t\t\t\t\t\t }" + NL

 			+ "\t\t\t\t\t\t\t });" + NL + "\t\t\t\t\t}" + NL + "" + NL

 			+ "\t\t\t\t\tif (!visitor.getChangedResources().isEmpty())" + NL + "\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\tgetSite().getShell().getDisplay().asyncExec" + NL + "\t\t\t\t\t\t\t(new Runnable()" + NL

-			+ "\t\t\t\t\t\t\t {" + NL + "\t\t\t\t\t\t\t\t public void run()" + NL + "\t\t\t\t\t\t\t\t {" + NL

+			+ "\t\t\t\t\t\t\t {";

+	protected final String TEXT_120 = NL + "\t\t\t\t\t\t\t\t public void run()" + NL + "\t\t\t\t\t\t\t\t {" + NL

 			+ "\t\t\t\t\t\t\t\t\t changedResources.addAll(visitor.getChangedResources());" + NL

 			+ "\t\t\t\t\t\t\t\t\t if (getSite().getPage().getActiveEditor() == ";

-	protected final String TEXT_109 = ".this)" + NL + "\t\t\t\t\t\t\t\t\t {" + NL

+	protected final String TEXT_121 = ".this)" + NL + "\t\t\t\t\t\t\t\t\t {" + NL

 			+ "\t\t\t\t\t\t\t\t\t\t handleActivate();" + NL + "\t\t\t\t\t\t\t\t\t }" + NL + "\t\t\t\t\t\t\t\t }" + NL

 			+ "\t\t\t\t\t\t\t });" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL

 			+ "\t\t\t\tcatch (CoreException exception)" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\t";

-	protected final String TEXT_110 = ".INSTANCE.log(exception);" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t};";

-	protected final String TEXT_111 = NL + NL + "\t/**" + NL

+	protected final String TEXT_122 = ".INSTANCE.log(exception);" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t};";

+	protected final String TEXT_123 = NL + NL + "\t/**" + NL

 			+ "\t * Handles activation of the editor or it's associated views." + NL + "\t * <!-- begin-user-doc -->"

 			+ NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprotected void handleActivate()" + NL + "\t{" + NL + "\t\t// Recompute the read only state." + NL

@@ -375,7 +384,7 @@
 			+ "\t\t  setSelection(getSelection());" + NL + "\t\t}" + NL + "" + NL

 			+ "\t\tif (!removedResources.isEmpty())" + NL + "\t\t{" + NL + "\t\t\tif (handleDirtyConflict())" + NL

 			+ "\t\t\t{" + NL + "\t\t\t\tgetSite().getPage().closeEditor(";

-	protected final String TEXT_112 = ".this, false);" + NL + "\t\t\t}" + NL + "\t\t\telse" + NL + "\t\t\t{" + NL

+	protected final String TEXT_124 = ".this, false);" + NL + "\t\t\t}" + NL + "\t\t\telse" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tremovedResources.clear();" + NL + "\t\t\t\tchangedResources.clear();" + NL

 			+ "\t\t\t\tsavedResources.clear();" + NL + "\t\t\t}" + NL + "\t\t}" + NL

 			+ "\t\telse if (!changedResources.isEmpty())" + NL + "\t\t{" + NL

@@ -385,38 +394,38 @@
 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected void handleChangedResources()" + NL + "\t{" + NL

 			+ "\t\tif (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict()))" + NL + "\t\t{" + NL

-			+ "\t\t\tif (isDirty())" + NL + "\t\t\t{" + NL

-			+ "\t\t\t\tchangedResources.addAll(editingDomain.getResourceSet().getResources());" + NL + "\t\t\t}" + NL

+			+ "\t\t\tResourceSet resourceSet = editingDomain.getResourceSet();" + NL + "\t\t\tif (isDirty())" + NL

+			+ "\t\t\t{" + NL + "\t\t\t\tchangedResources.addAll(resourceSet.getResources());" + NL + "\t\t\t}" + NL

 			+ "\t\t\teditingDomain.getCommandStack().flush();" + NL + "" + NL

 			+ "\t\t\tupdateProblemIndication = false;";

-	protected final String TEXT_113 = NL + "\t\t\tfor (Resource resource : changedResources)";

-	protected final String TEXT_114 = NL + "\t\t\tfor (Iterator i = changedResources.iterator(); i.hasNext(); )";

-	protected final String TEXT_115 = NL + "\t\t\t{";

-	protected final String TEXT_116 = NL + "\t\t\t\tResource resource = (Resource)i.next();";

-	protected final String TEXT_117 = NL + "\t\t\t\tif (resource.isLoaded())" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_125 = NL + "\t\t\tfor (Resource resource : changedResources)";

+	protected final String TEXT_126 = NL + "\t\t\tfor (Iterator i = changedResources.iterator(); i.hasNext(); )";

+	protected final String TEXT_127 = NL + "\t\t\t{";

+	protected final String TEXT_128 = NL + "\t\t\t\tResource resource = (Resource)i.next();";

+	protected final String TEXT_129 = NL + "\t\t\t\tif (resource.isLoaded())" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\tresource.unload();" + NL + "\t\t\t\t\ttry" + NL + "\t\t\t\t\t{" + NL

-			+ "\t\t\t\t\t\tresource.load(Collections.EMPTY_MAP);" + NL + "\t\t\t\t\t}" + NL

+			+ "\t\t\t\t\t\tresource.load(resourceSet.getLoadOptions());" + NL + "\t\t\t\t\t}" + NL

 			+ "\t\t\t\t\tcatch (IOException exception)" + NL + "\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\tif (!resourceToDiagnosticMap.containsKey(resource))" + NL + "\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\tresourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));" + NL

 			+ "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL;

-	protected final String TEXT_118 = NL + "\t\t\tif (AdapterFactoryEditingDomain.isStale(editorSelection))" + NL

+	protected final String TEXT_130 = NL + "\t\t\tif (AdapterFactoryEditingDomain.isStale(editorSelection))" + NL

 			+ "\t\t\t{" + NL + "\t\t\t\tsetSelection(StructuredSelection.EMPTY);" + NL + "\t\t\t}";

-	protected final String TEXT_119 = NL + NL + "\t\t\tupdateProblemIndication = true;" + NL

+	protected final String TEXT_131 = NL + NL + "\t\t\tupdateProblemIndication = true;" + NL

 			+ "\t\t\tupdateProblemIndication();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Updates the problems indication with the information described in the specified diagnostic." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected void updateProblemIndication()" + NL + "\t{" + NL + "\t\tif (updateProblemIndication)"

 			+ NL + "\t\t{" + NL + "\t\t\tBasicDiagnostic diagnostic =" + NL + "\t\t\t\tnew BasicDiagnostic" + NL

 			+ "\t\t\t\t\t(Diagnostic.OK," + NL + "\t\t\t\t\t \"";

-	protected final String TEXT_120 = "\",";

-	protected final String TEXT_121 = NL + "\t\t\t\t\t 0," + NL + "\t\t\t\t\t null," + NL

+	protected final String TEXT_132 = "\",";

+	protected final String TEXT_133 = NL + "\t\t\t\t\t 0," + NL + "\t\t\t\t\t null," + NL

 			+ "\t\t\t\t\t new Object [] { editingDomain.getResourceSet() });";

-	protected final String TEXT_122 = NL + "\t\t\tfor (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())";

-	protected final String TEXT_123 = NL

+	protected final String TEXT_134 = NL + "\t\t\tfor (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())";

+	protected final String TEXT_135 = NL

 			+ "\t\t\tfor (Iterator i = resourceToDiagnosticMap.values().iterator(); i.hasNext(); )";

-	protected final String TEXT_124 = NL + "\t\t\t\tDiagnostic childDiagnostic = (Diagnostic)i.next();";

-	protected final String TEXT_125 = NL + "\t\t\t\tif (childDiagnostic.getSeverity() != Diagnostic.OK)" + NL

+	protected final String TEXT_136 = NL + "\t\t\t\tDiagnostic childDiagnostic = (Diagnostic)i.next();";

+	protected final String TEXT_137 = NL + "\t\t\t\tif (childDiagnostic.getSeverity() != Diagnostic.OK)" + NL

 			+ "\t\t\t\t{" + NL + "\t\t\t\t\tdiagnostic.add(childDiagnostic);" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL

 			+ "" + NL + "\t\t\tint lastEditorPage = getPageCount() - 1;" + NL

 			+ "\t\t\tif (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart)" + NL

@@ -426,72 +435,76 @@
 			+ "\t\t\telse if (diagnostic.getSeverity() != Diagnostic.OK)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tProblemEditorPart problemEditorPart = new ProblemEditorPart();" + NL

 			+ "\t\t\t\tproblemEditorPart.setDiagnostic(diagnostic);";

-	protected final String TEXT_126 = NL + "\t\t\t\tproblemEditorPart.setMarkerHelper(markerHelper);";

-	protected final String TEXT_127 = NL + "\t\t\t\ttry" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_138 = NL + "\t\t\t\tproblemEditorPart.setMarkerHelper(markerHelper);";

+	protected final String TEXT_139 = NL + "\t\t\t\ttry" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\taddPage(++lastEditorPage, problemEditorPart, getEditorInput());" + NL

 			+ "\t\t\t\t\tsetPageText(lastEditorPage, problemEditorPart.getPartName());" + NL

 			+ "\t\t\t\t\tsetActivePage(lastEditorPage);" + NL + "\t\t\t\t\tshowTabs();" + NL + "\t\t\t\t}" + NL

 			+ "\t\t\t\tcatch (PartInitException exception)" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\t";

-	protected final String TEXT_128 = ".INSTANCE.log(exception);" + NL + "\t\t\t\t}" + NL + "\t\t\t}";

-	protected final String TEXT_129 = NL + NL + "\t\t\tif (markerHelper.hasMarkers(editingDomain.getResourceSet()))"

+	protected final String TEXT_140 = ".INSTANCE.log(exception);" + NL + "\t\t\t\t}" + NL + "\t\t\t}";

+	protected final String TEXT_141 = NL + NL + "\t\t\tif (markerHelper.hasMarkers(editingDomain.getResourceSet()))"

 			+ NL + "\t\t\t{";

-	protected final String TEXT_130 = NL + "\t\t\t\tmarkerHelper.deleteMarkers(editingDomain.getResourceSet());" + NL

+	protected final String TEXT_142 = NL + "\t\t\t\tmarkerHelper.deleteMarkers(editingDomain.getResourceSet());" + NL

 			+ "\t\t\t\tif (diagnostic.getSeverity() != Diagnostic.OK)" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\ttry" + NL

 			+ "\t\t\t\t\t{" + NL + "\t\t\t\t\t\tmarkerHelper.createMarkers(diagnostic);" + NL + "\t\t\t\t\t}" + NL

 			+ "\t\t\t\t\tcatch (CoreException exception)" + NL + "\t\t\t\t\t{" + NL + "\t\t\t\t\t\t";

-	protected final String TEXT_131 = ".INSTANCE.log(exception);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}";

-	protected final String TEXT_132 = NL + "\t\t\t\ttry" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_143 = ".INSTANCE.log(exception);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}";

+	protected final String TEXT_144 = NL + "\t\t\t\ttry" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\tmarkerHelper.updateMarkers(diagnostic);" + NL + "\t\t\t\t}" + NL

 			+ "\t\t\t\tcatch (CoreException exception)" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\t";

-	protected final String TEXT_133 = ".INSTANCE.log(exception);" + NL + "\t\t\t\t}";

-	protected final String TEXT_134 = NL + "\t\t\t}";

-	protected final String TEXT_135 = NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_145 = ".INSTANCE.log(exception);" + NL + "\t\t\t\t}";

+	protected final String TEXT_146 = NL + "\t\t\t}";

+	protected final String TEXT_147 = NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Shows a dialog that asks if conflicting changes should be discarded." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected boolean handleDirtyConflict()" + NL + "\t{" + NL + "\t\treturn" + NL

 			+ "\t\t\tMessageDialog.openQuestion" + NL + "\t\t\t\t(getSite().getShell()," + NL

 			+ "\t\t\t\t getString(\"_UI_FileConflict_label\"),";

-	protected final String TEXT_136 = NL + "\t\t\t\t getString(\"_WARN_FileConflict\"));";

-	protected final String TEXT_137 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * This creates a model editor."

+	protected final String TEXT_148 = NL + "\t\t\t\t getString(\"_WARN_FileConflict\"));";

+	protected final String TEXT_149 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * This creates a model editor."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */" + NL + "\tpublic ";

-	protected final String TEXT_138 = "()" + NL + "\t{" + NL + "\t\tsuper();" + NL + "\t\tinitializeEditingDomain();"

+	protected final String TEXT_150 = "()" + NL + "\t{" + NL + "\t\tsuper();" + NL + "\t\tinitializeEditingDomain();"

 			+ NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * This sets up the editing domain for the model editor."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */" + NL + "\tprotected void initializeEditingDomain()" + NL + "\t{" + NL

 			+ "\t\t// Create an adapter factory that yields item providers." + NL + "\t\t//" + NL

 			+ "\t\tadapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);"

 			+ NL + "" + NL + "\t\tadapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());";

-	protected final String TEXT_139 = NL

+	protected final String TEXT_151 = NL

 			+ "\t\tadapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());" + NL + "" + NL

 			+ "\t\t// Create the command stack that will notify this editor as commands are executed." + NL + "\t\t//";

-	protected final String TEXT_140 = NL + "\t\tBasicCommandStack commandStack = new BasicCommandStack();";

-	protected final String TEXT_141 = NL + "\t\tBasicCommandStack commandStack =" + NL + "\t\t\tnew BasicCommandStack()"

+	protected final String TEXT_152 = NL + "\t\tBasicCommandStack commandStack = new BasicCommandStack();";

+	protected final String TEXT_153 = NL + "\t\tBasicCommandStack commandStack =" + NL + "\t\t\tnew BasicCommandStack()"

 			+ NL + "\t\t\t{";

-	protected final String TEXT_142 = NL + "\t\t\t\t@Override";

-	protected final String TEXT_143 = NL + "\t\t\t\tpublic void execute(Command command)" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_154 = NL + "\t\t\t\t@Override";

+	protected final String TEXT_155 = NL + "\t\t\t\tpublic void execute(Command command)" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\t// Cancel live validation before executing a command that will trigger a new round of validation."

 			+ NL + "\t\t\t\t\t//" + NL + "\t\t\t\t\tif (!(command instanceof ";

-	protected final String TEXT_144 = ".NonDirtying))" + NL + "\t\t\t\t\t{" + NL + "\t\t\t\t\t\t";

-	protected final String TEXT_145 = ".cancel(editingDomain);" + NL + "\t\t\t\t\t}" + NL

+	protected final String TEXT_156 = ".NonDirtying))" + NL + "\t\t\t\t\t{" + NL + "\t\t\t\t\t\t";

+	protected final String TEXT_157 = ".cancel(editingDomain);" + NL + "\t\t\t\t\t}" + NL

 			+ "\t\t\t\t\tsuper.execute(command);" + NL + "\t\t\t\t}" + NL + "\t\t\t};";

-	protected final String TEXT_146 = NL + NL

+	protected final String TEXT_158 = NL + NL

 			+ "\t\t// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus."

 			+ NL + "\t\t//" + NL + "\t\tcommandStack.addCommandStackListener" + NL + "\t\t\t(new CommandStackListener()"

-			+ NL + "\t\t\t {" + NL + "\t\t\t\t public void commandStackChanged(final EventObject event)" + NL

+			+ NL + "\t\t\t {";

+	protected final String TEXT_159 = NL + "\t\t\t\t @Override";

+	protected final String TEXT_160 = NL + "\t\t\t\t public void commandStackChanged(final EventObject event)" + NL

 			+ "\t\t\t\t {" + NL + "\t\t\t\t\t getContainer().getDisplay().asyncExec" + NL

-			+ "\t\t\t\t\t\t (new Runnable()" + NL + "\t\t\t\t\t\t  {" + NL + "\t\t\t\t\t\t\t  public void run()" + NL

-			+ "\t\t\t\t\t\t\t  {" + NL + "\t\t\t\t\t\t\t\t  firePropertyChange(IEditorPart.PROP_DIRTY);" + NL + "" + NL

+			+ "\t\t\t\t\t\t (new Runnable()" + NL + "\t\t\t\t\t\t  {";

+	protected final String TEXT_161 = NL + "\t\t\t\t\t\t\t  @Override";

+	protected final String TEXT_162 = NL + "\t\t\t\t\t\t\t  public void run()" + NL + "\t\t\t\t\t\t\t  {" + NL

+			+ "\t\t\t\t\t\t\t\t  firePropertyChange(IEditorPart.PROP_DIRTY);" + NL + "" + NL

 			+ "\t\t\t\t\t\t\t\t  // Try to select the affected objects." + NL + "\t\t\t\t\t\t\t\t  //" + NL

 			+ "\t\t\t\t\t\t\t\t  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();"

 			+ NL + "\t\t\t\t\t\t\t\t  if (mostRecentCommand != null)" + NL + "\t\t\t\t\t\t\t\t  {" + NL

 			+ "\t\t\t\t\t\t\t\t\t  setSelectionToViewer(mostRecentCommand.getAffectedObjects());" + NL

 			+ "\t\t\t\t\t\t\t\t  }" + NL + "\t\t\t\t\t\t\t\t  for (Iterator";

-	protected final String TEXT_147 = "<PropertySheetPage>";

-	protected final String TEXT_148 = " i = propertySheetPages.iterator(); i.hasNext(); )" + NL + "\t\t\t\t\t\t\t\t  {"

+	protected final String TEXT_163 = "<PropertySheetPage>";

+	protected final String TEXT_164 = " i = propertySheetPages.iterator(); i.hasNext(); )" + NL + "\t\t\t\t\t\t\t\t  {"

 			+ NL + "\t\t\t\t\t\t\t\t\t  PropertySheetPage propertySheetPage = ";

-	protected final String TEXT_149 = "(PropertySheetPage)";

-	protected final String TEXT_150 = "i.next();" + NL

+	protected final String TEXT_165 = "(PropertySheetPage)";

+	protected final String TEXT_166 = "i.next();" + NL

 			+ "\t\t\t\t\t\t\t\t\t  if (propertySheetPage.getControl().isDisposed())" + NL + "\t\t\t\t\t\t\t\t\t  {" + NL

 			+ "\t\t\t\t\t\t\t\t\t\t  i.remove();" + NL + "\t\t\t\t\t\t\t\t\t  }" + NL + "\t\t\t\t\t\t\t\t\t  else" + NL

 			+ "\t\t\t\t\t\t\t\t\t  {" + NL + "\t\t\t\t\t\t\t\t\t\t  propertySheetPage.refresh();" + NL

@@ -499,19 +512,20 @@
 			+ NL + "\t\t\t\t }" + NL + "\t\t\t });" + NL + "" + NL

 			+ "\t\t// Create the editing domain with a special command stack." + NL + "\t\t//" + NL

 			+ "\t\teditingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new ";

-	protected final String TEXT_151 = "());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_167 = "());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This is here for the listener to be able to call it." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

-	protected final String TEXT_152 = NL + "\tprotected void firePropertyChange(int action)" + NL + "\t{" + NL

+	protected final String TEXT_168 = NL + "\tprotected void firePropertyChange(int action)" + NL + "\t{" + NL

 			+ "\t\tsuper.firePropertyChange(action);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This sets the selection into whichever viewer is active." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tpublic void setSelectionToViewer(";

-	protected final String TEXT_153 = " collection)" + NL + "\t{" + NL + "\t\tfinal ";

-	protected final String TEXT_154 = " theSelection = collection;" + NL + "\t\t// Make sure it's okay." + NL + "\t\t//"

+	protected final String TEXT_169 = " collection)" + NL + "\t{" + NL + "\t\tfinal ";

+	protected final String TEXT_170 = " theSelection = collection;" + NL + "\t\t// Make sure it's okay." + NL + "\t\t//"

 			+ NL + "\t\tif (theSelection != null && !theSelection.isEmpty())" + NL + "\t\t{" + NL

-			+ "\t\t\tRunnable runnable =" + NL + "\t\t\t\tnew Runnable()" + NL + "\t\t\t\t{" + NL

-			+ "\t\t\t\t\tpublic void run()" + NL + "\t\t\t\t\t{" + NL

+			+ "\t\t\tRunnable runnable =" + NL + "\t\t\t\tnew Runnable()" + NL + "\t\t\t\t{";

+	protected final String TEXT_171 = NL + "\t\t\t\t\t@Override";

+	protected final String TEXT_172 = NL + "\t\t\t\t\tpublic void run()" + NL + "\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t// Try to select the items in the current content viewer of the editor." + NL

 			+ "\t\t\t\t\t\t//" + NL + "\t\t\t\t\t\tif (currentViewer != null)" + NL + "\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\tcurrentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);" + NL

@@ -521,10 +535,12 @@
 			+ "\t * This returns the editing domain as required by the {@link IEditingDomainProvider} interface." + NL

 			+ "\t * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}" + NL

 			+ "\t * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}." + NL

-			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

-			+ NL + "\tpublic EditingDomain getEditingDomain()" + NL + "\t{" + NL + "\t\treturn editingDomain;" + NL

-			+ "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"

-			+ NL + "\t * @generated" + NL + "\t */" + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

+			+ "\t */";

+	protected final String TEXT_173 = NL + "\t@Override";

+	protected final String TEXT_174 = NL + "\tpublic EditingDomain getEditingDomain()" + NL + "\t{" + NL

+			+ "\t\treturn editingDomain;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->"

+			+ NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tpublic class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider" + NL + "\t{"

 			+ NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL

 			+ "\t\t * @generated" + NL + "\t\t */" + NL

@@ -532,31 +548,31 @@
 			+ "\t\t\tsuper(adapterFactory);" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL

 			+ "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL

 			+ "\t\t */";

-	protected final String TEXT_155 = NL + "\t\t@Override";

-	protected final String TEXT_156 = NL + "\t\tpublic Object [] getElements(Object object)" + NL + "\t\t{" + NL

+	protected final String TEXT_175 = NL + "\t\t@Override";

+	protected final String TEXT_176 = NL + "\t\tpublic Object [] getElements(Object object)" + NL + "\t\t{" + NL

 			+ "\t\t\tObject parent = super.getParent(object);" + NL

 			+ "\t\t\treturn (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();" + NL

 			+ "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */";

-	protected final String TEXT_157 = NL + "\t\tpublic Object [] getChildren(Object object)" + NL + "\t\t{" + NL

+	protected final String TEXT_177 = NL + "\t\tpublic Object [] getChildren(Object object)" + NL + "\t\t{" + NL

 			+ "\t\t\tObject parent = super.getParent(object);" + NL

 			+ "\t\t\treturn (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();" + NL

 			+ "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */";

-	protected final String TEXT_158 = NL + "\t\tpublic boolean hasChildren(Object object)" + NL + "\t\t{" + NL

+	protected final String TEXT_178 = NL + "\t\tpublic boolean hasChildren(Object object)" + NL + "\t\t{" + NL

 			+ "\t\t\tObject parent = super.getParent(object);" + NL + "\t\t\treturn parent != null;" + NL + "\t\t}" + NL

 			+ "" + NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL

 			+ "\t\t * @generated" + NL + "\t\t */";

-	protected final String TEXT_159 = NL + "\t\tpublic Object getParent(Object object)" + NL + "\t\t{" + NL

+	protected final String TEXT_179 = NL + "\t\tpublic Object getParent(Object object)" + NL + "\t\t{" + NL

 			+ "\t\t\treturn null;" + NL + "\t\t}" + NL + "\t}";

-	protected final String TEXT_160 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_180 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tpublic void setCurrentViewerPane(ViewerPane viewerPane)" + NL + "\t{" + NL

 			+ "\t\tif (currentViewerPane != viewerPane)" + NL + "\t\t{" + NL + "\t\t\tif (currentViewerPane != null)"

 			+ NL + "\t\t\t{" + NL + "\t\t\t\tcurrentViewerPane.showFocus(false);" + NL + "\t\t\t}" + NL

 			+ "\t\t\tcurrentViewerPane = viewerPane;" + NL + "\t\t}" + NL

 			+ "\t\tsetCurrentViewer(currentViewerPane.getViewer());" + NL + "\t}";

-	protected final String TEXT_161 = NL + NL + "\t/**" + NL

+	protected final String TEXT_181 = NL + NL + "\t/**" + NL

 			+ "\t * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,"

 			+ NL + "\t * is the current one." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"

 			+ NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setCurrentViewer(Viewer viewer)" + NL + "\t{"

@@ -565,7 +581,8 @@
 			+ "\t\t\t\t// Create the listener on demand." + NL + "\t\t\t\t//" + NL

 			+ "\t\t\t\tselectionChangedListener =" + NL + "\t\t\t\t\tnew ISelectionChangedListener()" + NL

 			+ "\t\t\t\t\t{" + NL + "\t\t\t\t\t\t// This just notifies those things that are affected by the section."

-			+ NL + "\t\t\t\t\t\t//" + NL

+			+ NL + "\t\t\t\t\t\t//";

+	protected final String TEXT_182 = NL

 			+ "\t\t\t\t\t\tpublic void selectionChanged(SelectionChangedEvent selectionChangedEvent)" + NL

 			+ "\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\tsetSelection(selectionChangedEvent.getSelection());" + NL

 			+ "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t};" + NL + "\t\t\t}" + NL + "" + NL

@@ -579,39 +596,40 @@
 			+ "\t\t\tsetSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());"

 			+ NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This returns the viewer as required by the {@link IViewerProvider} interface." + NL

-			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

-			+ NL + "\tpublic Viewer getViewer()" + NL + "\t{" + NL + "\t\treturn currentViewer;" + NL + "\t}" + NL + ""

-			+ NL + "\t/**" + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

+			+ "\t */";

+	protected final String TEXT_183 = NL + "\tpublic Viewer getViewer()" + NL + "\t{" + NL + "\t\treturn currentViewer;"

+			+ NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This creates a context menu for the viewer and adds a listener as well registering the menu for extension."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */" + NL + "\tprotected void createContextMenuFor(StructuredViewer viewer)" + NL + "\t{" + NL

 			+ "\t\tMenuManager contextMenu = new MenuManager(\"#PopUp\");";

-	protected final String TEXT_162 = NL + "\t\tcontextMenu.add(new Separator(\"additions\"));";

-	protected final String TEXT_163 = NL + "\t\tcontextMenu.setRemoveAllWhenShown(true);" + NL

+	protected final String TEXT_184 = NL + "\t\tcontextMenu.add(new Separator(\"additions\"));";

+	protected final String TEXT_185 = NL + "\t\tcontextMenu.setRemoveAllWhenShown(true);" + NL

 			+ "\t\tcontextMenu.addMenuListener(this);" + NL

 			+ "\t\tMenu menu= contextMenu.createContextMenu(viewer.getControl());" + NL

 			+ "\t\tviewer.getControl().setMenu(menu);";

-	protected final String TEXT_164 = NL

+	protected final String TEXT_186 = NL

 			+ "\t\tgetSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));";

-	protected final String TEXT_165 = NL + "\t\tgetSite().registerContextMenu(contextMenu, viewer);";

-	protected final String TEXT_166 = NL + NL + "\t\tint dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;"

+	protected final String TEXT_187 = NL + "\t\tgetSite().registerContextMenu(contextMenu, viewer);";

+	protected final String TEXT_188 = NL + NL + "\t\tint dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;"

 			+ NL + "\t\tTransfer[] transfers = new Transfer[] { LocalTransfer.getInstance()";

-	protected final String TEXT_167 = ", LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance()";

-	protected final String TEXT_168 = " };" + NL

+	protected final String TEXT_189 = ", LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance()";

+	protected final String TEXT_190 = " };" + NL

 			+ "\t\tviewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));" + NL

 			+ "\t\tviewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));"

 			+ NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This is the method called to load a resource into the editing domain's resource set based on the editor's input."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */" + NL + "\tpublic void createModel()" + NL + "\t{";

-	protected final String TEXT_169 = NL

+	protected final String TEXT_191 = NL

 			+ "\t\tURI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());";

-	protected final String TEXT_170 = NL + "\t\tURI resourceURI = EditUIUtil.getURI(getEditorInput());";

-	protected final String TEXT_171 = NL + "\t\tURI resourceURI = URI.createURI(getEditorInput().getName());";

-	protected final String TEXT_172 = NL + "\t\t// Assumes that the input is a file object." + NL + "\t\t//" + NL

+	protected final String TEXT_192 = NL + "\t\tURI resourceURI = EditUIUtil.getURI(getEditorInput());";

+	protected final String TEXT_193 = NL + "\t\tURI resourceURI = URI.createURI(getEditorInput().getName());";

+	protected final String TEXT_194 = NL + "\t\t// Assumes that the input is a file object." + NL + "\t\t//" + NL

 			+ "\t\tIFileEditorInput modelFile = (IFileEditorInput)getEditorInput();" + NL

 			+ "\t\tURI resourceURI = URI.createPlatformResourceURI(modelFile.getFile().getFullPath().toString(), true);";

-	protected final String TEXT_173 = NL + "\t\tException exception = null;" + NL + "\t\tResource resource = null;" + NL

+	protected final String TEXT_195 = NL + "\t\tException exception = null;" + NL + "\t\tResource resource = null;" + NL

 			+ "\t\ttry" + NL + "\t\t{" + NL + "\t\t\t// Load the resource through the editing domain." + NL + "\t\t\t//"

 			+ NL + "\t\t\tresource = editingDomain.getResourceSet().getResource(resourceURI, true);" + NL + "\t\t}" + NL

 			+ "\t\tcatch (Exception e)" + NL + "\t\t{" + NL + "\t\t\texception = e;" + NL

@@ -629,117 +647,114 @@
 			+ "\t\tif (hasErrors || !resource.getWarnings().isEmpty())" + NL + "\t\t{" + NL

 			+ "\t\t\tBasicDiagnostic basicDiagnostic =" + NL + "\t\t\t\tnew BasicDiagnostic" + NL

 			+ "\t\t\t\t\t(hasErrors ? Diagnostic.ERROR : Diagnostic.WARNING," + NL + "\t\t\t\t\t \"";

-	protected final String TEXT_174 = NL + "\t\t\t\t\t 0," + NL

+	protected final String TEXT_196 = NL + "\t\t\t\t\t 0," + NL

 			+ "\t\t\t\t\t getString(\"_UI_CreateModelError_message\", resource.getURI()),";

-	protected final String TEXT_175 = NL

+	protected final String TEXT_197 = NL

 			+ "\t\t\t\t\t new Object [] { exception == null ? (Object)resource : exception });" + NL

 			+ "\t\t\tbasicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));" + NL

 			+ "\t\t\treturn basicDiagnostic;" + NL + "\t\t}" + NL + "\t\telse if (exception != null)" + NL + "\t\t{"

 			+ NL + "\t\t\treturn" + NL + "\t\t\t\tnew BasicDiagnostic" + NL + "\t\t\t\t\t(Diagnostic.ERROR," + NL

 			+ "\t\t\t\t\t \"";

-	protected final String TEXT_176 = NL + "\t\t\t\t\t new Object[] { exception });" + NL + "\t\t}" + NL + "\t\telse"

+	protected final String TEXT_198 = NL + "\t\t\t\t\t new Object[] { exception });" + NL + "\t\t}" + NL + "\t\telse"

 			+ NL + "\t\t{" + NL + "\t\t\treturn Diagnostic.OK_INSTANCE;" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL

 			+ "\t/**" + NL + "\t * This is the method used by the framework to install your own controls." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_177 = NL + "\t@Override";

-	protected final String TEXT_178 = NL + "\tpublic void createPages()" + NL + "\t{" + NL

+	protected final String TEXT_199 = NL + "\tpublic void createPages()" + NL + "\t{" + NL

 			+ "\t\t// Creates the model from the editor input" + NL + "\t\t//" + NL + "\t\tcreateModel();" + NL + ""

 			+ NL + "\t\t// Only creates the other pages if there is something that can be edited" + NL + "\t\t//" + NL

 			+ "\t\tif (!getEditingDomain().getResourceSet().getResources().isEmpty())" + NL + "\t\t{" + NL

 			+ "\t\t\t// Create a page for the selection tree view." + NL + "\t\t\t//";

-	protected final String TEXT_179 = NL + "\t\t\t{" + NL + "\t\t\t\tViewerPane viewerPane =" + NL

+	protected final String TEXT_200 = NL + "\t\t\t{" + NL + "\t\t\t\tViewerPane viewerPane =" + NL

 			+ "\t\t\t\t\tnew ViewerPane(getSite().getPage(), ";

-	protected final String TEXT_180 = ".this)" + NL + "\t\t\t\t\t{";

-	protected final String TEXT_181 = NL + "\t\t\t\t\t\t@Override";

-	protected final String TEXT_182 = NL + "\t\t\t\t\t\tpublic Viewer createViewer(Composite composite)" + NL

+	protected final String TEXT_201 = ".this)" + NL + "\t\t\t\t\t{";

+	protected final String TEXT_202 = NL + "\t\t\t\t\t\tpublic Viewer createViewer(Composite composite)" + NL

 			+ "\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\tTree tree = new Tree(composite, SWT.MULTI);" + NL

 			+ "\t\t\t\t\t\t\tTreeViewer newTreeViewer = new TreeViewer(tree);" + NL

 			+ "\t\t\t\t\t\t\treturn newTreeViewer;" + NL + "\t\t\t\t\t\t}";

-	protected final String TEXT_183 = NL + "\t\t\t\t\t\tpublic void requestActivation()" + NL + "\t\t\t\t\t\t{" + NL

+	protected final String TEXT_203 = NL + "\t\t\t\t\t\tpublic void requestActivation()" + NL + "\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\tsuper.requestActivation();" + NL + "\t\t\t\t\t\t\tsetCurrentViewerPane(this);" + NL

 			+ "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t};" + NL + "\t\t\t\tviewerPane.createControl(getContainer());" + NL + ""

 			+ NL + "\t\t\t\tselectionViewer = (TreeViewer)viewerPane.getViewer();" + NL

 			+ "\t\t\t\tselectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));" + NL

 			+ "\t\t\t\tselectionViewer.setUseHashlookup(true);" + NL + "" + NL

 			+ "\t\t\t\tselectionViewer.setLabelProvider(";

-	protected final String TEXT_184 = "new ";

-	protected final String TEXT_185 = "(";

-	protected final String TEXT_186 = "(adapterFactory";

-	protected final String TEXT_187 = ", selectionViewer";

-	protected final String TEXT_188 = ")";

-	protected final String TEXT_189 = ", new ";

-	protected final String TEXT_190 = "(editingDomain";

-	protected final String TEXT_191 = ".getResourceSet()";

-	protected final String TEXT_192 = ", ";

-	protected final String TEXT_193 = ".getPlugin().getDialogSettings()";

-	protected final String TEXT_194 = "))";

-	protected final String TEXT_195 = ");" + NL + "\t\t\t\tselectionViewer.setInput(editingDomain.getResourceSet());"

+	protected final String TEXT_204 = "new ";

+	protected final String TEXT_205 = "(";

+	protected final String TEXT_206 = "(adapterFactory";

+	protected final String TEXT_207 = ", selectionViewer";

+	protected final String TEXT_208 = ")";

+	protected final String TEXT_209 = ", new ";

+	protected final String TEXT_210 = "(editingDomain";

+	protected final String TEXT_211 = ".getResourceSet()";

+	protected final String TEXT_212 = ".getPlugin().getDialogSettings()";

+	protected final String TEXT_213 = "))";

+	protected final String TEXT_214 = ");" + NL + "\t\t\t\tselectionViewer.setInput(editingDomain.getResourceSet());"

 			+ NL

 			+ "\t\t\t\tselectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);"

 			+ NL + "\t\t\t\tviewerPane.setTitle(editingDomain.getResourceSet());" + NL + "" + NL

 			+ "\t\t\t\tnew AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);";

-	protected final String TEXT_196 = NL + "\t\t\t\tnew ";

-	protected final String TEXT_197 = "(selectionViewer, new ";

-	protected final String TEXT_198 = ".EditingDomainLocationListener(editingDomain, selectionViewer));";

-	protected final String TEXT_199 = NL + NL + "\t\t\t\tcreateContextMenuFor(selectionViewer);" + NL

+	protected final String TEXT_215 = NL + "\t\t\t\tnew ";

+	protected final String TEXT_216 = "(selectionViewer, new ";

+	protected final String TEXT_217 = ".EditingDomainLocationListener(editingDomain, selectionViewer));";

+	protected final String TEXT_218 = NL + NL + "\t\t\t\tcreateContextMenuFor(selectionViewer);" + NL

 			+ "\t\t\t\tint pageIndex = addPage(viewerPane.getControl());" + NL

 			+ "\t\t\t\tsetPageText(pageIndex, getString(\"_UI_SelectionPage_label\"));";

-	protected final String TEXT_200 = NL + "\t\t\t}" + NL + "" + NL + "\t\t\t// Create a page for the parent tree view."

+	protected final String TEXT_219 = NL + "\t\t\t}" + NL + "" + NL + "\t\t\t// Create a page for the parent tree view."

 			+ NL + "\t\t\t//" + NL + "\t\t\t{" + NL + "\t\t\t\tViewerPane viewerPane =" + NL

 			+ "\t\t\t\t\tnew ViewerPane(getSite().getPage(), ";

-	protected final String TEXT_201 = NL + "\t\t\t\t\t\tpublic void requestActivation()" + NL + "\t\t\t\t\t\t{" + NL

+	protected final String TEXT_220 = NL + "\t\t\t\t\t\tpublic void requestActivation()" + NL + "\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\tsuper.requestActivation();" + NL + "\t\t\t\t\t\t\tsetCurrentViewerPane(this);" + NL

 			+ "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t};" + NL + "\t\t\t\tviewerPane.createControl(getContainer());" + NL + ""

 			+ NL + "\t\t\t\tparentViewer = (TreeViewer)viewerPane.getViewer();" + NL

 			+ "\t\t\t\tparentViewer.setAutoExpandLevel(30);" + NL

 			+ "\t\t\t\tparentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));" + NL

 			+ "\t\t\t\tparentViewer.setLabelProvider(";

-	protected final String TEXT_202 = ", parentViewer";

-	protected final String TEXT_203 = ");" + NL + "" + NL + "\t\t\t\tcreateContextMenuFor(parentViewer);" + NL

+	protected final String TEXT_221 = ", parentViewer";

+	protected final String TEXT_222 = ");" + NL + "" + NL + "\t\t\t\tcreateContextMenuFor(parentViewer);" + NL

 			+ "\t\t\t\tint pageIndex = addPage(viewerPane.getControl());" + NL

 			+ "\t\t\t\tsetPageText(pageIndex, getString(\"_UI_ParentPage_label\"));";

-	protected final String TEXT_204 = NL + "\t\t\t}" + NL + "" + NL + "\t\t\t// This is the page for the list viewer"

+	protected final String TEXT_223 = NL + "\t\t\t}" + NL + "" + NL + "\t\t\t// This is the page for the list viewer"

 			+ NL + "\t\t\t//" + NL + "\t\t\t{" + NL + "\t\t\t\tViewerPane viewerPane =" + NL

 			+ "\t\t\t\t\tnew ViewerPane(getSite().getPage(), ";

-	protected final String TEXT_205 = NL + "\t\t\t\t\t\tpublic Viewer createViewer(Composite composite)" + NL

+	protected final String TEXT_224 = NL + "\t\t\t\t\t\tpublic Viewer createViewer(Composite composite)" + NL

 			+ "\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\treturn new ListViewer(composite);" + NL + "\t\t\t\t\t\t}";

-	protected final String TEXT_206 = NL + "\t\t\t\t\t\tpublic void requestActivation()" + NL + "\t\t\t\t\t\t{" + NL

+	protected final String TEXT_225 = NL + "\t\t\t\t\t\tpublic void requestActivation()" + NL + "\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\tsuper.requestActivation();" + NL + "\t\t\t\t\t\t\tsetCurrentViewerPane(this);" + NL

 			+ "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t};" + NL + "\t\t\t\tviewerPane.createControl(getContainer());" + NL

 			+ "\t\t\t\tlistViewer = (ListViewer)viewerPane.getViewer();" + NL

 			+ "\t\t\t\tlistViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));" + NL

 			+ "\t\t\t\tlistViewer.setLabelProvider(";

-	protected final String TEXT_207 = ", listViewer";

-	protected final String TEXT_208 = ");" + NL + "" + NL + "\t\t\t\tcreateContextMenuFor(listViewer);" + NL

+	protected final String TEXT_226 = ", listViewer";

+	protected final String TEXT_227 = ");" + NL + "" + NL + "\t\t\t\tcreateContextMenuFor(listViewer);" + NL

 			+ "\t\t\t\tint pageIndex = addPage(viewerPane.getControl());" + NL

 			+ "\t\t\t\tsetPageText(pageIndex, getString(\"_UI_ListPage_label\"));";

-	protected final String TEXT_209 = NL + "\t\t\t}" + NL + "" + NL + "\t\t\t// This is the page for the tree viewer"

+	protected final String TEXT_228 = NL + "\t\t\t}" + NL + "" + NL + "\t\t\t// This is the page for the tree viewer"

 			+ NL + "\t\t\t//" + NL + "\t\t\t{" + NL + "\t\t\t\tViewerPane viewerPane =" + NL

 			+ "\t\t\t\t\tnew ViewerPane(getSite().getPage(), ";

-	protected final String TEXT_210 = NL + "\t\t\t\t\t\tpublic Viewer createViewer(Composite composite)" + NL

+	protected final String TEXT_229 = NL + "\t\t\t\t\t\tpublic Viewer createViewer(Composite composite)" + NL

 			+ "\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\treturn new TreeViewer(composite);" + NL + "\t\t\t\t\t\t}";

-	protected final String TEXT_211 = NL + "\t\t\t\t\t\tpublic void requestActivation()" + NL + "\t\t\t\t\t\t{" + NL

+	protected final String TEXT_230 = NL + "\t\t\t\t\t\tpublic void requestActivation()" + NL + "\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\tsuper.requestActivation();" + NL + "\t\t\t\t\t\t\tsetCurrentViewerPane(this);" + NL

 			+ "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t};" + NL + "\t\t\t\tviewerPane.createControl(getContainer());" + NL

 			+ "\t\t\t\ttreeViewer = (TreeViewer)viewerPane.getViewer();" + NL

 			+ "\t\t\t\ttreeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));" + NL

 			+ "\t\t\t\ttreeViewer.setLabelProvider(";

-	protected final String TEXT_212 = ", treeViewer";

-	protected final String TEXT_213 = ", treeViewer))";

-	protected final String TEXT_214 = ");" + NL + "" + NL

+	protected final String TEXT_231 = ", treeViewer";

+	protected final String TEXT_232 = ", treeViewer))";

+	protected final String TEXT_233 = ");" + NL + "" + NL

 			+ "\t\t\t\tnew AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);";

-	protected final String TEXT_215 = "(treeViewer, new ";

-	protected final String TEXT_216 = ".EditingDomainLocationListener(editingDomain, treeViewer));";

-	protected final String TEXT_217 = NL + NL + "\t\t\t\tcreateContextMenuFor(treeViewer);" + NL

+	protected final String TEXT_234 = "(treeViewer, new ";

+	protected final String TEXT_235 = ".EditingDomainLocationListener(editingDomain, treeViewer));";

+	protected final String TEXT_236 = NL + NL + "\t\t\t\tcreateContextMenuFor(treeViewer);" + NL

 			+ "\t\t\t\tint pageIndex = addPage(viewerPane.getControl());" + NL

 			+ "\t\t\t\tsetPageText(pageIndex, getString(\"_UI_TreePage_label\"));";

-	protected final String TEXT_218 = NL + "\t\t\t}" + NL + "" + NL + "\t\t\t// This is the page for the table viewer."

+	protected final String TEXT_237 = NL + "\t\t\t}" + NL + "" + NL + "\t\t\t// This is the page for the table viewer."

 			+ NL + "\t\t\t//" + NL + "\t\t\t{" + NL + "\t\t\t\tViewerPane viewerPane =" + NL

 			+ "\t\t\t\t\tnew ViewerPane(getSite().getPage(), ";

-	protected final String TEXT_219 = NL + "\t\t\t\t\t\tpublic Viewer createViewer(Composite composite)" + NL

+	protected final String TEXT_238 = NL + "\t\t\t\t\t\tpublic Viewer createViewer(Composite composite)" + NL

 			+ "\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\treturn new TableViewer(composite);" + NL + "\t\t\t\t\t\t}";

-	protected final String TEXT_220 = NL + "\t\t\t\t\t\tpublic void requestActivation()" + NL + "\t\t\t\t\t\t{" + NL

+	protected final String TEXT_239 = NL + "\t\t\t\t\t\tpublic void requestActivation()" + NL + "\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\tsuper.requestActivation();" + NL + "\t\t\t\t\t\t\tsetCurrentViewerPane(this);" + NL

 			+ "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t};" + NL + "\t\t\t\tviewerPane.createControl(getContainer());" + NL

 			+ "\t\t\t\ttableViewer = (TableViewer)viewerPane.getViewer();" + NL + "" + NL

@@ -749,26 +764,26 @@
 			+ "\t\t\t\tTableColumn objectColumn = new TableColumn(table, SWT.NONE);" + NL

 			+ "\t\t\t\tlayout.addColumnData(new ColumnWeightData(3, 100, true));" + NL

 			+ "\t\t\t\tobjectColumn.setText(getString(\"_UI_ObjectColumn_label\"));";

-	protected final String TEXT_221 = NL + "\t\t\t\tobjectColumn.setResizable(true);" + NL + "" + NL

+	protected final String TEXT_240 = NL + "\t\t\t\tobjectColumn.setResizable(true);" + NL + "" + NL

 			+ "\t\t\t\tTableColumn selfColumn = new TableColumn(table, SWT.NONE);" + NL

 			+ "\t\t\t\tlayout.addColumnData(new ColumnWeightData(2, 100, true));" + NL

 			+ "\t\t\t\tselfColumn.setText(getString(\"_UI_SelfColumn_label\"));";

-	protected final String TEXT_222 = NL + "\t\t\t\tselfColumn.setResizable(true);" + NL + "" + NL

+	protected final String TEXT_241 = NL + "\t\t\t\tselfColumn.setResizable(true);" + NL + "" + NL

 			+ "\t\t\t\ttableViewer.setColumnProperties(new String [] {\"a\", \"b\"});";

-	protected final String TEXT_223 = NL

+	protected final String TEXT_242 = NL

 			+ "\t\t\t\ttableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));" + NL

 			+ "\t\t\t\ttableViewer.setLabelProvider(";

-	protected final String TEXT_224 = ", tableViewer";

-	protected final String TEXT_225 = ");" + NL;

-	protected final String TEXT_226 = "(tableViewer, new ";

-	protected final String TEXT_227 = ".EditingDomainLocationListener(editingDomain, tableViewer));" + NL;

-	protected final String TEXT_228 = NL + "\t\t\t\tcreateContextMenuFor(tableViewer);" + NL

+	protected final String TEXT_243 = ", tableViewer";

+	protected final String TEXT_244 = ");" + NL;

+	protected final String TEXT_245 = "(tableViewer, new ";

+	protected final String TEXT_246 = ".EditingDomainLocationListener(editingDomain, tableViewer));" + NL;

+	protected final String TEXT_247 = NL + "\t\t\t\tcreateContextMenuFor(tableViewer);" + NL

 			+ "\t\t\t\tint pageIndex = addPage(viewerPane.getControl());" + NL

 			+ "\t\t\t\tsetPageText(pageIndex, getString(\"_UI_TablePage_label\"));";

-	protected final String TEXT_229 = NL + "\t\t\t}" + NL + "" + NL

+	protected final String TEXT_248 = NL + "\t\t\t}" + NL + "" + NL

 			+ "\t\t\t// This is the page for the table tree viewer." + NL + "\t\t\t//" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tViewerPane viewerPane =" + NL + "\t\t\t\t\tnew ViewerPane(getSite().getPage(), ";

-	protected final String TEXT_230 = NL + "\t\t\t\t\t\tpublic void requestActivation()" + NL + "\t\t\t\t\t\t{" + NL

+	protected final String TEXT_249 = NL + "\t\t\t\t\t\tpublic void requestActivation()" + NL + "\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\tsuper.requestActivation();" + NL + "\t\t\t\t\t\t\tsetCurrentViewerPane(this);" + NL

 			+ "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t};" + NL + "\t\t\t\tviewerPane.createControl(getContainer());" + NL + ""

 			+ NL + "\t\t\t\ttreeViewerWithColumns = (TreeViewer)viewerPane.getViewer();" + NL + "" + NL

@@ -777,53 +792,56 @@
 			+ "\t\t\t\ttree.setLinesVisible(true);" + NL + "" + NL

 			+ "\t\t\t\tTreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);" + NL

 			+ "\t\t\t\tobjectColumn.setText(getString(\"_UI_ObjectColumn_label\"));";

-	protected final String TEXT_231 = NL + "\t\t\t\tobjectColumn.setResizable(true);" + NL

+	protected final String TEXT_250 = NL + "\t\t\t\tobjectColumn.setResizable(true);" + NL

 			+ "\t\t\t\tobjectColumn.setWidth(250);" + NL + "" + NL

 			+ "\t\t\t\tTreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);" + NL

 			+ "\t\t\t\tselfColumn.setText(getString(\"_UI_SelfColumn_label\"));";

-	protected final String TEXT_232 = NL + "\t\t\t\tselfColumn.setResizable(true);" + NL

+	protected final String TEXT_251 = NL + "\t\t\t\tselfColumn.setResizable(true);" + NL

 			+ "\t\t\t\tselfColumn.setWidth(200);" + NL + "" + NL

 			+ "\t\t\t\ttreeViewerWithColumns.setColumnProperties(new String [] {\"a\", \"b\"});";

-	protected final String TEXT_233 = NL

+	protected final String TEXT_252 = NL

 			+ "\t\t\t\ttreeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));"

 			+ NL + "\t\t\t\ttreeViewerWithColumns.setLabelProvider(";

-	protected final String TEXT_234 = ", treeViewerWithColumns";

-	protected final String TEXT_235 = "(treeViewerWithColumns, new ";

-	protected final String TEXT_236 = ".EditingDomainLocationListener(editingDomain, treeViewerWithColumns));" + NL;

-	protected final String TEXT_237 = NL + "\t\t\t\tcreateContextMenuFor(treeViewerWithColumns);" + NL

+	protected final String TEXT_253 = ", treeViewerWithColumns";

+	protected final String TEXT_254 = "(treeViewerWithColumns, new ";

+	protected final String TEXT_255 = ".EditingDomainLocationListener(editingDomain, treeViewerWithColumns));" + NL;

+	protected final String TEXT_256 = NL + "\t\t\t\tcreateContextMenuFor(treeViewerWithColumns);" + NL

 			+ "\t\t\t\tint pageIndex = addPage(viewerPane.getControl());" + NL

 			+ "\t\t\t\tsetPageText(pageIndex, getString(\"_UI_TreeWithColumnsPage_label\"));";

-	protected final String TEXT_238 = NL + "\t\t\tTree tree = new Tree(getContainer(), SWT.MULTI);" + NL

+	protected final String TEXT_257 = NL + "\t\t\tTree tree = new Tree(getContainer(), SWT.MULTI);" + NL

 			+ "\t\t\tselectionViewer = new TreeViewer(tree);" + NL + "\t\t\tsetCurrentViewer(selectionViewer);" + NL

 			+ "" + NL + "\t\t\tselectionViewer.setUseHashlookup(true);" + NL

 			+ "\t\t\tselectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));" + NL

 			+ "\t\t\tselectionViewer.setLabelProvider(";

-	protected final String TEXT_239 = ");" + NL + "\t\t\tselectionViewer.setInput(editingDomain.getResourceSet());" + NL

+	protected final String TEXT_258 = ");" + NL + "\t\t\tselectionViewer.setInput(editingDomain.getResourceSet());" + NL

 			+ "\t\t\tselectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);"

 			+ NL + "" + NL + "\t\t\tnew AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);";

-	protected final String TEXT_240 = NL + "\t\t\tnew ";

-	protected final String TEXT_241 = NL + NL + "\t\t\tcreateContextMenuFor(selectionViewer);" + NL

+	protected final String TEXT_259 = NL + "\t\t\tnew ";

+	protected final String TEXT_260 = NL + NL + "\t\t\tcreateContextMenuFor(selectionViewer);" + NL

 			+ "\t\t\tint pageIndex = addPage(tree);" + NL

 			+ "\t\t\tsetPageText(pageIndex, getString(\"_UI_SelectionPage_label\"));";

-	protected final String TEXT_242 = NL + NL + "\t\t\tgetSite().getShell().getDisplay().asyncExec" + NL

-			+ "\t\t\t\t(new Runnable()" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t public void run()" + NL + "\t\t\t\t\t {"

-			+ NL + "\t\t\t\t\t\t if (!getContainer().isDisposed())" + NL + "\t\t\t\t\t\t {" + NL

+	protected final String TEXT_261 = NL + NL + "\t\t\tgetSite().getShell().getDisplay().asyncExec" + NL

+			+ "\t\t\t\t(new Runnable()" + NL + "\t\t\t\t {";

+	protected final String TEXT_262 = NL + "\t\t\t\t\t @Override";

+	protected final String TEXT_263 = NL + "\t\t\t\t\t public void run()" + NL + "\t\t\t\t\t {" + NL

+			+ "\t\t\t\t\t\t if (!getContainer().isDisposed())" + NL + "\t\t\t\t\t\t {" + NL

 			+ "\t\t\t\t\t\t\t setActivePage(0);" + NL + "\t\t\t\t\t\t }" + NL + "\t\t\t\t\t }" + NL + "\t\t\t\t });"

 			+ NL + "\t\t}" + NL + "" + NL + "\t\t// Ensures that this editor will only display the page's tab" + NL

 			+ "\t\t// area if there are more than one page" + NL + "\t\t//" + NL

 			+ "\t\tgetContainer().addControlListener" + NL + "\t\t\t(new ControlAdapter()" + NL + "\t\t\t {" + NL

 			+ "\t\t\t\tboolean guard = false;";

-	protected final String TEXT_243 = NL + "\t\t\t\tpublic void controlResized(ControlEvent event)" + NL + "\t\t\t\t{"

+	protected final String TEXT_264 = NL + "\t\t\t\tpublic void controlResized(ControlEvent event)" + NL + "\t\t\t\t{"

 			+ NL + "\t\t\t\t\tif (!guard)" + NL + "\t\t\t\t\t{" + NL + "\t\t\t\t\t\tguard = true;" + NL

 			+ "\t\t\t\t\t\thideTabs();" + NL + "\t\t\t\t\t\tguard = false;" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL

 			+ "\t\t\t });" + NL + "" + NL + "\t\tgetSite().getShell().getDisplay().asyncExec" + NL

-			+ "\t\t\t(new Runnable()" + NL + "\t\t\t {" + NL + "\t\t\t\t public void run()" + NL + "\t\t\t\t {" + NL

+			+ "\t\t\t(new Runnable()" + NL + "\t\t\t {";

+	protected final String TEXT_265 = NL + "\t\t\t\t public void run()" + NL + "\t\t\t\t {" + NL

 			+ "\t\t\t\t\t updateProblemIndication();" + NL + "\t\t\t\t }" + NL + "\t\t\t });" + NL + "\t}" + NL + ""

 			+ NL + "\t/**" + NL + "\t * If there is just one page in the multi-page editor part," + NL

 			+ "\t * this hides the single tab at the bottom." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void hideTabs()"

 			+ NL + "\t{" + NL + "\t\tif (getPageCount() <= 1)" + NL + "\t\t{" + NL + "\t\t\tsetPageText(0, \"\");";

-	protected final String TEXT_244 = NL + "\t\t\tif (getContainer() instanceof CTabFolder)" + NL + "\t\t\t{" + NL

+	protected final String TEXT_266 = NL + "\t\t\tif (getContainer() instanceof CTabFolder)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tPoint point = getContainer().getSize();" + NL

 			+ "\t\t\t\tRectangle clientArea = getContainer().getClientArea();" + NL

 			+ "\t\t\t\tgetContainer().setSize(point.x,  2 * point.y - clientArea.height - clientArea.y);" + NL

@@ -833,91 +851,96 @@
 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void showTabs()"

 			+ NL + "\t{" + NL + "\t\tif (getPageCount() > 1)" + NL + "\t\t{" + NL

 			+ "\t\t\tsetPageText(0, getString(\"_UI_SelectionPage_label\"));";

-	protected final String TEXT_245 = NL + "\t\t\tif (getContainer() instanceof CTabFolder)" + NL + "\t\t\t{" + NL

+	protected final String TEXT_267 = NL + "\t\t\tif (getContainer() instanceof CTabFolder)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tPoint point = getContainer().getSize();" + NL

 			+ "\t\t\t\tRectangle clientArea = getContainer().getClientArea();" + NL

 			+ "\t\t\t\tgetContainer().setSize(point.x, clientArea.height + clientArea.y);" + NL + "\t\t\t}" + NL

 			+ "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * This is used to track the active viewer." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_246 = NL + "\tprotected void pageChange(int pageIndex)" + NL + "\t{" + NL

+	protected final String TEXT_268 = NL + "\tprotected void pageChange(int pageIndex)" + NL + "\t{" + NL

 			+ "\t\tsuper.pageChange(pageIndex);" + NL + "" + NL + "\t\tif (contentOutlinePage != null)" + NL + "\t\t{"

 			+ NL + "\t\t\thandleContentOutlineSelection(contentOutlinePage.getSelection());" + NL + "\t\t}" + NL + "\t}"

 			+ NL + "" + NL + "\t/**" + NL + "\t * This is how the framework determines which interfaces we implement."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_247 = NL + "\t@SuppressWarnings(\"";

-	protected final String TEXT_248 = "rawtypes";

-	protected final String TEXT_249 = "unchecked";

-	protected final String TEXT_250 = "\")";

-	protected final String TEXT_251 = NL + "\tpublic <T> T getAdapter(Class<T> key)";

-	protected final String TEXT_252 = NL + "\tpublic Object getAdapter(Class key)";

-	protected final String TEXT_253 = NL + "\t{" + NL + "\t\tif (key.equals(IContentOutlinePage.class))" + NL + "\t\t{";

-	protected final String TEXT_254 = NL + "\t\t\treturn showOutlineView() ? key.cast(getContentOutlinePage()) : null;";

-	protected final String TEXT_255 = NL + "\t\t\treturn showOutlineView() ? getContentOutlinePage() : null;";

-	protected final String TEXT_256 = NL + "\t\t}" + NL + "\t\telse if (key.equals(IPropertySheetPage.class))" + NL

+	protected final String TEXT_269 = NL + "\t@SuppressWarnings(\"";

+	protected final String TEXT_270 = "rawtypes";

+	protected final String TEXT_271 = "unchecked";

+	protected final String TEXT_272 = "\")";

+	protected final String TEXT_273 = NL + "\tpublic <T> T getAdapter(Class<T> key)";

+	protected final String TEXT_274 = NL + "\tpublic Object getAdapter(Class key)";

+	protected final String TEXT_275 = NL + "\t{" + NL + "\t\tif (key.equals(IContentOutlinePage.class))" + NL + "\t\t{";

+	protected final String TEXT_276 = NL + "\t\t\treturn showOutlineView() ? key.cast(getContentOutlinePage()) : null;";

+	protected final String TEXT_277 = NL + "\t\t\treturn showOutlineView() ? getContentOutlinePage() : null;";

+	protected final String TEXT_278 = NL + "\t\t}" + NL + "\t\telse if (key.equals(IPropertySheetPage.class))" + NL

 			+ "\t\t{";

-	protected final String TEXT_257 = NL + "\t\t\treturn key.cast(getPropertySheetPage());";

-	protected final String TEXT_258 = NL + "\t\t\treturn getPropertySheetPage();";

-	protected final String TEXT_259 = NL + "\t\t}";

-	protected final String TEXT_260 = NL + "\t\telse if (key.equals(IGotoMarker.class))" + NL + "\t\t{";

-	protected final String TEXT_261 = NL + "\t\t\treturn key.cast(this);";

-	protected final String TEXT_262 = NL + "\t\t\treturn this;";

-	protected final String TEXT_263 = NL + "\t\telse" + NL + "\t\t{" + NL + "\t\t\treturn super.getAdapter(key);" + NL

+	protected final String TEXT_279 = NL + "\t\t\treturn key.cast(getPropertySheetPage());";

+	protected final String TEXT_280 = NL + "\t\t\treturn getPropertySheetPage();";

+	protected final String TEXT_281 = NL + "\t\t}";

+	protected final String TEXT_282 = NL + "\t\telse if (key.equals(IGotoMarker.class))" + NL + "\t\t{";

+	protected final String TEXT_283 = NL + "\t\t\treturn key.cast(this);";

+	protected final String TEXT_284 = NL + "\t\t\treturn this;";

+	protected final String TEXT_285 = NL + "\t\telse if (key.equals(";

+	protected final String TEXT_286 = ".class)) " + NL + "\t\t{" + NL + "\t\t\treturn ";

+	protected final String TEXT_287 = ".getAdapter(key, this, ";

+	protected final String TEXT_288 = ".getPlugin());" + NL + "\t\t}";

+	protected final String TEXT_289 = NL + "\t\telse" + NL + "\t\t{" + NL + "\t\t\treturn super.getAdapter(key);" + NL

 			+ "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This accesses a cached version of the content outliner." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tpublic IContentOutlinePage getContentOutlinePage()" + NL + "\t{" + NL

 			+ "\t\tif (contentOutlinePage == null)" + NL + "\t\t{" + NL + "\t\t\t// The content outline is just a tree."

 			+ NL + "\t\t\t//" + NL + "\t\t\tclass MyContentOutlinePage extends ContentOutlinePage" + NL + "\t\t\t{";

-	protected final String TEXT_264 = NL + "\t\t\t\tpublic void createControl(Composite parent)" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_290 = NL + "\t\t\t\tpublic void createControl(Composite parent)" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\tsuper.createControl(parent);" + NL + "\t\t\t\t\tcontentOutlineViewer = getTreeViewer();" + NL

 			+ "\t\t\t\t\tcontentOutlineViewer.addSelectionChangedListener(this);" + NL + "" + NL

 			+ "\t\t\t\t\t// Set up the tree viewer." + NL + "\t\t\t\t\t//" + NL

 			+ "\t\t\t\t\tcontentOutlineViewer.setUseHashlookup(true);" + NL

 			+ "\t\t\t\t\tcontentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));"

 			+ NL + "\t\t\t\t\tcontentOutlineViewer.setLabelProvider(";

-	protected final String TEXT_265 = ", contentOutlineViewer";

-	protected final String TEXT_266 = ");" + NL

+	protected final String TEXT_291 = ", contentOutlineViewer";

+	protected final String TEXT_292 = ");" + NL

 			+ "\t\t\t\t\tcontentOutlineViewer.setInput(editingDomain.getResourceSet());" + NL;

-	protected final String TEXT_267 = NL + "\t\t\t\t\tnew ";

-	protected final String TEXT_268 = "(contentOutlineViewer, new ";

-	protected final String TEXT_269 = ".EditingDomainLocationListener(editingDomain, contentOutlineViewer));" + NL;

-	protected final String TEXT_270 = NL + "\t\t\t\t\t// Make sure our popups work." + NL + "\t\t\t\t\t//" + NL

+	protected final String TEXT_293 = NL + "\t\t\t\t\tnew ";

+	protected final String TEXT_294 = "(contentOutlineViewer, new ";

+	protected final String TEXT_295 = ".EditingDomainLocationListener(editingDomain, contentOutlineViewer));" + NL;

+	protected final String TEXT_296 = NL + "\t\t\t\t\t// Make sure our popups work." + NL + "\t\t\t\t\t//" + NL

 			+ "\t\t\t\t\tcreateContextMenuFor(contentOutlineViewer);" + NL + "" + NL

 			+ "\t\t\t\t\tif (!editingDomain.getResourceSet().getResources().isEmpty())" + NL + "\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t  // Select the root object in the view." + NL + "\t\t\t\t\t  //" + NL

 			+ "\t\t\t\t\t  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);"

 			+ NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL;

-	protected final String TEXT_271 = NL

+	protected final String TEXT_297 = NL

 			+ "\t\t\t\tpublic void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager)"

 			+ NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\tsuper.makeContributions(menuManager, toolBarManager, statusLineManager);" + NL

 			+ "\t\t\t\t\tcontentOutlineStatusLineManager = statusLineManager;" + NL + "\t\t\t\t}" + NL;

-	protected final String TEXT_272 = NL + "\t\t\t\tpublic void setActionBars(IActionBars actionBars)" + NL

+	protected final String TEXT_298 = NL + "\t\t\t\tpublic void setActionBars(IActionBars actionBars)" + NL

 			+ "\t\t\t\t{" + NL + "\t\t\t\t\tsuper.setActionBars(actionBars);" + NL

 			+ "\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);" + NL + "\t\t\t\t}" + NL

 			+ "\t\t\t}" + NL + "" + NL + "\t\t\tcontentOutlinePage = new MyContentOutlinePage();" + NL + "" + NL

 			+ "\t\t\t// Listen to selection so that we can handle it is a special way." + NL + "\t\t\t//" + NL

 			+ "\t\t\tcontentOutlinePage.addSelectionChangedListener" + NL + "\t\t\t\t(new ISelectionChangedListener()"

 			+ NL + "\t\t\t\t {" + NL + "\t\t\t\t\t // This ensures that we handle selections correctly." + NL

-			+ "\t\t\t\t\t //" + NL + "\t\t\t\t\t public void selectionChanged(SelectionChangedEvent event)" + NL

+			+ "\t\t\t\t\t //";

+	protected final String TEXT_299 = NL + "\t\t\t\t\t public void selectionChanged(SelectionChangedEvent event)" + NL

 			+ "\t\t\t\t\t {" + NL + "\t\t\t\t\t\t handleContentOutlineSelection(event.getSelection());" + NL

 			+ "\t\t\t\t\t }" + NL + "\t\t\t\t });" + NL + "\t\t}" + NL + "" + NL + "\t\treturn contentOutlinePage;" + NL

 			+ "\t}" + NL + "" + NL + "\t/**" + NL + "\t * This accesses a cached version of the property sheet." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tpublic IPropertySheetPage getPropertySheetPage()" + NL + "\t{" + NL

 			+ "\t\tPropertySheetPage propertySheetPage =" + NL + "\t\t\tnew ExtendedPropertySheetPage(editingDomain";

-	protected final String TEXT_273 = ", ExtendedPropertySheetPage.Decoration.MANUAL";

-	protected final String TEXT_274 = ", ExtendedPropertySheetPage.Decoration.LIVE, ";

-	protected final String TEXT_275 = "ExtendedPropertySheetPage.Decoration.NONE, ";

-	protected final String TEXT_276 = "null, ";

-	protected final String TEXT_277 = ")" + NL + "\t\t\t{";

-	protected final String TEXT_278 = NL + "\t\t\t\tpublic void setSelectionToViewer(";

-	protected final String TEXT_279 = " selection)" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\t";

-	protected final String TEXT_280 = ".this.setSelectionToViewer(selection);" + NL + "\t\t\t\t\t";

-	protected final String TEXT_281 = ".this.setFocus();" + NL + "\t\t\t\t}" + NL;

-	protected final String TEXT_282 = NL + "\t\t\t\tpublic void setActionBars(IActionBars actionBars)" + NL

+	protected final String TEXT_300 = ", ExtendedPropertySheetPage.Decoration.MANUAL";

+	protected final String TEXT_301 = ", ExtendedPropertySheetPage.Decoration.LIVE, ";

+	protected final String TEXT_302 = "ExtendedPropertySheetPage.Decoration.NONE, ";

+	protected final String TEXT_303 = "null, ";

+	protected final String TEXT_304 = ")" + NL + "\t\t\t{";

+	protected final String TEXT_305 = NL + "\t\t\t\tpublic void setSelectionToViewer(";

+	protected final String TEXT_306 = " selection)" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\t";

+	protected final String TEXT_307 = ".this.setSelectionToViewer(selection);" + NL + "\t\t\t\t\t";

+	protected final String TEXT_308 = ".this.setFocus();" + NL + "\t\t\t\t}" + NL;

+	protected final String TEXT_309 = NL + "\t\t\t\tpublic void setActionBars(IActionBars actionBars)" + NL

 			+ "\t\t\t\t{" + NL + "\t\t\t\t\tsuper.setActionBars(actionBars);" + NL

 			+ "\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);" + NL + "\t\t\t\t}" + NL

 			+ "\t\t\t};" + NL

@@ -927,22 +950,22 @@
 			+ "\t * This deals with how we want selection in the outliner to affect the other views." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tpublic void handleContentOutlineSelection(ISelection selection)" + NL + "\t{";

-	protected final String TEXT_283 = NL

+	protected final String TEXT_310 = NL

 			+ "\t\tif (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection)";

-	protected final String TEXT_284 = NL

+	protected final String TEXT_311 = NL

 			+ "\t\tif (selectionViewer != null && !selection.isEmpty() && selection instanceof IStructuredSelection)";

-	protected final String TEXT_285 = NL + "\t\t{" + NL + "\t\t\tIterator";

-	protected final String TEXT_286 = "<?>";

-	protected final String TEXT_287 = " selectedElements = ((IStructuredSelection)selection).iterator();" + NL

+	protected final String TEXT_312 = NL + "\t\t{" + NL + "\t\t\tIterator";

+	protected final String TEXT_313 = "<?>";

+	protected final String TEXT_314 = " selectedElements = ((IStructuredSelection)selection).iterator();" + NL

 			+ "\t\t\tif (selectedElements.hasNext())" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\t// Get the first selected element." + NL + "\t\t\t\t//" + NL

 			+ "\t\t\t\tObject selectedElement = selectedElements.next();" + NL;

-	protected final String TEXT_288 = NL

+	protected final String TEXT_315 = NL

 			+ "\t\t\t\t// If it's the selection viewer, then we want it to select the same selection as this selection."

 			+ NL + "\t\t\t\t//" + NL + "\t\t\t\tif (currentViewerPane.getViewer() == selectionViewer)" + NL

 			+ "\t\t\t\t{" + NL + "\t\t\t\t\t";

-	protected final String TEXT_289 = " selectionList = new ";

-	protected final String TEXT_290 = "();" + NL + "\t\t\t\t\tselectionList.add(selectedElement);" + NL

+	protected final String TEXT_316 = " selectionList = new ";

+	protected final String TEXT_317 = "();" + NL + "\t\t\t\t\tselectionList.add(selectedElement);" + NL

 			+ "\t\t\t\t\twhile (selectedElements.hasNext())" + NL + "\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\tselectionList.add(selectedElements.next());" + NL + "\t\t\t\t\t}" + NL + "" + NL

 			+ "\t\t\t\t\t// Set the selection to the widget." + NL + "\t\t\t\t\t//" + NL

@@ -951,52 +974,80 @@
 			+ NL + "\t\t\t\t\tif (currentViewerPane.getViewer().getInput() != selectedElement)" + NL + "\t\t\t\t\t{"

 			+ NL + "\t\t\t\t\t\tcurrentViewerPane.getViewer().setInput(selectedElement);" + NL

 			+ "\t\t\t\t\t\tcurrentViewerPane.setTitle(selectedElement);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}";

-	protected final String TEXT_291 = NL + "\t\t\t\t";

-	protected final String TEXT_292 = "();" + NL + "\t\t\t\tselectionList.add(selectedElement);" + NL

+	protected final String TEXT_318 = NL + "\t\t\t\t";

+	protected final String TEXT_319 = "();" + NL + "\t\t\t\tselectionList.add(selectedElement);" + NL

 			+ "\t\t\t\twhile (selectedElements.hasNext())" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\tselectionList.add(selectedElements.next());" + NL + "\t\t\t\t}" + NL + "" + NL

 			+ "\t\t\t\t// Set the selection to the widget." + NL + "\t\t\t\t//" + NL

 			+ "\t\t\t\tselectionViewer.setSelection(new StructuredSelection(selectionList));";

-	protected final String TEXT_293 = NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_320 = NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This is for implementing {@link IEditorPart} and simply tests the command stack." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_294 = NL + "\tpublic boolean isDirty()" + NL + "\t{" + NL

-			+ "\t\treturn ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();" + NL + "\t}" + NL + ""

-			+ NL + "\t/**" + NL + "\t * This is for implementing {@link IEditorPart} and simply saves the model file."

-			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

+	protected final String TEXT_321 = NL + "\tpublic boolean isDirty()" + NL + "\t{" + NL

+			+ "\t\treturn ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();" + NL + "\t}" + NL;

+	protected final String TEXT_322 = NL + "\t/**" + NL + "\t * This is for implementing {@link IRevertablePart}." + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_295 = NL + "\tpublic void doSave(IProgressMonitor progressMonitor)" + NL + "\t{" + NL

+	protected final String TEXT_323 = NL + "\tpublic void doRevert()" + NL + "\t{";

+	protected final String TEXT_324 = NL + "\t\tDiagnosticDecorator.cancel(editingDomain);" + NL;

+	protected final String TEXT_325 = "\t\t" + NL + "\t\tResourceSet resourceSet = editingDomain.getResourceSet();" + NL

+			+ "\t\t";

+	protected final String TEXT_326 = " resources = resourceSet.getResources();" + NL + "\t\t";

+	protected final String TEXT_327 = " unloadedResources = new ";

+	protected final String TEXT_328 = "();" + NL + "\t\tupdateProblemIndication = false;" + NL

+			+ "\t\tfor (int i = 0; i < resources.size(); ++i)" + NL + "\t\t{" + NL

+			+ "\t\t\tResource resource = resources.get(i);" + NL + "\t\t\tif (resource.isLoaded())" + NL + "\t\t\t{"

+			+ NL + "\t\t\t\tresource.unload();" + NL + "\t\t\t\tunloadedResources.add(resource);" + NL + "\t\t\t}" + NL

+			+ "\t\t}" + NL + "" + NL + "\t\tresourceToDiagnosticMap.clear();";

+	protected final String TEXT_329 = NL + "\t\tfor (Resource resource : unloadedResources)";

+	protected final String TEXT_330 = NL + "\t\tfor (Iterator i = unloadedResources.iterator(); i.hasNext(); )";

+	protected final String TEXT_331 = NL + "\t\t{";

+	protected final String TEXT_332 = NL + "\t\t\ttry" + NL + "\t\t\t{" + NL

+			+ "\t\t\t\tresource.load(resourceSet.getLoadOptions());" + NL + "\t\t\t}" + NL

+			+ "\t\t\tcatch (IOException exception)" + NL + "\t\t\t{" + NL

+			+ "\t\t\t\tif (!resourceToDiagnosticMap.containsKey(resource))" + NL + "\t\t\t\t{" + NL

+			+ "\t\t\t\t\tresourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));" + NL

+			+ "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "" + NL

+			+ "\t\teditingDomain.getCommandStack().flush();" + NL + "" + NL

+			+ "\t\tif (AdapterFactoryEditingDomain.isStale(editorSelection))" + NL + "\t\t{" + NL

+			+ "\t\t\tsetSelection(StructuredSelection.EMPTY);" + NL + "\t\t}" + NL + "" + NL

+			+ "\t\tupdateProblemIndication = true;" + NL + "\t\tupdateProblemIndication();" + NL + "\t}" + NL;

+	protected final String TEXT_333 = NL + "\t/**" + NL

+			+ "\t * This is for implementing {@link IEditorPart} and simply saves the model file." + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

+			+ "\t */";

+	protected final String TEXT_334 = NL + "\tpublic void doSave(IProgressMonitor progressMonitor)" + NL + "\t{" + NL

 			+ "\t\t// Save only resources that have actually changed." + NL + "\t\t//" + NL + "\t\tfinal ";

-	protected final String TEXT_296 = " saveOptions = new ";

-	protected final String TEXT_297 = NL

+	protected final String TEXT_335 = " saveOptions = new ";

+	protected final String TEXT_336 = NL

 			+ "\t\tsaveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);";

-	protected final String TEXT_298 = NL

+	protected final String TEXT_337 = NL

 			+ "\t\tsaveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);";

-	protected final String TEXT_299 = NL + NL

+	protected final String TEXT_338 = NL + NL

 			+ "\t\t// Do the work within an operation because this is a long running activity that modifies the workbench."

 			+ NL + "\t\t//" + NL + "\t\t";

-	protected final String TEXT_300 = " operation =" + NL + "\t\t\tnew ";

-	protected final String TEXT_301 = "()" + NL + "\t\t\t{" + NL

+	protected final String TEXT_339 = " operation =" + NL + "\t\t\tnew ";

+	protected final String TEXT_340 = "()" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\t// This is the method that gets invoked when the operation runs." + NL + "\t\t\t\t//";

-	protected final String TEXT_302 = NL + "\t\t\t\tpublic void ";

-	protected final String TEXT_303 = "(IProgressMonitor monitor)" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_341 = NL + "\t\t\t\tpublic void ";

+	protected final String TEXT_342 = "(IProgressMonitor monitor)" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\t// Save the resources to the file system." + NL + "\t\t\t\t\t//" + NL

 			+ "\t\t\t\t\tboolean first = true;" + NL + "\t\t\t\t\t";

-	protected final String TEXT_304 = " resources = editingDomain.getResourceSet().getResources();" + NL

+	protected final String TEXT_343 = " resources = editingDomain.getResourceSet().getResources();" + NL

 			+ "\t\t\t\t\tfor (int i = 0; i < resources.size(); ++i)" + NL + "\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\tResource resource = ";

-	protected final String TEXT_305 = "(Resource)";

-	protected final String TEXT_306 = "resources.get(i);" + NL

+	protected final String TEXT_344 = "(Resource)";

+	protected final String TEXT_345 = "resources.get(i);" + NL

 			+ "\t\t\t\t\t\tif ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource))"

 			+ NL + "\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\ttry" + NL + "\t\t\t\t\t\t\t{";

-	protected final String TEXT_307 = NL + "\t\t\t\t\t\t\t\tlong timeStamp = resource.getTimeStamp();" + NL

+	protected final String TEXT_346 = NL + "\t\t\t\t\t\t\t\tlong timeStamp = resource.getTimeStamp();" + NL

 			+ "\t\t\t\t\t\t\t\tresource.save(saveOptions);" + NL

 			+ "\t\t\t\t\t\t\t\tif (resource.getTimeStamp() != timeStamp)" + NL + "\t\t\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\t\t\tsavedResources.add(resource);" + NL + "\t\t\t\t\t\t\t\t}";

-	protected final String TEXT_308 = NL + "\t\t\t\t\t\t\t\tresource.save(saveOptions);" + NL

+	protected final String TEXT_347 = NL + "\t\t\t\t\t\t\t\tresource.save(saveOptions);" + NL

 			+ "\t\t\t\t\t\t\t\tsavedResources.add(resource);";

-	protected final String TEXT_309 = NL + "\t\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t\tcatch (Exception exception)" + NL

+	protected final String TEXT_348 = NL + "\t\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t\tcatch (Exception exception)" + NL

 			+ "\t\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\t\tresourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));"

 			+ NL + "\t\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t\tfirst = false;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}"

@@ -1008,7 +1059,7 @@
 			+ "\t\t\tfirePropertyChange(IEditorPart.PROP_DIRTY);" + NL + "\t\t}" + NL

 			+ "\t\tcatch (Exception exception)" + NL + "\t\t{" + NL + "\t\t\t// Something went wrong that shouldn't."

 			+ NL + "\t\t\t//" + NL + "\t\t\t";

-	protected final String TEXT_310 = ".INSTANCE.log(exception);" + NL + "\t\t}" + NL

+	protected final String TEXT_349 = ".INSTANCE.log(exception);" + NL + "\t\t}" + NL

 			+ "\t\tupdateProblemIndication = true;" + NL + "\t\tupdateProblemIndication();" + NL + "\t}" + NL + "" + NL

 			+ "\t/**" + NL

 			+ "\t * This returns whether something has been persisted to the URI of the specified resource." + NL

@@ -1023,54 +1074,54 @@
 			+ "\t/**" + NL + "\t * This always returns true because it is not currently supported." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_311 = NL + "\tpublic boolean isSaveAsAllowed()" + NL + "\t{" + NL + "\t\treturn true;"

+	protected final String TEXT_350 = NL + "\tpublic boolean isSaveAsAllowed()" + NL + "\t{" + NL + "\t\treturn true;"

 			+ NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * This also changes the editor's input." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_312 = NL + "\tpublic void doSaveAs()" + NL + "\t{";

-	protected final String TEXT_313 = NL + "\t\tnew ";

-	protected final String TEXT_314 = "(getSite().getShell(), null, SWT.NONE)" + NL + "\t\t\t{";

-	protected final String TEXT_315 = NL + "\t\t\t\tprotected boolean isSave()" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_351 = NL + "\tpublic void doSaveAs()" + NL + "\t{";

+	protected final String TEXT_352 = NL + "\t\tnew ";

+	protected final String TEXT_353 = "(getSite().getShell(), null, SWT.NONE)" + NL + "\t\t\t{";

+	protected final String TEXT_354 = NL + "\t\t\t\tprotected boolean isSave()" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\treturn true;" + NL + "\t\t\t\t}" + NL;

-	protected final String TEXT_316 = NL + "\t\t\t\tprotected boolean processResources()" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_355 = NL + "\t\t\t\tprotected boolean processResources()" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\t";

-	protected final String TEXT_317 = " uris = getURIs();" + NL + "\t\t\t\t\tif (uris.size() > 0)" + NL + "\t\t\t\t\t{"

+	protected final String TEXT_356 = " uris = getURIs();" + NL + "\t\t\t\t\tif (uris.size() > 0)" + NL + "\t\t\t\t\t{"

 			+ NL + "\t\t\t\t\t\tURI uri = ";

-	protected final String TEXT_318 = "uris.get(0);" + NL + "\t\t\t\t\t\tdoSaveAs(uri, new ";

-	protected final String TEXT_319 = "(uri));" + NL + "\t\t\t\t\t\treturn true;" + NL + "\t\t\t\t\t}" + NL

+	protected final String TEXT_357 = "uris.get(0);" + NL + "\t\t\t\t\t\tdoSaveAs(uri, new ";

+	protected final String TEXT_358 = "(uri));" + NL + "\t\t\t\t\t\treturn true;" + NL + "\t\t\t\t\t}" + NL

 			+ "\t\t\t\t\telse" + NL + "\t\t\t\t\t{" + NL + "\t\t\t\t\t\treturn false;" + NL + "\t\t\t\t\t}" + NL

 			+ "\t\t\t\t}" + NL + "\t\t\t}.open();";

-	protected final String TEXT_320 = NL + "\t\tString[] filters = ";

-	protected final String TEXT_321 = "(String[])";

-	protected final String TEXT_322 = "FILE_EXTENSION_FILTERS.toArray(new String[FILE_EXTENSION_FILTERS.size()]);" + NL

+	protected final String TEXT_359 = NL + "\t\tString[] filters = ";

+	protected final String TEXT_360 = "(String[])";

+	protected final String TEXT_361 = "FILE_EXTENSION_FILTERS.toArray(new String[FILE_EXTENSION_FILTERS.size()]);" + NL

 			+ "\t\tString[] files = ";

-	protected final String TEXT_323 = ".openFilePathDialog(getSite().getShell(), ";

-	protected final String TEXT_324 = ".SAVE, filters);" + NL + "\t\tif (files.length > 0)" + NL + "\t\t{" + NL

+	protected final String TEXT_362 = ".openFilePathDialog(getSite().getShell(), ";

+	protected final String TEXT_363 = ".SAVE, filters);" + NL + "\t\tif (files.length > 0)" + NL + "\t\t{" + NL

 			+ "\t\t\tURI uri = URI.createFileURI(files[0]);" + NL + "\t\t\tdoSaveAs(uri, new ";

-	protected final String TEXT_325 = "(uri));" + NL + "\t\t}";

-	protected final String TEXT_326 = NL + "\t\tSaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());"

+	protected final String TEXT_364 = "(uri));" + NL + "\t\t}";

+	protected final String TEXT_365 = NL + "\t\tSaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());"

 			+ NL + "\t\tsaveAsDialog.open();" + NL + "\t\tIPath path = saveAsDialog.getResult();" + NL

 			+ "\t\tif (path != null)" + NL + "\t\t{" + NL

 			+ "\t\t\tIFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);" + NL

 			+ "\t\t\tif (file != null)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tdoSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));"

 			+ NL + "\t\t\t}" + NL + "\t\t}";

-	protected final String TEXT_327 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_366 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprotected void doSaveAs(URI uri, IEditorInput editorInput)" + NL + "\t{" + NL + "\t\t(";

-	protected final String TEXT_328 = "editingDomain.getResourceSet().getResources().get(0)).setURI(uri);" + NL

+	protected final String TEXT_367 = "editingDomain.getResourceSet().getResources().get(0)).setURI(uri);" + NL

 			+ "\t\tsetInputWithNotify(editorInput);" + NL + "\t\tsetPartName(editorInput.getName());" + NL

 			+ "\t\tIProgressMonitor progressMonitor =" + NL + "\t\t\tgetActionBars().getStatusLineManager() != null ?"

 			+ NL + "\t\t\t\tgetActionBars().getStatusLineManager().getProgressMonitor() :" + NL + "\t\t\t\tnew ";

-	protected final String TEXT_329 = "();" + NL + "\t\tdoSave(progressMonitor);" + NL + "\t}";

-	protected final String TEXT_330 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

-			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

-			+ "\tpublic void gotoMarker(IMarker marker)" + NL + "\t{";

-	protected final String TEXT_331 = NL + "\t\t";

-	protected final String TEXT_332 = " targetObjects = markerHelper.getTargetObjects(editingDomain, marker);" + NL

+	protected final String TEXT_368 = "();" + NL + "\t\tdoSave(progressMonitor);" + NL + "\t}";

+	protected final String TEXT_369 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

+	protected final String TEXT_370 = NL + "\tpublic void gotoMarker(IMarker marker)" + NL + "\t{";

+	protected final String TEXT_371 = NL + "\t\t";

+	protected final String TEXT_372 = " targetObjects = markerHelper.getTargetObjects(editingDomain, marker);" + NL

 			+ "\t\tif (!targetObjects.isEmpty())" + NL + "\t\t{" + NL + "\t\t\tsetSelectionToViewer(targetObjects);"

 			+ NL + "\t\t}";

-	protected final String TEXT_333 = NL + "\t\ttry" + NL + "\t\t{" + NL

+	protected final String TEXT_373 = NL + "\t\ttry" + NL + "\t\t{" + NL

 			+ "\t\t\tif (marker.isSubtypeOf(EValidator.MARKER))" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tString uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);" + NL

 			+ "\t\t\t\tif (uriAttribute != null)" + NL + "\t\t\t\t{" + NL

@@ -1080,49 +1131,53 @@
 			+ "\t\t\t\t\t  setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));" + NL

 			+ "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t}" + NL

 			+ "\t\tcatch (CoreException exception)" + NL + "\t\t{" + NL + "\t\t\t";

-	protected final String TEXT_334 = ".INSTANCE.log(exception);" + NL + "\t\t}";

-	protected final String TEXT_335 = NL + "\t}";

-	protected final String TEXT_336 = NL + NL + "\t/**" + NL + "\t * This is called during startup." + NL

+	protected final String TEXT_374 = ".INSTANCE.log(exception);" + NL + "\t\t}";

+	protected final String TEXT_375 = NL + "\t}";

+	protected final String TEXT_376 = NL + NL + "\t/**" + NL + "\t * This is called during startup." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_337 = NL + "\tpublic void init(IEditorSite site, IEditorInput editorInput)" + NL + "\t{"

+	protected final String TEXT_377 = NL + "\tpublic void init(IEditorSite site, IEditorInput editorInput)" + NL + "\t{"

 			+ NL + "\t\tsetSite(site);" + NL + "\t\tsetInputWithNotify(editorInput);" + NL

 			+ "\t\tsetPartName(editorInput.getName());" + NL + "\t\tsite.setSelectionProvider(this);" + NL

 			+ "\t\tsite.getPage().addPartListener(partListener);";

-	protected final String TEXT_338 = NL

+	protected final String TEXT_378 = NL

 			+ "\t\tResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);";

-	protected final String TEXT_339 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_379 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

-	protected final String TEXT_340 = NL + "\tpublic void setFocus()" + NL + "\t{";

-	protected final String TEXT_341 = NL + "\t\tif (currentViewerPane != null)" + NL + "\t\t{" + NL

+	protected final String TEXT_380 = NL + "\tpublic void setFocus()" + NL + "\t{";

+	protected final String TEXT_381 = NL + "\t\tif (currentViewerPane != null)" + NL + "\t\t{" + NL

 			+ "\t\t\tcurrentViewerPane.setFocus();" + NL + "\t\t}" + NL + "\t\telse" + NL + "\t\t{" + NL

 			+ "\t\t\tgetControl(getActivePage()).setFocus();" + NL + "\t\t}";

-	protected final String TEXT_342 = NL + "\t\tgetControl(getActivePage()).setFocus();";

-	protected final String TEXT_343 = NL + "\t}" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_382 = NL + "\t\tgetControl(getActivePage()).setFocus();";

+	protected final String TEXT_383 = NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}." + NL

-			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

-			+ NL + "\tpublic void addSelectionChangedListener(ISelectionChangedListener listener)" + NL + "\t{" + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

+			+ "\t */";

+	protected final String TEXT_384 = NL

+			+ "\tpublic void addSelectionChangedListener(ISelectionChangedListener listener)" + NL + "\t{" + NL

 			+ "\t\tselectionChangedListeners.add(listener);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}." + NL

-			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

-			+ NL + "\tpublic void removeSelectionChangedListener(ISelectionChangedListener listener)" + NL + "\t{" + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

+			+ "\t */";

+	protected final String TEXT_385 = NL

+			+ "\tpublic void removeSelectionChangedListener(ISelectionChangedListener listener)" + NL + "\t{" + NL

 			+ "\t\tselectionChangedListeners.remove(listener);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

-			+ "\t */" + NL + "\tpublic ISelection getSelection()" + NL + "\t{" + NL + "\t\treturn editorSelection;" + NL

-			+ "\t}" + NL + "" + NL + "\t/**" + NL

+			+ "\t */";

+	protected final String TEXT_386 = NL + "\tpublic ISelection getSelection()" + NL + "\t{" + NL

+			+ "\t\treturn editorSelection;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection."

 			+ NL + "\t * Calling this result will notify the listeners." + NL + "\t * <!-- begin-user-doc -->" + NL

-			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

-			+ "\tpublic void setSelection(ISelection selection)" + NL + "\t{" + NL + "\t\teditorSelection = selection;"

-			+ NL;

-	protected final String TEXT_344 = NL + "\t\tfor (ISelectionChangedListener listener : selectionChangedListeners)";

-	protected final String TEXT_345 = NL

+			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

+	protected final String TEXT_387 = NL + "\tpublic void setSelection(ISelection selection)" + NL + "\t{" + NL

+			+ "\t\teditorSelection = selection;" + NL;

+	protected final String TEXT_388 = NL + "\t\tfor (ISelectionChangedListener listener : selectionChangedListeners)";

+	protected final String TEXT_389 = NL

 			+ "\t\tfor (Iterator listeners = selectionChangedListeners.iterator(); listeners.hasNext(); )";

-	protected final String TEXT_346 = NL + "\t\t{";

-	protected final String TEXT_347 = NL

+	protected final String TEXT_390 = NL

 			+ "\t\t\tISelectionChangedListener listener = (ISelectionChangedListener)listeners.next();";

-	protected final String TEXT_348 = NL

+	protected final String TEXT_391 = NL

 			+ "\t\t\tlistener.selectionChanged(new SelectionChangedEvent(this, selection));" + NL + "\t\t}" + NL

 			+ "\t\tsetStatusLineManager(selection);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

@@ -1131,31 +1186,32 @@
 			+ NL + "\t\t\tcontentOutlineStatusLineManager : getActionBars().getStatusLineManager();" + NL + "" + NL

 			+ "\t\tif (statusLineManager != null)" + NL + "\t\t{" + NL

 			+ "\t\t\tif (selection instanceof IStructuredSelection)" + NL + "\t\t\t{" + NL + "\t\t\t\t";

-	protected final String TEXT_349 = " collection = ((IStructuredSelection)selection).toList();" + NL

+	protected final String TEXT_392 = " collection = ((IStructuredSelection)selection).toList();" + NL

 			+ "\t\t\t\tswitch (collection.size())" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\tcase 0:" + NL + "\t\t\t\t\t{"

 			+ NL + "\t\t\t\t\t\tstatusLineManager.setMessage(getString(\"_UI_NoObjectSelected\"));";

-	protected final String TEXT_350 = NL + "\t\t\t\t\t\tbreak;" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tcase 1:" + NL

+	protected final String TEXT_393 = NL + "\t\t\t\t\t\tbreak;" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tcase 1:" + NL

 			+ "\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\tString text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());"

 			+ NL + "\t\t\t\t\t\tstatusLineManager.setMessage(getString(\"_UI_SingleObjectSelected\", text));";

-	protected final String TEXT_351 = NL + "\t\t\t\t\t\tbreak;" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tdefault:" + NL

+	protected final String TEXT_394 = NL + "\t\t\t\t\t\tbreak;" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tdefault:" + NL

 			+ "\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\tstatusLineManager.setMessage(getString(\"_UI_MultiObjectSelected\", Integer.toString(collection.size())));";

-	protected final String TEXT_352 = NL + "\t\t\t\t\t\tbreak;" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t}"

+	protected final String TEXT_395 = NL + "\t\t\t\t\t\tbreak;" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t}"

 			+ NL + "\t\t\telse" + NL + "\t\t\t{" + NL + "\t\t\t\tstatusLineManager.setMessage(\"\");";

-	protected final String TEXT_353 = NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_396 = NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This looks up a string in the plugin's plugin.properties file." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprivate static String getString(String key)" + NL + "\t{" + NL + "\t\treturn ";

-	protected final String TEXT_354 = ".INSTANCE.getString(key);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_397 = ".INSTANCE.getString(key);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This looks up a string in plugin.properties, making a substitution." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprivate static String getString(String key, Object s1)" + NL + "\t{" + NL + "\t\treturn ";

-	protected final String TEXT_355 = ".INSTANCE.getString(key, new Object [] { s1 });" + NL + "\t}" + NL + "" + NL

+	protected final String TEXT_398 = ".INSTANCE.getString(key, new Object [] { s1 });" + NL + "\t}" + NL + "" + NL

 			+ "\t/**" + NL

 			+ "\t * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu."

 			+ NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

-			+ "\t */" + NL + "\tpublic void menuAboutToShow(IMenuManager menuManager)" + NL + "\t{" + NL

+			+ "\t */";

+	protected final String TEXT_399 = NL + "\tpublic void menuAboutToShow(IMenuManager menuManager)" + NL + "\t{" + NL

 			+ "\t\t((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);" + NL

 			+ "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"

 			+ NL + "\t * @generated" + NL + "\t */" + NL

@@ -1168,25 +1224,25 @@
 			+ NL + "\tpublic AdapterFactory getAdapterFactory()" + NL + "\t{" + NL + "\t\treturn adapterFactory;" + NL

 			+ "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"

 			+ NL + "\t * @generated" + NL + "\t */";

-	protected final String TEXT_356 = NL + "\tpublic void dispose()" + NL + "\t{" + NL

+	protected final String TEXT_400 = NL + "\tpublic void dispose()" + NL + "\t{" + NL

 			+ "\t\tupdateProblemIndication = false;" + NL;

-	protected final String TEXT_357 = NL

+	protected final String TEXT_401 = NL

 			+ "\t\tResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);" + NL;

-	protected final String TEXT_358 = NL + "\t\tgetSite().getPage().removePartListener(partListener);" + NL + "" + NL

+	protected final String TEXT_402 = NL + "\t\tgetSite().getPage().removePartListener(partListener);" + NL + "" + NL

 			+ "\t\tadapterFactory.dispose();" + NL + "" + NL

 			+ "\t\tif (getActionBarContributor().getActiveEditor() == this)" + NL + "\t\t{" + NL

 			+ "\t\t\tgetActionBarContributor().setActiveEditor(null);" + NL + "\t\t}" + NL;

-	protected final String TEXT_359 = NL + "\t\tfor (PropertySheetPage propertySheetPage : propertySheetPages)";

-	protected final String TEXT_360 = NL + "\t\tfor (Iterator i = propertySheetPages.iterator(); i.hasNext(); )";

-	protected final String TEXT_361 = NL + "\t\t\tPropertySheetPage propertySheetPage = (PropertySheetPage)i.next();";

-	protected final String TEXT_362 = NL + "\t\t\tpropertySheetPage.dispose();" + NL + "\t\t}" + NL + "" + NL

+	protected final String TEXT_403 = NL + "\t\tfor (PropertySheetPage propertySheetPage : propertySheetPages)";

+	protected final String TEXT_404 = NL + "\t\tfor (Iterator i = propertySheetPages.iterator(); i.hasNext(); )";

+	protected final String TEXT_405 = NL + "\t\t\tPropertySheetPage propertySheetPage = (PropertySheetPage)i.next();";

+	protected final String TEXT_406 = NL + "\t\t\tpropertySheetPage.dispose();" + NL + "\t\t}" + NL + "" + NL

 			+ "\t\tif (contentOutlinePage != null)" + NL + "\t\t{" + NL + "\t\t\tcontentOutlinePage.dispose();" + NL

 			+ "\t\t}" + NL + "" + NL + "\t\tsuper.dispose();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Returns whether the outline view should be presented to the user." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprotected boolean showOutlineView()" + NL + "\t{" + NL + "\t\treturn ";

-	protected final String TEXT_363 = ";" + NL + "\t}" + NL + "}";

-	protected final String TEXT_364 = NL;

+	protected final String TEXT_407 = ";" + NL + "\t}" + NL + "}";

+	protected final String TEXT_408 = NL;

 

 	public Editor() {

 		//Here is the constructor

@@ -1222,8 +1278,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_364);

-		stringBuffer.append(TEXT_364);

+		stringBuffer.append(TEXT_408);

+		stringBuffer.append(TEXT_408);

 		return stringBuffer.toString();

 	}

 

@@ -1295,9 +1351,9 @@
 		/**

 		 * Copyright (c) 2002-2010 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

@@ -1436,244 +1492,284 @@
 			stringBuffer.append(TEXT_31);

 		}

 		stringBuffer.append(TEXT_32);

-		if (!genModel.isRichClientPlatform()) {

+		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF23_VALUE) {

 			stringBuffer.append(TEXT_33);

 		}

-		stringBuffer.append(TEXT_34);

-		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF23_VALUE) {

-			stringBuffer.append(TEXT_35);

-		}

 		if (!genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_36);

+			stringBuffer.append(TEXT_34);

 		}

 		if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) {

-			stringBuffer.append(TEXT_37);

+			stringBuffer.append(TEXT_35);

 		}

-		stringBuffer.append(TEXT_38);

+		stringBuffer.append(TEXT_36);

 		stringBuffer.append(genPackage.getQualifiedItemProviderAdapterFactoryClassName());

-		stringBuffer.append(TEXT_39);

+		stringBuffer.append(TEXT_37);

 		genModel.markImportLocation(stringBuffer);

-		stringBuffer.append(TEXT_40);

+		stringBuffer.append(TEXT_38);

 		stringBuffer.append(genPackage.getPrefix());

-		stringBuffer.append(TEXT_41);

+		stringBuffer.append(TEXT_39);

 		if (genPackage.hasAPITags()) {

-			stringBuffer.append(TEXT_42);

+			stringBuffer.append(TEXT_40);

 			stringBuffer.append(genPackage.getAPITags(genModel.getIndentation(stringBuffer)));

 		}

-		stringBuffer.append(TEXT_43);

+		stringBuffer.append(TEXT_41);

 		if (isJDK50 && genPackage.hasAPIDeprecatedTag()) {

-			stringBuffer.append(TEXT_44);

+			stringBuffer.append(TEXT_42);

 		}

-		stringBuffer.append(TEXT_45);

+		stringBuffer.append(TEXT_43);

 		stringBuffer.append(genPackage.getEditorClassName());

-		stringBuffer.append(TEXT_46);

+		stringBuffer.append(TEXT_44);

 		if (!genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_47);

+			stringBuffer.append(TEXT_45);

 		}

-		stringBuffer.append(TEXT_48);

+		if (genModel.isRevertAction()) {

+			stringBuffer.append(TEXT_46);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.util.IRevertablePart"));

+		}

+		stringBuffer.append(TEXT_47);

 		if (genModel.hasCopyrightField()) {

-			stringBuffer.append(TEXT_49);

+			stringBuffer.append(TEXT_48);

 			stringBuffer.append(genModel.getImportedName("java.lang.String"));

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_49);

 			stringBuffer.append(genModel.getCopyrightFieldLiteral());

-			stringBuffer.append(TEXT_51);

+			stringBuffer.append(TEXT_50);

 			stringBuffer.append(genModel.getNonNLS());

 			stringBuffer.append(TEXT_5);

 		}

 		if (genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_52);

+			stringBuffer.append(TEXT_51);

 			if (genPackage.isGenerateModelWizard()) {

-				stringBuffer.append(TEXT_53);

+				stringBuffer.append(TEXT_52);

 				stringBuffer.append(_ListOfString);

-				stringBuffer.append(TEXT_54);

+				stringBuffer.append(TEXT_53);

 				stringBuffer.append(genPackage.getImportedModelWizardClassName());

-				stringBuffer.append(TEXT_55);

-				stringBuffer.append(genModel.getNonNLS());

-				stringBuffer.append(TEXT_56);

-			} else {

-				stringBuffer.append(TEXT_53);

-				stringBuffer.append(_ListOfString);

 				stringBuffer.append(TEXT_54);

+				stringBuffer.append(genModel.getNonNLS());

+				stringBuffer.append(TEXT_55);

+			} else {

+				stringBuffer.append(TEXT_52);

+				stringBuffer.append(_ListOfString);

+				stringBuffer.append(TEXT_53);

 				stringBuffer.append(genModel.getImportedName("java.util.Arrays"));

-				stringBuffer.append(TEXT_57);

+				stringBuffer.append(TEXT_56);

 				stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-				stringBuffer.append(TEXT_58);

+				stringBuffer.append(TEXT_57);

 				stringBuffer.append(genPackage.getEditorClassName());

-				stringBuffer.append(TEXT_59);

+				stringBuffer.append(TEXT_58);

 				stringBuffer.append(genModel.getNonNLS());

 				stringBuffer.append(genModel.getNonNLS(2));

 				stringBuffer.append(genModel.getNonNLS(3));

-				stringBuffer.append(TEXT_56);

+				stringBuffer.append(TEXT_55);

 			}

+			stringBuffer.append(TEXT_59);

+			stringBuffer.append(_ListOfString);

 			stringBuffer.append(TEXT_60);

 			stringBuffer.append(_ListOfString);

 			stringBuffer.append(TEXT_61);

 			stringBuffer.append(_ListOfString);

 			stringBuffer.append(TEXT_62);

-			stringBuffer.append(_ListOfString);

-			stringBuffer.append(TEXT_63);

 			stringBuffer.append(_ArrayListOfString);

-			stringBuffer.append(TEXT_64);

+			stringBuffer.append(TEXT_63);

 			if (genModel.useGenerics()) {

-				stringBuffer.append(TEXT_65);

+				stringBuffer.append(TEXT_64);

 			} else {

-				stringBuffer.append(TEXT_66);

+				stringBuffer.append(TEXT_65);

 			}

-			stringBuffer.append(TEXT_67);

+			stringBuffer.append(TEXT_66);

 		}

-		stringBuffer.append(TEXT_68);

+		stringBuffer.append(TEXT_67);

 		stringBuffer.append(_ListOfPropertySheetPage);

-		stringBuffer.append(TEXT_69);

+		stringBuffer.append(TEXT_68);

 		stringBuffer.append(_ArrayListOfPropertySheetPage);

-		stringBuffer.append(TEXT_70);

+		stringBuffer.append(TEXT_69);

 		if (genPackage.isMultipleEditorPages()) {

-			stringBuffer.append(TEXT_71);

+			stringBuffer.append(TEXT_70);

 		}

-		stringBuffer.append(TEXT_72);

+		stringBuffer.append(TEXT_71);

 		stringBuffer.append(_CollectionOfSelectionChangedListener);

-		stringBuffer.append(TEXT_73);

+		stringBuffer.append(TEXT_72);

 		stringBuffer.append(_ArrayListOfSelectionChangedListener);

-		stringBuffer.append(TEXT_74);

+		stringBuffer.append(TEXT_73);

 		if (!genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_75);

+			stringBuffer.append(TEXT_74);

 		}

-		stringBuffer.append(TEXT_76);

-		stringBuffer.append(genPackage.getEditorClassName());

+		stringBuffer.append(TEXT_75);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_76);

+		}

 		stringBuffer.append(TEXT_77);

 		stringBuffer.append(genPackage.getEditorClassName());

 		stringBuffer.append(TEXT_78);

 		stringBuffer.append(genPackage.getEditorClassName());

 		stringBuffer.append(TEXT_79);

-		stringBuffer.append(_CollectionOfResource);

+		stringBuffer.append(genPackage.getEditorClassName());

 		stringBuffer.append(TEXT_80);

-		stringBuffer.append(_ArrayListOfResource);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_76);

+		}

 		stringBuffer.append(TEXT_81);

-		stringBuffer.append(_CollectionOfResource);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_76);

+		}

 		stringBuffer.append(TEXT_82);

-		stringBuffer.append(_ArrayListOfResource);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_76);

+		}

 		stringBuffer.append(TEXT_83);

-		stringBuffer.append(_CollectionOfResource);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_76);

+		}

 		stringBuffer.append(TEXT_84);

-		stringBuffer.append(_ArrayListOfResource);

+		stringBuffer.append(_CollectionOfResource);

 		stringBuffer.append(TEXT_85);

-		stringBuffer.append(_MapOfResourceToDiagnostic);

+		stringBuffer.append(_ArrayListOfResource);

 		stringBuffer.append(TEXT_86);

-		stringBuffer.append(_LinkedHashMapOfResourceToDiagnostic);

+		stringBuffer.append(_CollectionOfResource);

 		stringBuffer.append(TEXT_87);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_88);

-		}

+		stringBuffer.append(_ArrayListOfResource);

+		stringBuffer.append(TEXT_88);

+		stringBuffer.append(_CollectionOfResource);

 		stringBuffer.append(TEXT_89);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_88);

-		}

+		stringBuffer.append(_ArrayListOfResource);

 		stringBuffer.append(TEXT_90);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_88);

-		}

+		stringBuffer.append(_MapOfResourceToDiagnostic);

 		stringBuffer.append(TEXT_91);

-		if (!genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_92);

-			stringBuffer.append(_CollectionOfResource);

-			stringBuffer.append(TEXT_82);

-			stringBuffer.append(_ArrayListOfResource);

-			stringBuffer.append(TEXT_93);

-			stringBuffer.append(_CollectionOfResource);

-			stringBuffer.append(TEXT_80);

-			stringBuffer.append(_ArrayListOfResource);

+		stringBuffer.append(_LinkedHashMapOfResourceToDiagnostic);

+		stringBuffer.append(TEXT_92);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_76);

+		}

+		stringBuffer.append(TEXT_93);

+		if (genModel.useInterfaceOverrideAnnotation()) {

 			stringBuffer.append(TEXT_94);

-			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_95);

-			}

-			stringBuffer.append(TEXT_96);

-			if (genModel.getDecoration() == GenDecoration.NONE) {

-				stringBuffer.append(TEXT_97);

-			}

+		}

+		stringBuffer.append(TEXT_95);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_76);

+		}

+		stringBuffer.append(TEXT_96);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_76);

+		}

+		stringBuffer.append(TEXT_97);

+		if (!genModel.isRichClientPlatform()) {

 			stringBuffer.append(TEXT_98);

-			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_95);

+			if (genModel.useInterfaceOverrideAnnotation()) {

+				stringBuffer.append(TEXT_76);

 			}

 			stringBuffer.append(TEXT_99);

-			if (genModel.getDecoration() == GenDecoration.NONE) {

-				stringBuffer.append(TEXT_100);

-			} else {

-				stringBuffer.append(TEXT_101);

-				stringBuffer.append(_DiagnosticDecorator);

+			stringBuffer.append(_CollectionOfResource);

+			stringBuffer.append(TEXT_87);

+			stringBuffer.append(_ArrayListOfResource);

+			stringBuffer.append(TEXT_100);

+			stringBuffer.append(_CollectionOfResource);

+			stringBuffer.append(TEXT_85);

+			stringBuffer.append(_ArrayListOfResource);

+			stringBuffer.append(TEXT_101);

+			if (genModel.useInterfaceOverrideAnnotation()) {

 				stringBuffer.append(TEXT_102);

-				if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF211_VALUE) {

-					stringBuffer.append(TEXT_103);

-				}

+			}

+			stringBuffer.append(TEXT_103);

+			if (genModel.getDecoration() != GenDecoration.NONE) {

 				stringBuffer.append(TEXT_104);

 			}

 			stringBuffer.append(TEXT_105);

-			stringBuffer.append(_CollectionOfResource);

-			stringBuffer.append(TEXT_106);

-			stringBuffer.append(_CollectionOfResource);

+			if (genModel.getDecoration() == GenDecoration.NONE) {

+				stringBuffer.append(TEXT_106);

+			}

 			stringBuffer.append(TEXT_107);

-			stringBuffer.append(genPackage.getEditorClassName());

+			if (genModel.getDecoration() != GenDecoration.NONE) {

+				stringBuffer.append(TEXT_104);

+			}

 			stringBuffer.append(TEXT_108);

-			stringBuffer.append(genPackage.getEditorClassName());

-			stringBuffer.append(TEXT_109);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-			stringBuffer.append(TEXT_110);

-		}

-		stringBuffer.append(TEXT_111);

-		stringBuffer.append(genPackage.getEditorClassName());

-		stringBuffer.append(TEXT_112);

-		if (genModel.useGenerics()) {

-			stringBuffer.append(TEXT_113);

-		} else {

+			if (genModel.getDecoration() == GenDecoration.NONE) {

+				stringBuffer.append(TEXT_109);

+			} else {

+				stringBuffer.append(TEXT_110);

+				stringBuffer.append(_DiagnosticDecorator);

+				stringBuffer.append(TEXT_111);

+				if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF211_VALUE) {

+					stringBuffer.append(TEXT_112);

+				}

+				stringBuffer.append(TEXT_113);

+			}

 			stringBuffer.append(TEXT_114);

-		}

-		stringBuffer.append(TEXT_115);

-		if (!genModel.useGenerics()) {

+			stringBuffer.append(_CollectionOfResource);

+			stringBuffer.append(TEXT_115);

+			stringBuffer.append(_CollectionOfResource);

 			stringBuffer.append(TEXT_116);

-		}

-		stringBuffer.append(TEXT_117);

-		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF24_VALUE) {

+			if (genModel.useInterfaceOverrideAnnotation()) {

+				stringBuffer.append(TEXT_117);

+			}

 			stringBuffer.append(TEXT_118);

-		}

-		stringBuffer.append(TEXT_119);

-		stringBuffer.append(genPackage.getGenModel().getEditorPluginID());

-		stringBuffer.append(TEXT_120);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_121);

-		if (genModel.useGenerics()) {

+			stringBuffer.append(genPackage.getEditorClassName());

+			stringBuffer.append(TEXT_119);

+			if (genModel.useInterfaceOverrideAnnotation()) {

+				stringBuffer.append(TEXT_117);

+			}

+			stringBuffer.append(TEXT_120);

+			stringBuffer.append(genPackage.getEditorClassName());

+			stringBuffer.append(TEXT_121);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 			stringBuffer.append(TEXT_122);

+		}

+		stringBuffer.append(TEXT_123);

+		stringBuffer.append(genPackage.getEditorClassName());

+		stringBuffer.append(TEXT_124);

+		if (genModel.useGenerics()) {

+			stringBuffer.append(TEXT_125);

 		} else {

-			stringBuffer.append(TEXT_123);

-		}

-		stringBuffer.append(TEXT_115);

-		if (!genModel.useGenerics()) {

-			stringBuffer.append(TEXT_124);

-		}

-		stringBuffer.append(TEXT_125);

-		if (!genModel.isRichClientPlatform()) {

 			stringBuffer.append(TEXT_126);

 		}

 		stringBuffer.append(TEXT_127);

-		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-		stringBuffer.append(TEXT_128);

-		if (!genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_129);

-			if (genModel.getRuntimeVersion().getValue() < GenRuntimeVersion.EMF213_VALUE) {

-				stringBuffer.append(TEXT_130);

-				stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-				stringBuffer.append(TEXT_131);

-			} else {

-				stringBuffer.append(TEXT_132);

-				stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-				stringBuffer.append(TEXT_133);

-			}

-			stringBuffer.append(TEXT_134);

+		if (!genModel.useGenerics()) {

+			stringBuffer.append(TEXT_128);

 		}

-		stringBuffer.append(TEXT_135);

+		stringBuffer.append(TEXT_129);

+		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF24_VALUE) {

+			stringBuffer.append(TEXT_130);

+		}

+		stringBuffer.append(TEXT_131);

+		stringBuffer.append(genPackage.getGenModel().getEditorPluginID());

+		stringBuffer.append(TEXT_132);

 		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_136);

-		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_133);

+		if (genModel.useGenerics()) {

+			stringBuffer.append(TEXT_134);

+		} else {

+			stringBuffer.append(TEXT_135);

+		}

+		stringBuffer.append(TEXT_127);

+		if (!genModel.useGenerics()) {

+			stringBuffer.append(TEXT_136);

+		}

 		stringBuffer.append(TEXT_137);

+		if (!genModel.isRichClientPlatform()) {

+			stringBuffer.append(TEXT_138);

+		}

+		stringBuffer.append(TEXT_139);

+		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+		stringBuffer.append(TEXT_140);

+		if (!genModel.isRichClientPlatform()) {

+			stringBuffer.append(TEXT_141);

+			if (genModel.getRuntimeVersion().getValue() < GenRuntimeVersion.EMF213_VALUE) {

+				stringBuffer.append(TEXT_142);

+				stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+				stringBuffer.append(TEXT_143);

+			} else {

+				stringBuffer.append(TEXT_144);

+				stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+				stringBuffer.append(TEXT_145);

+			}

+			stringBuffer.append(TEXT_146);

+		}

+		stringBuffer.append(TEXT_147);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_148);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_149);

 		stringBuffer.append(genPackage.getEditorClassName());

-		stringBuffer.append(TEXT_138);

+		stringBuffer.append(TEXT_150);

 		stringBuffer.append(TEXT_5);

 		{

 			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.editor.call.Editor.Editor.addItemProviderFactories.override" args="genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,importedOperationClassName:importedOperationClassName,operationMethodName:operationMethodName,_ArrayListOfObject:_ArrayListOfObject,_ArrayListOfSelectionChangedListener:_ArrayListOfSelectionChangedListener,_CollectionOfSelectionChangedListener:_CollectionOfSelectionChangedListener,_ListOfResource:_ListOfResource,_ArrayListOfResource:_ArrayListOfResource,_CollectionOfResource:_CollectionOfResource,_MapOfResourceToDiagnostic:_MapOfResourceToDiagnostic,_HashMapOfResourceToBoolean:_HashMapOfResourceToBoolean,_MapOfObjectToObject:_MapOfObjectToObject,_HashMapOfObjectToObject:_HashMapOfObjectToObject,_LinkedHashMapOfResourceToDiagnostic:_LinkedHashMapOfResourceToDiagnostic,_CollectionOfAnything:_CollectionOfAnything,_ListOfAnything:_ListOfAnything,useExtendedLabelProvider:useExtendedLabelProvider,useStyledLabelProvider:useStyledLabelProvider,_AdapterFactoryLabelProvider:_AdapterFactoryLabelProvider,_DelegatingAdapterFactoryLabelProvider:_DelegatingAdapterFactoryLabelProvider,_DecoratingColumLabelProvider:_DecoratingColumLabelProvider,_DiagnosticDecorator:_DiagnosticDecorator,_ArrayListOfString:_ArrayListOfString,_ListOfString:_ListOfString,_ListOfPropertySheetPage:_ListOfPropertySheetPage,_ArrayListOfPropertySheetPage:_ArrayListOfPropertySheetPage"%>

@@ -1718,781 +1814,879 @@
 		}

 

 		//Editor/addItemproviderFactories.override.javajetinc"

-		stringBuffer.append(TEXT_139);

+		stringBuffer.append(TEXT_151);

 		if (genModel.getDecoration() != GenDecoration.LIVE

 				|| genModel.getRuntimeVersion().getValue() < GenRuntimeVersion.EMF212_VALUE) {

-			stringBuffer.append(TEXT_140);

+			stringBuffer.append(TEXT_152);

 		} else {

-			stringBuffer.append(TEXT_141);

+			stringBuffer.append(TEXT_153);

 			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_142);

+				stringBuffer.append(TEXT_154);

 			}

-			stringBuffer.append(TEXT_143);

+			stringBuffer.append(TEXT_155);

 			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.command.AbstractCommand"));

-			stringBuffer.append(TEXT_144);

+			stringBuffer.append(TEXT_156);

 			stringBuffer.append(_DiagnosticDecorator);

-			stringBuffer.append(TEXT_145);

-		}

-		stringBuffer.append(TEXT_146);

-		if (genModel.useGenerics()) {

-			stringBuffer.append(TEXT_147);

-		}

-		stringBuffer.append(TEXT_148);

-		if (!genModel.useGenerics()) {

-			stringBuffer.append(TEXT_149);

-		}

-		stringBuffer.append(TEXT_150);

-		stringBuffer.append(_HashMapOfResourceToBoolean);

-		stringBuffer.append(TEXT_151);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_88);

-		}

-		stringBuffer.append(TEXT_152);

-		stringBuffer.append(_CollectionOfAnything);

-		stringBuffer.append(TEXT_153);

-		stringBuffer.append(_CollectionOfAnything);

-		stringBuffer.append(TEXT_154);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_155);

-		}

-		stringBuffer.append(TEXT_156);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_155);

-		}

-		stringBuffer.append(TEXT_157);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_155);

+			stringBuffer.append(TEXT_157);

 		}

 		stringBuffer.append(TEXT_158);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_155);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_159);

 		}

-		stringBuffer.append(TEXT_159);

-		if (genPackage.isMultipleEditorPages()) {

-			stringBuffer.append(TEXT_160);

+		stringBuffer.append(TEXT_160);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_161);

 		}

-		stringBuffer.append(TEXT_161);

-		stringBuffer.append(genModel.getNonNLS());

 		stringBuffer.append(TEXT_162);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_163);

-		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF23_VALUE) {

-			stringBuffer.append(TEXT_164);

-		} else {

+		if (genModel.useGenerics()) {

+			stringBuffer.append(TEXT_163);

+		}

+		stringBuffer.append(TEXT_164);

+		if (!genModel.useGenerics()) {

 			stringBuffer.append(TEXT_165);

 		}

 		stringBuffer.append(TEXT_166);

-		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF29_VALUE) {

-			stringBuffer.append(TEXT_167);

+		stringBuffer.append(_HashMapOfResourceToBoolean);

+		stringBuffer.append(TEXT_167);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_76);

 		}

 		stringBuffer.append(TEXT_168);

-		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF211_VALUE) {

-			stringBuffer.append(TEXT_169);

-		} else if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF23_VALUE) {

-			stringBuffer.append(TEXT_170);

-		} else if (genModel.isRichClientPlatform()) {

+		stringBuffer.append(_CollectionOfAnything);

+		stringBuffer.append(TEXT_169);

+		stringBuffer.append(_CollectionOfAnything);

+		stringBuffer.append(TEXT_170);

+		if (genModel.useInterfaceOverrideAnnotation()) {

 			stringBuffer.append(TEXT_171);

-		} else {

-			stringBuffer.append(TEXT_172);

 		}

-		stringBuffer.append(TEXT_173);

-		stringBuffer.append(genPackage.getGenModel().getEditorPluginID());

-		stringBuffer.append(TEXT_120);

-		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_172);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

+		}

 		stringBuffer.append(TEXT_174);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_175);

-		stringBuffer.append(genPackage.getGenModel().getEditorPluginID());

-		stringBuffer.append(TEXT_120);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_174);

-		stringBuffer.append(genModel.getNonNLS());

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_175);

+		}

 		stringBuffer.append(TEXT_176);

 		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_177);

+			stringBuffer.append(TEXT_175);

+		}

+		stringBuffer.append(TEXT_177);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_175);

 		}

 		stringBuffer.append(TEXT_178);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_175);

+		}

+		stringBuffer.append(TEXT_179);

 		if (genPackage.isMultipleEditorPages()) {

-			stringBuffer.append(TEXT_179);

-			stringBuffer.append(genPackage.getEditorClassName());

 			stringBuffer.append(TEXT_180);

-			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_181);

-			}

-			stringBuffer.append(TEXT_182);

-			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_181);

-			}

-			stringBuffer.append(TEXT_183);

-			if (useStyledLabelProvider) {

-				stringBuffer.append(TEXT_184);

-				stringBuffer.append(_DelegatingAdapterFactoryLabelProvider);

-				stringBuffer.append(TEXT_185);

-			}

-			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_184);

-				stringBuffer.append(_DecoratingColumLabelProvider);

-				stringBuffer.append(TEXT_185);

-			}

-			stringBuffer.append(TEXT_184);

-			stringBuffer.append(_AdapterFactoryLabelProvider);

+		}

+		stringBuffer.append(TEXT_181);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_102);

+		}

+		stringBuffer.append(TEXT_182);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

+		}

+		stringBuffer.append(TEXT_183);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_184);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_185);

+		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF23_VALUE) {

 			stringBuffer.append(TEXT_186);

-			if (useExtendedLabelProvider) {

-				stringBuffer.append(TEXT_187);

-			}

-			stringBuffer.append(TEXT_188);

-			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_189);

-				stringBuffer.append(_DiagnosticDecorator);

-				stringBuffer.append(TEXT_190);

-				if (genModel.getDecoration() == GenDecoration.MANUAL) {

-					stringBuffer.append(TEXT_191);

-				}

-				stringBuffer.append(TEXT_187);

-				if (genModel.getDecoration() == GenDecoration.LIVE) {

-					stringBuffer.append(TEXT_192);

-					stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-					stringBuffer.append(TEXT_193);

-				}

-				stringBuffer.append(TEXT_194);

-			}

-			if (useStyledLabelProvider) {

-				stringBuffer.append(TEXT_188);

-			}

-			stringBuffer.append(TEXT_195);

-			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_196);

-				stringBuffer.append(genModel.getImportedName(

-						"org.eclipse.emf.common.ui.viewer.ColumnViewerInformationControlToolTipSupport"));

-				stringBuffer.append(TEXT_197);

-				stringBuffer.append(_DiagnosticDecorator);

-				stringBuffer.append(TEXT_198);

-			}

-			stringBuffer.append(TEXT_199);

-			stringBuffer.append(genModel.getNonNLS());

+		} else {

+			stringBuffer.append(TEXT_187);

+		}

+		stringBuffer.append(TEXT_188);

+		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF29_VALUE) {

+			stringBuffer.append(TEXT_189);

+		}

+		stringBuffer.append(TEXT_190);

+		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF211_VALUE) {

+			stringBuffer.append(TEXT_191);

+		} else if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF23_VALUE) {

+			stringBuffer.append(TEXT_192);

+		} else if (genModel.isRichClientPlatform()) {

+			stringBuffer.append(TEXT_193);

+		} else {

+			stringBuffer.append(TEXT_194);

+		}

+		stringBuffer.append(TEXT_195);

+		stringBuffer.append(genPackage.getGenModel().getEditorPluginID());

+		stringBuffer.append(TEXT_132);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_196);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_197);

+		stringBuffer.append(genPackage.getGenModel().getEditorPluginID());

+		stringBuffer.append(TEXT_132);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_196);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_198);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

+		}

+		stringBuffer.append(TEXT_199);

+		if (genPackage.isMultipleEditorPages()) {

 			stringBuffer.append(TEXT_200);

 			stringBuffer.append(genPackage.getEditorClassName());

-			stringBuffer.append(TEXT_180);

-			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_181);

-			}

-			stringBuffer.append(TEXT_182);

-			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_181);

-			}

 			stringBuffer.append(TEXT_201);

-			if (useStyledLabelProvider) {

-				stringBuffer.append(TEXT_184);

-				stringBuffer.append(_DelegatingAdapterFactoryLabelProvider);

-				stringBuffer.append(TEXT_185);

+			if (genModel.useClassOverrideAnnotation()) {

+				stringBuffer.append(TEXT_102);

 			}

-			stringBuffer.append(TEXT_184);

-			stringBuffer.append(_AdapterFactoryLabelProvider);

-			stringBuffer.append(TEXT_186);

-			if (useExtendedLabelProvider) {

-				stringBuffer.append(TEXT_202);

-			}

-			stringBuffer.append(TEXT_188);

-			if (useStyledLabelProvider) {

-				stringBuffer.append(TEXT_188);

+			stringBuffer.append(TEXT_202);

+			if (genModel.useClassOverrideAnnotation()) {

+				stringBuffer.append(TEXT_102);

 			}

 			stringBuffer.append(TEXT_203);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_204);

-			stringBuffer.append(genPackage.getEditorClassName());

-			stringBuffer.append(TEXT_180);

-			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_181);

-			}

-			stringBuffer.append(TEXT_205);

-			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_181);

-			}

-			stringBuffer.append(TEXT_206);

 			if (useStyledLabelProvider) {

-				stringBuffer.append(TEXT_184);

+				stringBuffer.append(TEXT_204);

 				stringBuffer.append(_DelegatingAdapterFactoryLabelProvider);

-				stringBuffer.append(TEXT_185);

+				stringBuffer.append(TEXT_205);

 			}

-			stringBuffer.append(TEXT_184);

+			if (genModel.getDecoration() != GenDecoration.NONE) {

+				stringBuffer.append(TEXT_204);

+				stringBuffer.append(_DecoratingColumLabelProvider);

+				stringBuffer.append(TEXT_205);

+			}

+			stringBuffer.append(TEXT_204);

 			stringBuffer.append(_AdapterFactoryLabelProvider);

-			stringBuffer.append(TEXT_186);

+			stringBuffer.append(TEXT_206);

 			if (useExtendedLabelProvider) {

 				stringBuffer.append(TEXT_207);

 			}

-			stringBuffer.append(TEXT_188);

-			if (useStyledLabelProvider) {

-				stringBuffer.append(TEXT_188);

-			}

 			stringBuffer.append(TEXT_208);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_209);

-			stringBuffer.append(genPackage.getEditorClassName());

-			stringBuffer.append(TEXT_180);

-			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_181);

-			}

-			stringBuffer.append(TEXT_210);

-			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_181);

-			}

-			stringBuffer.append(TEXT_211);

-			if (useStyledLabelProvider) {

-				stringBuffer.append(TEXT_184);

-				stringBuffer.append(_DelegatingAdapterFactoryLabelProvider);

-				stringBuffer.append(TEXT_185);

-			}

 			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_184);

-				stringBuffer.append(_DecoratingColumLabelProvider);

-				stringBuffer.append(TEXT_185);

-			}

-			stringBuffer.append(TEXT_184);

-			stringBuffer.append(_AdapterFactoryLabelProvider);

-			stringBuffer.append(TEXT_186);

-			if (useExtendedLabelProvider) {

-				stringBuffer.append(TEXT_212);

-			}

-			stringBuffer.append(TEXT_188);

-			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_189);

+				stringBuffer.append(TEXT_209);

 				stringBuffer.append(_DiagnosticDecorator);

-				stringBuffer.append(TEXT_190);

+				stringBuffer.append(TEXT_210);

 				if (genModel.getDecoration() == GenDecoration.MANUAL) {

-					stringBuffer.append(TEXT_191);

+					stringBuffer.append(TEXT_211);

+				}

+				stringBuffer.append(TEXT_207);

+				if (genModel.getDecoration() == GenDecoration.LIVE) {

+					stringBuffer.append(TEXT_46);

+					stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+					stringBuffer.append(TEXT_212);

 				}

 				stringBuffer.append(TEXT_213);

 			}

 			if (useStyledLabelProvider) {

-				stringBuffer.append(TEXT_188);

+				stringBuffer.append(TEXT_208);

 			}

 			stringBuffer.append(TEXT_214);

 			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_196);

+				stringBuffer.append(TEXT_215);

 				stringBuffer.append(genModel.getImportedName(

 						"org.eclipse.emf.common.ui.viewer.ColumnViewerInformationControlToolTipSupport"));

-				stringBuffer.append(TEXT_215);

-				stringBuffer.append(_DiagnosticDecorator);

 				stringBuffer.append(TEXT_216);

+				stringBuffer.append(_DiagnosticDecorator);

+				stringBuffer.append(TEXT_217);

 			}

-			stringBuffer.append(TEXT_217);

-			stringBuffer.append(genModel.getNonNLS());

 			stringBuffer.append(TEXT_218);

-			stringBuffer.append(genPackage.getEditorClassName());

-			stringBuffer.append(TEXT_180);

-			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_181);

-			}

+			stringBuffer.append(genModel.getNonNLS());

 			stringBuffer.append(TEXT_219);

+			stringBuffer.append(genPackage.getEditorClassName());

+			stringBuffer.append(TEXT_201);

 			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_181);

+				stringBuffer.append(TEXT_102);

+			}

+			stringBuffer.append(TEXT_202);

+			if (genModel.useClassOverrideAnnotation()) {

+				stringBuffer.append(TEXT_102);

 			}

 			stringBuffer.append(TEXT_220);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_221);

-			stringBuffer.append(genModel.getNonNLS());

+			if (useStyledLabelProvider) {

+				stringBuffer.append(TEXT_204);

+				stringBuffer.append(_DelegatingAdapterFactoryLabelProvider);

+				stringBuffer.append(TEXT_205);

+			}

+			stringBuffer.append(TEXT_204);

+			stringBuffer.append(_AdapterFactoryLabelProvider);

+			stringBuffer.append(TEXT_206);

+			if (useExtendedLabelProvider) {

+				stringBuffer.append(TEXT_221);

+			}

+			stringBuffer.append(TEXT_208);

+			if (useStyledLabelProvider) {

+				stringBuffer.append(TEXT_208);

+			}

 			stringBuffer.append(TEXT_222);

 			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(genModel.getNonNLS(2));

 			stringBuffer.append(TEXT_223);

-			if (useStyledLabelProvider) {

-				stringBuffer.append(TEXT_184);

-				stringBuffer.append(_DelegatingAdapterFactoryLabelProvider);

-				stringBuffer.append(TEXT_185);

+			stringBuffer.append(genPackage.getEditorClassName());

+			stringBuffer.append(TEXT_201);

+			if (genModel.useClassOverrideAnnotation()) {

+				stringBuffer.append(TEXT_102);

 			}

-			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_184);

-				stringBuffer.append(_DecoratingColumLabelProvider);

-				stringBuffer.append(TEXT_185);

-			}

-			stringBuffer.append(TEXT_184);

-			stringBuffer.append(_AdapterFactoryLabelProvider);

-			stringBuffer.append(TEXT_186);

-			if (useExtendedLabelProvider) {

-				stringBuffer.append(TEXT_224);

-			}

-			stringBuffer.append(TEXT_188);

-			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_189);

-				stringBuffer.append(_DiagnosticDecorator);

-				stringBuffer.append(TEXT_190);

-				if (genModel.getDecoration() == GenDecoration.MANUAL) {

-					stringBuffer.append(TEXT_191);

-				}

-				stringBuffer.append(TEXT_224);

-				if (genModel.getDecoration() == GenDecoration.LIVE) {

-					stringBuffer.append(TEXT_192);

-					stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-					stringBuffer.append(TEXT_193);

-				}

-				stringBuffer.append(TEXT_194);

-			}

-			if (useStyledLabelProvider) {

-				stringBuffer.append(TEXT_188);

+			stringBuffer.append(TEXT_224);

+			if (genModel.useClassOverrideAnnotation()) {

+				stringBuffer.append(TEXT_102);

 			}

 			stringBuffer.append(TEXT_225);

-			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_196);

-				stringBuffer.append(genModel.getImportedName(

-						"org.eclipse.emf.common.ui.viewer.ColumnViewerInformationControlToolTipSupport"));

+			if (useStyledLabelProvider) {

+				stringBuffer.append(TEXT_204);

+				stringBuffer.append(_DelegatingAdapterFactoryLabelProvider);

+				stringBuffer.append(TEXT_205);

+			}

+			stringBuffer.append(TEXT_204);

+			stringBuffer.append(_AdapterFactoryLabelProvider);

+			stringBuffer.append(TEXT_206);

+			if (useExtendedLabelProvider) {

 				stringBuffer.append(TEXT_226);

-				stringBuffer.append(_DiagnosticDecorator);

-				stringBuffer.append(TEXT_227);

 			}

-			stringBuffer.append(TEXT_228);

+			stringBuffer.append(TEXT_208);

+			if (useStyledLabelProvider) {

+				stringBuffer.append(TEXT_208);

+			}

+			stringBuffer.append(TEXT_227);

 			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_229);

+			stringBuffer.append(TEXT_228);

 			stringBuffer.append(genPackage.getEditorClassName());

-			stringBuffer.append(TEXT_180);

+			stringBuffer.append(TEXT_201);

 			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_181);

+				stringBuffer.append(TEXT_102);

 			}

-			stringBuffer.append(TEXT_210);

+			stringBuffer.append(TEXT_229);

 			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_181);

+				stringBuffer.append(TEXT_102);

 			}

 			stringBuffer.append(TEXT_230);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_231);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_232);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(genModel.getNonNLS(2));

-			stringBuffer.append(TEXT_233);

 			if (useStyledLabelProvider) {

-				stringBuffer.append(TEXT_184);

+				stringBuffer.append(TEXT_204);

 				stringBuffer.append(_DelegatingAdapterFactoryLabelProvider);

-				stringBuffer.append(TEXT_185);

+				stringBuffer.append(TEXT_205);

 			}

 			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_184);

+				stringBuffer.append(TEXT_204);

 				stringBuffer.append(_DecoratingColumLabelProvider);

-				stringBuffer.append(TEXT_185);

+				stringBuffer.append(TEXT_205);

 			}

-			stringBuffer.append(TEXT_184);

+			stringBuffer.append(TEXT_204);

 			stringBuffer.append(_AdapterFactoryLabelProvider);

-			stringBuffer.append(TEXT_186);

+			stringBuffer.append(TEXT_206);

 			if (useExtendedLabelProvider) {

-				stringBuffer.append(TEXT_234);

+				stringBuffer.append(TEXT_231);

 			}

-			stringBuffer.append(TEXT_188);

+			stringBuffer.append(TEXT_208);

 			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_189);

+				stringBuffer.append(TEXT_209);

 				stringBuffer.append(_DiagnosticDecorator);

-				stringBuffer.append(TEXT_190);

+				stringBuffer.append(TEXT_210);

 				if (genModel.getDecoration() == GenDecoration.MANUAL) {

-					stringBuffer.append(TEXT_191);

+					stringBuffer.append(TEXT_211);

 				}

-				stringBuffer.append(TEXT_234);

-				if (genModel.getDecoration() == GenDecoration.LIVE) {

-					stringBuffer.append(TEXT_192);

-					stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-					stringBuffer.append(TEXT_193);

-				}

-				stringBuffer.append(TEXT_194);

+				stringBuffer.append(TEXT_232);

 			}

 			if (useStyledLabelProvider) {

-				stringBuffer.append(TEXT_188);

+				stringBuffer.append(TEXT_208);

 			}

-			stringBuffer.append(TEXT_225);

+			stringBuffer.append(TEXT_233);

 			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_196);

+				stringBuffer.append(TEXT_215);

 				stringBuffer.append(genModel.getImportedName(

 						"org.eclipse.emf.common.ui.viewer.ColumnViewerInformationControlToolTipSupport"));

+				stringBuffer.append(TEXT_234);

+				stringBuffer.append(_DiagnosticDecorator);

 				stringBuffer.append(TEXT_235);

-				stringBuffer.append(_DiagnosticDecorator);

-				stringBuffer.append(TEXT_236);

 			}

-			stringBuffer.append(TEXT_237);

+			stringBuffer.append(TEXT_236);

 			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_134);

-		} else {

+			stringBuffer.append(TEXT_237);

+			stringBuffer.append(genPackage.getEditorClassName());

+			stringBuffer.append(TEXT_201);

+			if (genModel.useClassOverrideAnnotation()) {

+				stringBuffer.append(TEXT_102);

+			}

 			stringBuffer.append(TEXT_238);

-			if (useStyledLabelProvider) {

-				stringBuffer.append(TEXT_184);

-				stringBuffer.append(_DelegatingAdapterFactoryLabelProvider);

-				stringBuffer.append(TEXT_185);

-			}

-			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_184);

-				stringBuffer.append(_DecoratingColumLabelProvider);

-				stringBuffer.append(TEXT_185);

-			}

-			stringBuffer.append(TEXT_184);

-			stringBuffer.append(_AdapterFactoryLabelProvider);

-			stringBuffer.append(TEXT_186);

-			if (useExtendedLabelProvider) {

-				stringBuffer.append(TEXT_187);

-			}

-			stringBuffer.append(TEXT_188);

-			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_189);

-				stringBuffer.append(_DiagnosticDecorator);

-				stringBuffer.append(TEXT_190);

-				if (genModel.getDecoration() == GenDecoration.MANUAL) {

-					stringBuffer.append(TEXT_191);

-				}

-				stringBuffer.append(TEXT_187);

-				if (genModel.getDecoration() == GenDecoration.LIVE) {

-					stringBuffer.append(TEXT_192);

-					stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-					stringBuffer.append(TEXT_193);

-				}

-				stringBuffer.append(TEXT_194);

-			}

-			if (useStyledLabelProvider) {

-				stringBuffer.append(TEXT_188);

+			if (genModel.useClassOverrideAnnotation()) {

+				stringBuffer.append(TEXT_102);

 			}

 			stringBuffer.append(TEXT_239);

-			if (genModel.getDecoration() != GenDecoration.NONE) {

-				stringBuffer.append(TEXT_240);

-				stringBuffer.append(genModel.getImportedName(

-						"org.eclipse.emf.common.ui.viewer.ColumnViewerInformationControlToolTipSupport"));

-				stringBuffer.append(TEXT_197);

-				stringBuffer.append(_DiagnosticDecorator);

-				stringBuffer.append(TEXT_198);

-			}

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_240);

+			stringBuffer.append(genModel.getNonNLS());

 			stringBuffer.append(TEXT_241);

 			stringBuffer.append(genModel.getNonNLS());

-		}

-		stringBuffer.append(TEXT_242);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_142);

-		}

-		stringBuffer.append(TEXT_243);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_244);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_245);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_177);

-		}

-		stringBuffer.append(TEXT_246);

-		if (genModel.useGenerics()

-				&& genModel.getEclipsePlatformVersion().getValue() < GenEclipsePlatformVersion.MARS_VALUE) {

+			stringBuffer.append(genModel.getNonNLS(2));

+			stringBuffer.append(TEXT_242);

+			if (useStyledLabelProvider) {

+				stringBuffer.append(TEXT_204);

+				stringBuffer.append(_DelegatingAdapterFactoryLabelProvider);

+				stringBuffer.append(TEXT_205);

+			}

+			if (genModel.getDecoration() != GenDecoration.NONE) {

+				stringBuffer.append(TEXT_204);

+				stringBuffer.append(_DecoratingColumLabelProvider);

+				stringBuffer.append(TEXT_205);

+			}

+			stringBuffer.append(TEXT_204);

+			stringBuffer.append(_AdapterFactoryLabelProvider);

+			stringBuffer.append(TEXT_206);

+			if (useExtendedLabelProvider) {

+				stringBuffer.append(TEXT_243);

+			}

+			stringBuffer.append(TEXT_208);

+			if (genModel.getDecoration() != GenDecoration.NONE) {

+				stringBuffer.append(TEXT_209);

+				stringBuffer.append(_DiagnosticDecorator);

+				stringBuffer.append(TEXT_210);

+				if (genModel.getDecoration() == GenDecoration.MANUAL) {

+					stringBuffer.append(TEXT_211);

+				}

+				stringBuffer.append(TEXT_243);

+				if (genModel.getDecoration() == GenDecoration.LIVE) {

+					stringBuffer.append(TEXT_46);

+					stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+					stringBuffer.append(TEXT_212);

+				}

+				stringBuffer.append(TEXT_213);

+			}

+			if (useStyledLabelProvider) {

+				stringBuffer.append(TEXT_208);

+			}

+			stringBuffer.append(TEXT_244);

+			if (genModel.getDecoration() != GenDecoration.NONE) {

+				stringBuffer.append(TEXT_215);

+				stringBuffer.append(genModel.getImportedName(

+						"org.eclipse.emf.common.ui.viewer.ColumnViewerInformationControlToolTipSupport"));

+				stringBuffer.append(TEXT_245);

+				stringBuffer.append(_DiagnosticDecorator);

+				stringBuffer.append(TEXT_246);

+			}

 			stringBuffer.append(TEXT_247);

-			if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF26_VALUE) {

-				stringBuffer.append(TEXT_248);

-			} else {

-				stringBuffer.append(TEXT_249);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_248);

+			stringBuffer.append(genPackage.getEditorClassName());

+			stringBuffer.append(TEXT_201);

+			if (genModel.useClassOverrideAnnotation()) {

+				stringBuffer.append(TEXT_102);

 			}

+			stringBuffer.append(TEXT_229);

+			if (genModel.useClassOverrideAnnotation()) {

+				stringBuffer.append(TEXT_102);

+			}

+			stringBuffer.append(TEXT_249);

+			stringBuffer.append(genModel.getNonNLS());

 			stringBuffer.append(TEXT_250);

-		}

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_177);

-		}

-		if (genModel.getEclipsePlatformVersion().getValue() >= GenEclipsePlatformVersion.MARS_VALUE) {

+			stringBuffer.append(genModel.getNonNLS());

 			stringBuffer.append(TEXT_251);

-		} else {

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(genModel.getNonNLS(2));

 			stringBuffer.append(TEXT_252);

-		}

-		stringBuffer.append(TEXT_253);

-		if (genModel.getEclipsePlatformVersion().getValue() >= GenEclipsePlatformVersion.MARS_VALUE) {

-			stringBuffer.append(TEXT_254);

-		} else {

-			stringBuffer.append(TEXT_255);

-		}

-		stringBuffer.append(TEXT_256);

-		if (genModel.getEclipsePlatformVersion().getValue() >= GenEclipsePlatformVersion.MARS_VALUE) {

-			stringBuffer.append(TEXT_257);

-		} else {

-			stringBuffer.append(TEXT_258);

-		}

-		stringBuffer.append(TEXT_259);

-		if (!genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_260);

-			if (genModel.getEclipsePlatformVersion().getValue() >= GenEclipsePlatformVersion.MARS_VALUE) {

-				stringBuffer.append(TEXT_261);

-			} else {

-				stringBuffer.append(TEXT_262);

+			if (useStyledLabelProvider) {

+				stringBuffer.append(TEXT_204);

+				stringBuffer.append(_DelegatingAdapterFactoryLabelProvider);

+				stringBuffer.append(TEXT_205);

 			}

-			stringBuffer.append(TEXT_259);

+			if (genModel.getDecoration() != GenDecoration.NONE) {

+				stringBuffer.append(TEXT_204);

+				stringBuffer.append(_DecoratingColumLabelProvider);

+				stringBuffer.append(TEXT_205);

+			}

+			stringBuffer.append(TEXT_204);

+			stringBuffer.append(_AdapterFactoryLabelProvider);

+			stringBuffer.append(TEXT_206);

+			if (useExtendedLabelProvider) {

+				stringBuffer.append(TEXT_253);

+			}

+			stringBuffer.append(TEXT_208);

+			if (genModel.getDecoration() != GenDecoration.NONE) {

+				stringBuffer.append(TEXT_209);

+				stringBuffer.append(_DiagnosticDecorator);

+				stringBuffer.append(TEXT_210);

+				if (genModel.getDecoration() == GenDecoration.MANUAL) {

+					stringBuffer.append(TEXT_211);

+				}

+				stringBuffer.append(TEXT_253);

+				if (genModel.getDecoration() == GenDecoration.LIVE) {

+					stringBuffer.append(TEXT_46);

+					stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+					stringBuffer.append(TEXT_212);

+				}

+				stringBuffer.append(TEXT_213);

+			}

+			if (useStyledLabelProvider) {

+				stringBuffer.append(TEXT_208);

+			}

+			stringBuffer.append(TEXT_244);

+			if (genModel.getDecoration() != GenDecoration.NONE) {

+				stringBuffer.append(TEXT_215);

+				stringBuffer.append(genModel.getImportedName(

+						"org.eclipse.emf.common.ui.viewer.ColumnViewerInformationControlToolTipSupport"));

+				stringBuffer.append(TEXT_254);

+				stringBuffer.append(_DiagnosticDecorator);

+				stringBuffer.append(TEXT_255);

+			}

+			stringBuffer.append(TEXT_256);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_146);

+		} else {

+			stringBuffer.append(TEXT_257);

+			if (useStyledLabelProvider) {

+				stringBuffer.append(TEXT_204);

+				stringBuffer.append(_DelegatingAdapterFactoryLabelProvider);

+				stringBuffer.append(TEXT_205);

+			}

+			if (genModel.getDecoration() != GenDecoration.NONE) {

+				stringBuffer.append(TEXT_204);

+				stringBuffer.append(_DecoratingColumLabelProvider);

+				stringBuffer.append(TEXT_205);

+			}

+			stringBuffer.append(TEXT_204);

+			stringBuffer.append(_AdapterFactoryLabelProvider);

+			stringBuffer.append(TEXT_206);

+			if (useExtendedLabelProvider) {

+				stringBuffer.append(TEXT_207);

+			}

+			stringBuffer.append(TEXT_208);

+			if (genModel.getDecoration() != GenDecoration.NONE) {

+				stringBuffer.append(TEXT_209);

+				stringBuffer.append(_DiagnosticDecorator);

+				stringBuffer.append(TEXT_210);

+				if (genModel.getDecoration() == GenDecoration.MANUAL) {

+					stringBuffer.append(TEXT_211);

+				}

+				stringBuffer.append(TEXT_207);

+				if (genModel.getDecoration() == GenDecoration.LIVE) {

+					stringBuffer.append(TEXT_46);

+					stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+					stringBuffer.append(TEXT_212);

+				}

+				stringBuffer.append(TEXT_213);

+			}

+			if (useStyledLabelProvider) {

+				stringBuffer.append(TEXT_208);

+			}

+			stringBuffer.append(TEXT_258);

+			if (genModel.getDecoration() != GenDecoration.NONE) {

+				stringBuffer.append(TEXT_259);

+				stringBuffer.append(genModel.getImportedName(

+						"org.eclipse.emf.common.ui.viewer.ColumnViewerInformationControlToolTipSupport"));

+				stringBuffer.append(TEXT_216);

+				stringBuffer.append(_DiagnosticDecorator);

+				stringBuffer.append(TEXT_217);

+			}

+			stringBuffer.append(TEXT_260);

+			stringBuffer.append(genModel.getNonNLS());

+		}

+		stringBuffer.append(TEXT_261);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_262);

 		}

 		stringBuffer.append(TEXT_263);

 		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_142);

+			stringBuffer.append(TEXT_154);

 		}

 		stringBuffer.append(TEXT_264);

-		if (useStyledLabelProvider) {

-			stringBuffer.append(TEXT_184);

-			stringBuffer.append(_DelegatingAdapterFactoryLabelProvider);

-			stringBuffer.append(TEXT_185);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_159);

 		}

-		if (genModel.getDecoration() != GenDecoration.NONE) {

-			stringBuffer.append(TEXT_184);

-			stringBuffer.append(_DecoratingColumLabelProvider);

-			stringBuffer.append(TEXT_185);

-		}

-		stringBuffer.append(TEXT_184);

-		stringBuffer.append(_AdapterFactoryLabelProvider);

-		stringBuffer.append(TEXT_186);

-		if (useExtendedLabelProvider) {

-			stringBuffer.append(TEXT_265);

-		}

-		stringBuffer.append(TEXT_188);

-		if (genModel.getDecoration() != GenDecoration.NONE) {

-			stringBuffer.append(TEXT_189);

-			stringBuffer.append(_DiagnosticDecorator);

-			stringBuffer.append(TEXT_190);

-			if (genModel.getDecoration() == GenDecoration.MANUAL) {

-				stringBuffer.append(TEXT_191);

-			}

-			stringBuffer.append(TEXT_265);

-			if (genModel.getDecoration() == GenDecoration.LIVE) {

-				stringBuffer.append(TEXT_192);

-				stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-				stringBuffer.append(TEXT_193);

-			}

-			stringBuffer.append(TEXT_194);

-		}

-		if (useStyledLabelProvider) {

-			stringBuffer.append(TEXT_188);

-		}

+		stringBuffer.append(TEXT_265);

+		stringBuffer.append(genModel.getNonNLS());

 		stringBuffer.append(TEXT_266);

-		if (genModel.getDecoration() != GenDecoration.NONE) {

-			stringBuffer.append(TEXT_267);

-			stringBuffer.append(genModel

-					.getImportedName("org.eclipse.emf.common.ui.viewer.ColumnViewerInformationControlToolTipSupport"));

-			stringBuffer.append(TEXT_268);

-			stringBuffer.append(_DiagnosticDecorator);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_267);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

+		}

+		stringBuffer.append(TEXT_268);

+		if (genModel.useGenerics()

+				&& genModel.getEclipsePlatformVersion().getValue() < GenEclipsePlatformVersion.MARS_VALUE) {

 			stringBuffer.append(TEXT_269);

+			if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF26_VALUE) {

+				stringBuffer.append(TEXT_270);

+			} else {

+				stringBuffer.append(TEXT_271);

+			}

+			stringBuffer.append(TEXT_272);

 		}

-		stringBuffer.append(TEXT_270);

 		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_142);

+			stringBuffer.append(TEXT_173);

 		}

-		stringBuffer.append(TEXT_271);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_142);

-		}

-		stringBuffer.append(TEXT_272);

-		if (genModel.getDecoration() == GenDecoration.MANUAL) {

+		if (genModel.getEclipsePlatformVersion().getValue() >= GenEclipsePlatformVersion.MARS_VALUE) {

 			stringBuffer.append(TEXT_273);

-		} else if (genModel.getDecoration() == GenDecoration.LIVE) {

+		} else {

 			stringBuffer.append(TEXT_274);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-			stringBuffer.append(TEXT_193);

 		}

-		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF214_VALUE) {

-			stringBuffer.append(TEXT_192);

-			if (genModel.getDecoration() == GenDecoration.NONE) {

-				stringBuffer.append(TEXT_275);

-			}

-			if (genModel.getDecoration() != GenDecoration.LIVE) {

-				stringBuffer.append(TEXT_276);

-			}

-			stringBuffer.append(genModel.getAutoExpandProperties());

-			stringBuffer.append(TEXT_192);

-			stringBuffer.append(genModel.isAutoResizeProperties());

-		}

-		stringBuffer.append(TEXT_277);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_142);

+		stringBuffer.append(TEXT_275);

+		if (genModel.getEclipsePlatformVersion().getValue() >= GenEclipsePlatformVersion.MARS_VALUE) {

+			stringBuffer.append(TEXT_276);

+		} else {

+			stringBuffer.append(TEXT_277);

 		}

 		stringBuffer.append(TEXT_278);

-		stringBuffer.append(_ListOfAnything);

-		stringBuffer.append(TEXT_279);

-		stringBuffer.append(genPackage.getEditorClassName());

-		stringBuffer.append(TEXT_280);

-		stringBuffer.append(genPackage.getEditorClassName());

+		if (genModel.getEclipsePlatformVersion().getValue() >= GenEclipsePlatformVersion.MARS_VALUE) {

+			stringBuffer.append(TEXT_279);

+		} else {

+			stringBuffer.append(TEXT_280);

+		}

 		stringBuffer.append(TEXT_281);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_142);

+		if (!genModel.isRichClientPlatform()) {

+			stringBuffer.append(TEXT_282);

+			if (genModel.getEclipsePlatformVersion().getValue() >= GenEclipsePlatformVersion.MARS_VALUE) {

+				stringBuffer.append(TEXT_283);

+			} else {

+				stringBuffer.append(TEXT_284);

+			}

+			stringBuffer.append(TEXT_281);

 		}

-		stringBuffer.append(TEXT_282);

-		if (genPackage.isMultipleEditorPages()) {

-			stringBuffer.append(TEXT_283);

-		} else {

-			stringBuffer.append(TEXT_284);

-		}

-		stringBuffer.append(TEXT_285);

-		if (genModel.useGenerics()) {

+		if (genModel.isFindAction()) {

+			stringBuffer.append(TEXT_285);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.text.IFindReplaceTarget"));

 			stringBuffer.append(TEXT_286);

-		}

-		stringBuffer.append(TEXT_287);

-		if (genPackage.isMultipleEditorPages()) {

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.edit.ui.util.FindAndReplaceTarget"));

+			stringBuffer.append(TEXT_287);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 			stringBuffer.append(TEXT_288);

-			stringBuffer.append(_ArrayListOfObject);

-			stringBuffer.append(TEXT_289);

-			stringBuffer.append(_ArrayListOfObject);

-			stringBuffer.append(TEXT_290);

-		} else {

+		}

+		stringBuffer.append(TEXT_289);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_154);

+		}

+		stringBuffer.append(TEXT_290);

+		if (useStyledLabelProvider) {

+			stringBuffer.append(TEXT_204);

+			stringBuffer.append(_DelegatingAdapterFactoryLabelProvider);

+			stringBuffer.append(TEXT_205);

+		}

+		if (genModel.getDecoration() != GenDecoration.NONE) {

+			stringBuffer.append(TEXT_204);

+			stringBuffer.append(_DecoratingColumLabelProvider);

+			stringBuffer.append(TEXT_205);

+		}

+		stringBuffer.append(TEXT_204);

+		stringBuffer.append(_AdapterFactoryLabelProvider);

+		stringBuffer.append(TEXT_206);

+		if (useExtendedLabelProvider) {

 			stringBuffer.append(TEXT_291);

-			stringBuffer.append(_ArrayListOfObject);

-			stringBuffer.append(TEXT_289);

-			stringBuffer.append(_ArrayListOfObject);

-			stringBuffer.append(TEXT_292);

 		}

-		stringBuffer.append(TEXT_293);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_177);

+		stringBuffer.append(TEXT_208);

+		if (genModel.getDecoration() != GenDecoration.NONE) {

+			stringBuffer.append(TEXT_209);

+			stringBuffer.append(_DiagnosticDecorator);

+			stringBuffer.append(TEXT_210);

+			if (genModel.getDecoration() == GenDecoration.MANUAL) {

+				stringBuffer.append(TEXT_211);

+			}

+			stringBuffer.append(TEXT_291);

+			if (genModel.getDecoration() == GenDecoration.LIVE) {

+				stringBuffer.append(TEXT_46);

+				stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+				stringBuffer.append(TEXT_212);

+			}

+			stringBuffer.append(TEXT_213);

 		}

-		stringBuffer.append(TEXT_294);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_177);

+		if (useStyledLabelProvider) {

+			stringBuffer.append(TEXT_208);

 		}

-		stringBuffer.append(TEXT_295);

-		stringBuffer.append(_MapOfObjectToObject);

+		stringBuffer.append(TEXT_292);

+		if (genModel.getDecoration() != GenDecoration.NONE) {

+			stringBuffer.append(TEXT_293);

+			stringBuffer.append(genModel

+					.getImportedName("org.eclipse.emf.common.ui.viewer.ColumnViewerInformationControlToolTipSupport"));

+			stringBuffer.append(TEXT_294);

+			stringBuffer.append(_DiagnosticDecorator);

+			stringBuffer.append(TEXT_295);

+		}

 		stringBuffer.append(TEXT_296);

-		stringBuffer.append(_HashMapOfObjectToObject);

-		stringBuffer.append(TEXT_64);

-		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF23_VALUE) {

-			stringBuffer.append(TEXT_297);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_154);

 		}

-		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF29_VALUE) {

-			stringBuffer.append(TEXT_298);

+		stringBuffer.append(TEXT_297);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_154);

+		}

+		stringBuffer.append(TEXT_298);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_262);

 		}

 		stringBuffer.append(TEXT_299);

-		stringBuffer.append(importedOperationClassName);

-		stringBuffer.append(TEXT_300);

-		stringBuffer.append(importedOperationClassName);

-		stringBuffer.append(TEXT_301);

-		if (!genModel.isRichClientPlatform() && genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_142);

+		if (genModel.getDecoration() == GenDecoration.MANUAL) {

+			stringBuffer.append(TEXT_300);

+		} else if (genModel.getDecoration() == GenDecoration.LIVE) {

+			stringBuffer.append(TEXT_301);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+			stringBuffer.append(TEXT_212);

 		}

-		stringBuffer.append(TEXT_302);

-		stringBuffer.append(operationMethodName);

-		stringBuffer.append(TEXT_303);

-		stringBuffer.append(_ListOfResource);

+		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF214_VALUE) {

+			stringBuffer.append(TEXT_46);

+			if (genModel.getDecoration() == GenDecoration.NONE) {

+				stringBuffer.append(TEXT_302);

+			}

+			if (genModel.getDecoration() != GenDecoration.LIVE) {

+				stringBuffer.append(TEXT_303);

+			}

+			stringBuffer.append(genModel.getAutoExpandProperties());

+			stringBuffer.append(TEXT_46);

+			stringBuffer.append(genModel.isAutoResizeProperties());

+		}

 		stringBuffer.append(TEXT_304);

-		if (!genModel.useGenerics()) {

-			stringBuffer.append(TEXT_305);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_154);

 		}

+		stringBuffer.append(TEXT_305);

+		stringBuffer.append(_ListOfAnything);

 		stringBuffer.append(TEXT_306);

-		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF24_VALUE) {

-			stringBuffer.append(TEXT_307);

-		} else {

-			stringBuffer.append(TEXT_308);

+		stringBuffer.append(genPackage.getEditorClassName());

+		stringBuffer.append(TEXT_307);

+		stringBuffer.append(genPackage.getEditorClassName());

+		stringBuffer.append(TEXT_308);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_154);

 		}

 		stringBuffer.append(TEXT_309);

-		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-		stringBuffer.append(TEXT_310);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_177);

-		}

-		stringBuffer.append(TEXT_311);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_177);

+		if (genPackage.isMultipleEditorPages()) {

+			stringBuffer.append(TEXT_310);

+		} else {

+			stringBuffer.append(TEXT_311);

 		}

 		stringBuffer.append(TEXT_312);

-		if (genModel.isRichClientPlatform()) {

-			if (genModel.isRichAjaxPlatform()) {

-				stringBuffer.append(TEXT_313);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.ui.dialogs.ResourceDialog"));

-				stringBuffer.append(TEXT_314);

-				if (genModel.useClassOverrideAnnotation()) {

-					stringBuffer.append(TEXT_142);

-				}

-				stringBuffer.append(TEXT_315);

-				if (genModel.useClassOverrideAnnotation()) {

-					stringBuffer.append(TEXT_142);

-				}

-				stringBuffer.append(TEXT_316);

-				stringBuffer.append("List" + (genModel.useGenerics() ? "<URI>" : ""));

-				stringBuffer.append(TEXT_317);

-				stringBuffer.append(genModel.useGenerics() ? "" : "(URI)");

-				stringBuffer.append(TEXT_318);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.ui.URIEditorInput"));

-				stringBuffer.append(TEXT_319);

-			} else {

-				stringBuffer.append(TEXT_320);

-				if (!genModel.useGenerics()) {

-					stringBuffer.append(TEXT_321);

-				}

-				stringBuffer.append(TEXT_322);

-				stringBuffer.append(genModel.getImportedName(genModel.getQualifiedEditorAdvisorClassName()));

-				stringBuffer.append(TEXT_323);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.swt.SWT"));

-				stringBuffer.append(TEXT_324);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.ui.URIEditorInput"));

-				stringBuffer.append(TEXT_325);

-			}

-		} else {

-			stringBuffer.append(TEXT_326);

-		}

-		stringBuffer.append(TEXT_327);

-		if (!genModel.useGenerics()) {

-			stringBuffer.append(TEXT_305);

-		}

-		stringBuffer.append(TEXT_328);

-		stringBuffer.append(genModel.getImportedName("org.eclipse.core.runtime.NullProgressMonitor"));

-		stringBuffer.append(TEXT_329);

-		if (!genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_330);

-			if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF23_VALUE) {

-				stringBuffer.append(TEXT_331);

-				stringBuffer.append(_ListOfAnything);

-				stringBuffer.append(TEXT_332);

-			} else {

-				stringBuffer.append(TEXT_333);

-				stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-				stringBuffer.append(TEXT_334);

-			}

-			stringBuffer.append(TEXT_335);

-		}

-		stringBuffer.append(TEXT_336);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_177);

-		}

-		stringBuffer.append(TEXT_337);

-		if (!genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_338);

-		}

-		stringBuffer.append(TEXT_339);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_177);

-		}

-		stringBuffer.append(TEXT_340);

-		if (genPackage.isMultipleEditorPages()) {

-			stringBuffer.append(TEXT_341);

-		} else {

-			stringBuffer.append(TEXT_342);

-		}

-		stringBuffer.append(TEXT_343);

 		if (genModel.useGenerics()) {

-			stringBuffer.append(TEXT_344);

-		} else {

-			stringBuffer.append(TEXT_345);

+			stringBuffer.append(TEXT_313);

 		}

-		stringBuffer.append(TEXT_346);

+		stringBuffer.append(TEXT_314);

+		if (genPackage.isMultipleEditorPages()) {

+			stringBuffer.append(TEXT_315);

+			stringBuffer.append(_ArrayListOfObject);

+			stringBuffer.append(TEXT_316);

+			stringBuffer.append(_ArrayListOfObject);

+			stringBuffer.append(TEXT_317);

+		} else {

+			stringBuffer.append(TEXT_318);

+			stringBuffer.append(_ArrayListOfObject);

+			stringBuffer.append(TEXT_316);

+			stringBuffer.append(_ArrayListOfObject);

+			stringBuffer.append(TEXT_319);

+		}

+		stringBuffer.append(TEXT_320);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

+		}

+		stringBuffer.append(TEXT_321);

+		if (genModel.isRevertAction()) {

+			stringBuffer.append(TEXT_322);

+			if (genModel.useClassOverrideAnnotation()) {

+				stringBuffer.append(TEXT_173);

+			}

+			stringBuffer.append(TEXT_323);

+			if (genModel.getDecoration() == GenDecoration.LIVE) {

+				stringBuffer.append(TEXT_324);

+			}

+			stringBuffer.append(TEXT_325);

+			stringBuffer.append(_ListOfResource);

+			stringBuffer.append(TEXT_326);

+			stringBuffer.append(_ListOfResource);

+			stringBuffer.append(TEXT_327);

+			stringBuffer.append(_ArrayListOfResource);

+			stringBuffer.append(TEXT_328);

+			if (genModel.useGenerics()) {

+				stringBuffer.append(TEXT_329);

+			} else {

+				stringBuffer.append(TEXT_330);

+			}

+			stringBuffer.append(TEXT_331);

+			if (!genModel.useGenerics()) {

+				stringBuffer.append(TEXT_128);

+			}

+			stringBuffer.append(TEXT_332);

+		}

+		stringBuffer.append(TEXT_333);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

+		}

+		stringBuffer.append(TEXT_334);

+		stringBuffer.append(_MapOfObjectToObject);

+		stringBuffer.append(TEXT_335);

+		stringBuffer.append(_HashMapOfObjectToObject);

+		stringBuffer.append(TEXT_63);

+		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF23_VALUE) {

+			stringBuffer.append(TEXT_336);

+		}

+		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF29_VALUE) {

+			stringBuffer.append(TEXT_337);

+		}

+		stringBuffer.append(TEXT_338);

+		stringBuffer.append(importedOperationClassName);

+		stringBuffer.append(TEXT_339);

+		stringBuffer.append(importedOperationClassName);

+		stringBuffer.append(TEXT_340);

+		if (genModel.useInterfaceOverrideAnnotation()

+				|| !genModel.isRichClientPlatform() && genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_154);

+		}

+		stringBuffer.append(TEXT_341);

+		stringBuffer.append(operationMethodName);

+		stringBuffer.append(TEXT_342);

+		stringBuffer.append(_ListOfResource);

+		stringBuffer.append(TEXT_343);

 		if (!genModel.useGenerics()) {

+			stringBuffer.append(TEXT_344);

+		}

+		stringBuffer.append(TEXT_345);

+		if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF24_VALUE) {

+			stringBuffer.append(TEXT_346);

+		} else {

 			stringBuffer.append(TEXT_347);

 		}

 		stringBuffer.append(TEXT_348);

-		stringBuffer.append(_CollectionOfAnything);

+		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 		stringBuffer.append(TEXT_349);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_350);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_351);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_352);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_353);

-		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-		stringBuffer.append(TEXT_354);

-		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-		stringBuffer.append(TEXT_355);

 		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_177);

+			stringBuffer.append(TEXT_173);

 		}

-		stringBuffer.append(TEXT_356);

-		if (!genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_357);

+		stringBuffer.append(TEXT_350);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

 		}

-		stringBuffer.append(TEXT_358);

-		if (genModel.useGenerics()) {

-			stringBuffer.append(TEXT_359);

+		stringBuffer.append(TEXT_351);

+		if (genModel.isRichClientPlatform()) {

+			if (genModel.isRichAjaxPlatform()) {

+				stringBuffer.append(TEXT_352);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.ui.dialogs.ResourceDialog"));

+				stringBuffer.append(TEXT_353);

+				if (genModel.useClassOverrideAnnotation()) {

+					stringBuffer.append(TEXT_154);

+				}

+				stringBuffer.append(TEXT_354);

+				if (genModel.useClassOverrideAnnotation()) {

+					stringBuffer.append(TEXT_154);

+				}

+				stringBuffer.append(TEXT_355);

+				stringBuffer.append("List" + (genModel.useGenerics() ? "<URI>" : ""));

+				stringBuffer.append(TEXT_356);

+				stringBuffer.append(genModel.useGenerics() ? "" : "(URI)");

+				stringBuffer.append(TEXT_357);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.ui.URIEditorInput"));

+				stringBuffer.append(TEXT_358);

+			} else {

+				stringBuffer.append(TEXT_359);

+				if (!genModel.useGenerics()) {

+					stringBuffer.append(TEXT_360);

+				}

+				stringBuffer.append(TEXT_361);

+				stringBuffer.append(genModel.getImportedName(genModel.getQualifiedEditorAdvisorClassName()));

+				stringBuffer.append(TEXT_362);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.swt.SWT"));

+				stringBuffer.append(TEXT_363);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.ui.URIEditorInput"));

+				stringBuffer.append(TEXT_364);

+			}

 		} else {

-			stringBuffer.append(TEXT_360);

+			stringBuffer.append(TEXT_365);

 		}

-		stringBuffer.append(TEXT_346);

+		stringBuffer.append(TEXT_366);

 		if (!genModel.useGenerics()) {

-			stringBuffer.append(TEXT_361);

+			stringBuffer.append(TEXT_344);

 		}

-		stringBuffer.append(TEXT_362);

+		stringBuffer.append(TEXT_367);

+		stringBuffer.append(genModel.getImportedName("org.eclipse.core.runtime.NullProgressMonitor"));

+		stringBuffer.append(TEXT_368);

+		if (!genModel.isRichClientPlatform()) {

+			stringBuffer.append(TEXT_369);

+			if (genModel.useInterfaceOverrideAnnotation()) {

+				stringBuffer.append(TEXT_173);

+			}

+			stringBuffer.append(TEXT_370);

+			if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF23_VALUE) {

+				stringBuffer.append(TEXT_371);

+				stringBuffer.append(_ListOfAnything);

+				stringBuffer.append(TEXT_372);

+			} else {

+				stringBuffer.append(TEXT_373);

+				stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+				stringBuffer.append(TEXT_374);

+			}

+			stringBuffer.append(TEXT_375);

+		}

+		stringBuffer.append(TEXT_376);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

+		}

+		stringBuffer.append(TEXT_377);

+		if (!genModel.isRichClientPlatform()) {

+			stringBuffer.append(TEXT_378);

+		}

+		stringBuffer.append(TEXT_379);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

+		}

+		stringBuffer.append(TEXT_380);

+		if (genPackage.isMultipleEditorPages()) {

+			stringBuffer.append(TEXT_381);

+		} else {

+			stringBuffer.append(TEXT_382);

+		}

+		stringBuffer.append(TEXT_383);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

+		}

+		stringBuffer.append(TEXT_384);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

+		}

+		stringBuffer.append(TEXT_385);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

+		}

+		stringBuffer.append(TEXT_386);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

+		}

+		stringBuffer.append(TEXT_387);

+		if (genModel.useGenerics()) {

+			stringBuffer.append(TEXT_388);

+		} else {

+			stringBuffer.append(TEXT_389);

+		}

+		stringBuffer.append(TEXT_331);

+		if (!genModel.useGenerics()) {

+			stringBuffer.append(TEXT_390);

+		}

+		stringBuffer.append(TEXT_391);

+		stringBuffer.append(_CollectionOfAnything);

+		stringBuffer.append(TEXT_392);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_393);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_394);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_395);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_396);

+		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+		stringBuffer.append(TEXT_397);

+		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+		stringBuffer.append(TEXT_398);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

+		}

+		stringBuffer.append(TEXT_399);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_173);

+		}

+		stringBuffer.append(TEXT_400);

+		if (!genModel.isRichClientPlatform()) {

+			stringBuffer.append(TEXT_401);

+		}

+		stringBuffer.append(TEXT_402);

+		if (genModel.useGenerics()) {

+			stringBuffer.append(TEXT_403);

+		} else {

+			stringBuffer.append(TEXT_404);

+		}

+		stringBuffer.append(TEXT_331);

+		if (!genModel.useGenerics()) {

+			stringBuffer.append(TEXT_405);

+		}

+		stringBuffer.append(TEXT_406);

 		stringBuffer.append(genPackage.isMultipleEditorPages());

-		stringBuffer.append(TEXT_363);

+		stringBuffer.append(TEXT_407);

 		genModel.emitSortedImports();

 		stringBuffer.append(TEXT_5);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
index 7bd6947..9ae3482 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/EntryPoint.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -173,9 +173,9 @@
 		/**

 		 * Copyright (c) 20010 Ed Merks and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   Ed Merks - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/HomeHTML.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/HomeHTML.java
index 6f70ea6..c4f4cc2 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/HomeHTML.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/HomeHTML.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -165,9 +165,9 @@
 		/**

 		 * Copyright (c) 2010 Ed Merks and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   Ed Merks - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
index 36bd440..a9e1d8e 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ManifestMF.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -27,43 +27,46 @@
 	}

 

 	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

-	protected final String TEXT_1 = "Manifest-Version: 1.0" + NL + "Bundle-ManifestVersion: 2" + NL

-			+ "Bundle-Name: %pluginName" + NL + "Bundle-SymbolicName: ";

-	protected final String TEXT_2 = ";singleton:=true" + NL + "Bundle-Version: 1.0.0.qualifier" + NL

-			+ "Bundle-ClassPath: ";

-	protected final String TEXT_3 = ".jar";

-	protected final String TEXT_4 = ".";

-	protected final String TEXT_5 = NL + "Bundle-Activator: ";

-	protected final String TEXT_6 = "$Implementation";

-	protected final String TEXT_7 = NL + "Bundle-Vendor: %providerName" + NL + "Bundle-Localization: plugin";

-	protected final String TEXT_8 = NL + "Bundle-RequiredExecutionEnvironment: J2SE-1.5";

-	protected final String TEXT_9 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.6";

-	protected final String TEXT_10 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.7";

-	protected final String TEXT_11 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.8";

-	protected final String TEXT_12 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-9";

-	protected final String TEXT_13 = NL + "Export-Package: ";

-	protected final String TEXT_14 = ",";

-	protected final String TEXT_15 = NL + " ";

-	protected final String TEXT_16 = NL + "Require-Bundle: ";

-	protected final String TEXT_17 = ";visibility:=reexport";

-	protected final String TEXT_18 = NL + "Import-Package: org.eclipse.emf.common.ui," + NL

+	protected final String TEXT_1 = "Manifest-Version: 1.0" + NL + "Bundle-ManifestVersion: 2" + NL + "Bundle-Name: ";

+	protected final String TEXT_2 = NL + "Bundle-SymbolicName: ";

+	protected final String TEXT_3 = ";singleton:=true" + NL + "Automatic-Module-Name: ";

+	protected final String TEXT_4 = NL + "Bundle-Version: 1.0.0.qualifier" + NL + "Bundle-ClassPath: ";

+	protected final String TEXT_5 = ".jar";

+	protected final String TEXT_6 = ".";

+	protected final String TEXT_7 = NL + "Bundle-Activator: ";

+	protected final String TEXT_8 = "$Implementation";

+	protected final String TEXT_9 = NL + "Bundle-Vendor: ";

+	protected final String TEXT_10 = NL + "Bundle-Localization: ";

+	protected final String TEXT_11 = NL + "Bundle-RequiredExecutionEnvironment: J2SE-1.5";

+	protected final String TEXT_12 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.6";

+	protected final String TEXT_13 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.7";

+	protected final String TEXT_14 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.8";

+	protected final String TEXT_15 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-9";

+	protected final String TEXT_16 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-10";

+	protected final String TEXT_17 = NL + "Export-Package: ";

+	protected final String TEXT_18 = ",";

+	protected final String TEXT_19 = NL + " ";

+	protected final String TEXT_20 = NL + "Require-Bundle: ";

+	protected final String TEXT_21 = ";visibility:=reexport";

+	protected final String TEXT_22 = NL + "Import-Package: org.eclipse.emf.common.ui," + NL

 			+ " org.eclipse.emf.common.ui.action," + NL + " org.eclipse.emf.common.ui.dialogs," + NL

 			+ " org.eclipse.emf.common.ui.editor," + NL + " org.eclipse.emf.common.ui.viewer," + NL

 			+ " org.eclipse.emf.edit.ui," + NL + " org.eclipse.emf.edit.ui.action," + NL

 			+ " org.eclipse.emf.edit.ui.celleditor," + NL + " org.eclipse.emf.edit.ui.dnd," + NL

 			+ " org.eclipse.emf.edit.ui.provider," + NL + " org.eclipse.emf.edit.ui.util," + NL

 			+ " org.eclipse.emf.edit.ui.view," + NL + " org.eclipse.jface.action," + NL + " org.eclipse.jface.dialogs,"

-			+ NL + " org.eclipse.jface.operation," + NL + " org.eclipse.jface.viewers," + NL

-			+ " org.eclipse.jface.window," + NL + " org.eclipse.jface.wizard," + NL + " org.eclipse.swt," + NL

-			+ " org.eclipse.swt.custom," + NL + " org.eclipse.swt.dnd," + NL + " org.eclipse.swt.events," + NL

-			+ " org.eclipse.swt.graphics," + NL + " org.eclipse.swt.layout," + NL + " org.eclipse.swt.widgets," + NL

-			+ " org.eclipse.ui;ui.workbench=\"split\"," + NL + " org.eclipse.ui.actions;ui.workbench=\"split\"," + NL

-			+ " org.eclipse.ui.application," + NL + " org.eclipse.ui.part;ui.workbench=\"split\"," + NL

+			+ NL + " org.eclipse.jface.operation," + NL + " org.eclipse.jface.text," + NL + " org.eclipse.jface.util,"

+			+ NL + " org.eclipse.jface.viewers," + NL + " org.eclipse.jface.window," + NL + " org.eclipse.jface.wizard,"

+			+ NL + " org.eclipse.swt," + NL + " org.eclipse.swt.custom," + NL + " org.eclipse.swt.dnd," + NL

+			+ " org.eclipse.swt.events," + NL + " org.eclipse.swt.graphics," + NL + " org.eclipse.swt.layout," + NL

+			+ " org.eclipse.swt.widgets," + NL + " org.eclipse.ui;ui.workbench=\"split\"," + NL

+			+ " org.eclipse.ui.actions;ui.workbench=\"split\"," + NL + " org.eclipse.ui.application," + NL

+			+ " org.eclipse.ui.part;ui.workbench=\"split\"," + NL + " org.eclipse.ui.plugin," + NL

 			+ " org.eclipse.ui.views," + NL + " org.eclipse.ui.views.contentoutline," + NL

 			+ " org.eclipse.ui.views.properties;ui.views=\"split\"";

-	protected final String TEXT_19 = NL + "Eclipse-LazyStart: true";

-	protected final String TEXT_20 = NL + "Bundle-ActivationPolicy: lazy" + NL;

-	protected final String TEXT_21 = NL;

+	protected final String TEXT_23 = NL + "Eclipse-LazyStart: true";

+	protected final String TEXT_24 = NL + "Bundle-ActivationPolicy: lazy" + NL;

+	protected final String TEXT_25 = NL;

 

 	public ManifestMF() {

 		//Here is the constructor

@@ -99,8 +102,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_21);

-		stringBuffer.append(TEXT_21);

+		stringBuffer.append(TEXT_25);

+		stringBuffer.append(TEXT_25);

 		return stringBuffer.toString();

 	}

 

@@ -172,9 +175,9 @@
 		/**

 		 * Copyright (c) 2005-2010 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

@@ -182,70 +185,80 @@
 

 		GenModel genModel = (GenModel) argument;

 		stringBuffer.append(TEXT_1);

-		stringBuffer.append(genModel.getEditorPluginID());

+		stringBuffer.append(genModel.getEditorBundleNameKey());

 		stringBuffer.append(TEXT_2);

+		stringBuffer.append(genModel.getEditorPluginID());

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(genModel.getEditorPluginID());

+		stringBuffer.append(TEXT_4);

 		if (genModel.isRuntimeJar()) {

 			stringBuffer.append(genModel.getEditorPluginID());

-			stringBuffer.append(TEXT_3);

-		} else {

-			stringBuffer.append(TEXT_4);

-		}

-		if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {

 			stringBuffer.append(TEXT_5);

-			stringBuffer.append(genModel.getQualifiedEditorPluginClassName());

+		} else {

 			stringBuffer.append(TEXT_6);

 		}

-		stringBuffer.append(TEXT_7);

-		if (genModel.getComplianceLevel() == GenJDKLevel.JDK50_LITERAL) {

+		if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {

+			stringBuffer.append(TEXT_7);

+			stringBuffer.append(genModel.getQualifiedEditorPluginClassName());

 			stringBuffer.append(TEXT_8);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK60_LITERAL) {

-			stringBuffer.append(TEXT_9);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK70_LITERAL) {

-			stringBuffer.append(TEXT_10);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK80_LITERAL) {

+		}

+		stringBuffer.append(TEXT_9);

+		stringBuffer.append(genModel.getEditorBundleVendorKey());

+		stringBuffer.append(TEXT_10);

+		stringBuffer.append(genModel.getEditorBundleLocalization());

+		if (genModel.getComplianceLevel() == GenJDKLevel.JDK50_LITERAL) {

 			stringBuffer.append(TEXT_11);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK90_LITERAL) {

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK60_LITERAL) {

 			stringBuffer.append(TEXT_12);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK70_LITERAL) {

+			stringBuffer.append(TEXT_13);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK80_LITERAL) {

+			stringBuffer.append(TEXT_14);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK90_LITERAL) {

+			stringBuffer.append(TEXT_15);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK100_LITERAL) {

+			stringBuffer.append(TEXT_16);

 		}

 		Iterator<String> packagesIterator = genModel.getEditorQualifiedPackageNames().iterator();

 		if (packagesIterator.hasNext()) {

 			String pack = packagesIterator.next();

-			stringBuffer.append(TEXT_13);

+			stringBuffer.append(TEXT_17);

 			stringBuffer.append(pack);

 			while (packagesIterator.hasNext()) {

 				pack = packagesIterator.next();

-				stringBuffer.append(TEXT_14);

-				stringBuffer.append(TEXT_15);

+				stringBuffer.append(TEXT_18);

+				stringBuffer.append(TEXT_19);

 				stringBuffer.append(pack);

 			}

 		}

 		Iterator<String> requiredPluginIterator = genModel.getEditorRequiredPlugins().iterator();

 		if (requiredPluginIterator.hasNext()) {

 			String pluginID = requiredPluginIterator.next();

-			stringBuffer.append(TEXT_16);

+			stringBuffer.append(TEXT_20);

 			stringBuffer.append(pluginID);

 			if (!pluginID.startsWith("org.eclipse.core.runtime")) {

-				stringBuffer.append(TEXT_17);

+				stringBuffer.append(TEXT_21);

 			}

 			while (requiredPluginIterator.hasNext()) {

 				pluginID = requiredPluginIterator.next();

-				stringBuffer.append(TEXT_14);

-				stringBuffer.append(TEXT_15);

+				stringBuffer.append(TEXT_18);

+				stringBuffer.append(TEXT_19);

 				stringBuffer.append(pluginID);

-				if (!pluginID.startsWith("org.eclipse.core.runtime") && !pluginID.equals("org.eclipse.xtext.xbase.lib")

+				if (!pluginID.startsWith("org.eclipse.core.runtime") && !pluginID.equals("org.eclipse.jface.text")

+						&& !pluginID.equals("org.eclipse.xtext.xbase.lib")

 						&& !pluginID.equals("org.eclipse.emf.ecore.xcore.lib")) {

-					stringBuffer.append(TEXT_17);

+					stringBuffer.append(TEXT_21);

 				}

 			}

 		}

 		if (genModel.isRichAjaxPlatform()) {

-			stringBuffer.append(TEXT_18);

+			stringBuffer.append(TEXT_22);

 		}

 		if (genModel.getRuntimeVersion() == GenRuntimeVersion.EMF22

 				|| genModel.getRuntimeVersion() == GenRuntimeVersion.EMF23) {

-			stringBuffer.append(TEXT_19);

+			stringBuffer.append(TEXT_23);

 		}

-		stringBuffer.append(TEXT_20);

+		stringBuffer.append(TEXT_24);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelIcon.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelIcon.java
index cea2b32..5bb8bb7 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelIcon.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelIcon.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
index be30691..f35944b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizard.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -117,202 +117,206 @@
 			+ "\t * @generated" + NL + "\t */" + NL + "\tprotected ";

 	protected final String TEXT_43 = " initialObjectNames;" + NL + "" + NL + "\t/**" + NL

 			+ "\t * This just records the information." + NL + "\t * <!-- begin-user-doc -->" + NL

-			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

-			+ "\tpublic void init(IWorkbench workbench, IStructuredSelection selection)" + NL + "\t{" + NL

-			+ "\t\tthis.workbench = workbench;" + NL + "\t\tthis.selection = selection;" + NL + "\t\tsetWindowTitle(";

-	protected final String TEXT_44 = ".INSTANCE.getString(\"_UI_Wizard_label\"));";

-	protected final String TEXT_45 = NL

+			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

+	protected final String TEXT_44 = NL + "\t@Override";

+	protected final String TEXT_45 = NL + "\tpublic void init(IWorkbench workbench, IStructuredSelection selection)"

+			+ NL + "\t{" + NL + "\t\tthis.workbench = workbench;" + NL + "\t\tthis.selection = selection;" + NL

+			+ "\t\tsetWindowTitle(";

+	protected final String TEXT_46 = ".INSTANCE.getString(\"_UI_Wizard_label\"));";

+	protected final String TEXT_47 = NL

 			+ "\t\tsetDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(";

-	protected final String TEXT_46 = ".INSTANCE.getImage(\"full/wizban/New";

-	protected final String TEXT_47 = "\")));";

-	protected final String TEXT_48 = NL + "\t}" + NL + "" + NL + "\t/**";

-	protected final String TEXT_49 = NL + "\t * Returns the names of the types that can be created as the root object.";

-	protected final String TEXT_50 = NL + "\t * Returns the names of the features representing global elements.";

-	protected final String TEXT_51 = " getInitialObjectNames()" + NL + "\t{" + NL

+	protected final String TEXT_48 = ".INSTANCE.getImage(\"full/wizban/New";

+	protected final String TEXT_49 = "\")));";

+	protected final String TEXT_50 = NL + "\t}" + NL + "" + NL + "\t/**";

+	protected final String TEXT_51 = NL + "\t * Returns the names of the types that can be created as the root object.";

+	protected final String TEXT_52 = NL + "\t * Returns the names of the features representing global elements.";

+	protected final String TEXT_53 = " getInitialObjectNames()" + NL + "\t{" + NL

 			+ "\t\tif (initialObjectNames == null)" + NL + "\t\t{" + NL + "\t\t\tinitialObjectNames = new ";

-	protected final String TEXT_52 = "();";

-	protected final String TEXT_53 = NL + "\t\t\tfor (EClassifier eClassifier : ";

-	protected final String TEXT_54 = ".getEClassifiers())";

-	protected final String TEXT_55 = NL + "\t\t\tfor (Iterator classifiers = ";

-	protected final String TEXT_56 = ".getEClassifiers().iterator(); classifiers.hasNext(); )";

-	protected final String TEXT_57 = NL + "\t\t\t{";

-	protected final String TEXT_58 = NL + "\t\t\t\tEClassifier eClassifier = (EClassifier)classifiers.next();";

-	protected final String TEXT_59 = NL + "\t\t\t\tif (eClassifier instanceof EClass)" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_54 = "();";

+	protected final String TEXT_55 = NL + "\t\t\tfor (EClassifier eClassifier : ";

+	protected final String TEXT_56 = ".getEClassifiers())";

+	protected final String TEXT_57 = NL + "\t\t\tfor (Iterator classifiers = ";

+	protected final String TEXT_58 = ".getEClassifiers().iterator(); classifiers.hasNext(); )";

+	protected final String TEXT_59 = NL + "\t\t\t{";

+	protected final String TEXT_60 = NL + "\t\t\t\tEClassifier eClassifier = (EClassifier)classifiers.next();";

+	protected final String TEXT_61 = NL + "\t\t\t\tif (eClassifier instanceof EClass)" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\tEClass eClass = (EClass)eClassifier;" + NL + "\t\t\t\t\tif (!eClass.isAbstract())" + NL

 			+ "\t\t\t\t\t{" + NL + "\t\t\t\t\t\tinitialObjectNames.add(eClass.getName());" + NL + "\t\t\t\t\t}" + NL

 			+ "\t\t\t\t}" + NL + "\t\t\t}";

-	protected final String TEXT_60 = NL + "\t\t\tfor (";

-	protected final String TEXT_61 = " eStructuralFeature : ";

-	protected final String TEXT_62 = ".INSTANCE.getAllElements(";

-	protected final String TEXT_63 = ".INSTANCE.getDocumentRoot(";

-	protected final String TEXT_64 = ")))";

-	protected final String TEXT_65 = NL + "\t\t\tfor (Iterator elements = ";

-	protected final String TEXT_66 = ")).iterator(); elements.hasNext(); )";

-	protected final String TEXT_67 = NL + "\t\t\t\t";

-	protected final String TEXT_68 = " eStructuralFeature = (";

-	protected final String TEXT_69 = ")elements.next();";

-	protected final String TEXT_70 = NL + "\t\t\t\tif (eStructuralFeature.isChangeable())" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_62 = NL + "\t\t\tfor (";

+	protected final String TEXT_63 = " eStructuralFeature : ";

+	protected final String TEXT_64 = ".INSTANCE.getAllElements(";

+	protected final String TEXT_65 = ".INSTANCE.getDocumentRoot(";

+	protected final String TEXT_66 = ")))";

+	protected final String TEXT_67 = NL + "\t\t\tfor (Iterator elements = ";

+	protected final String TEXT_68 = ")).iterator(); elements.hasNext(); )";

+	protected final String TEXT_69 = NL + "\t\t\t\t";

+	protected final String TEXT_70 = " eStructuralFeature = (";

+	protected final String TEXT_71 = ")elements.next();";

+	protected final String TEXT_72 = NL + "\t\t\t\tif (eStructuralFeature.isChangeable())" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\tEClassifier eClassifier = eStructuralFeature.getEType();" + NL

 			+ "\t\t\t\t\tif (eClassifier instanceof EClass)" + NL + "\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\tEClass eClass = (EClass)eClassifier;" + NL + "\t\t\t\t\t\tif (!eClass.isAbstract())" + NL

 			+ "\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\tinitialObjectNames.add(eStructuralFeature.getName());" + NL

 			+ "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t}";

-	protected final String TEXT_71 = NL + "\t\t\tCollections.sort(initialObjectNames, ";

-	protected final String TEXT_72 = "CommonPlugin.INSTANCE.getComparator()";

-	protected final String TEXT_73 = "java.text.Collator.getInstance()";

-	protected final String TEXT_74 = ");" + NL + "\t\t}" + NL + "\t\treturn initialObjectNames;" + NL + "\t}" + NL + ""

+	protected final String TEXT_73 = NL + "\t\t\tCollections.sort(initialObjectNames, ";

+	protected final String TEXT_74 = "CommonPlugin.INSTANCE.getComparator()";

+	protected final String TEXT_75 = "java.text.Collator.getInstance()";

+	protected final String TEXT_76 = ");" + NL + "\t\t}" + NL + "\t\treturn initialObjectNames;" + NL + "\t}" + NL + ""

 			+ NL + "\t/**" + NL + "\t * Create a new model." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprotected EObject createInitialModel()" + NL + "\t{";

-	protected final String TEXT_75 = NL + "\t\tEClass eClass = (EClass)";

-	protected final String TEXT_76 = ".getEClassifier(initialObjectCreationPage.getInitialObjectName());" + NL

+	protected final String TEXT_77 = NL + "\t\tEClass eClass = (EClass)";

+	protected final String TEXT_78 = ".getEClassifier(initialObjectCreationPage.getInitialObjectName());" + NL

 			+ "\t\tEObject rootObject = ";

-	protected final String TEXT_77 = ".create(eClass);";

-	protected final String TEXT_78 = NL + "\t\tEClass eClass = ";

-	protected final String TEXT_79 = ");" + NL

+	protected final String TEXT_79 = ".create(eClass);";

+	protected final String TEXT_80 = NL + "\t\tEClass eClass = ";

+	protected final String TEXT_81 = ");" + NL

 			+ "\t\tEStructuralFeature eStructuralFeature = eClass.getEStructuralFeature(initialObjectCreationPage.getInitialObjectName());"

 			+ NL + "\t\tEObject rootObject = ";

-	protected final String TEXT_80 = ".create(eClass);" + NL + "\t\trootObject.eSet(eStructuralFeature, ";

-	protected final String TEXT_81 = ".create((EClass)eStructuralFeature.getEType()));";

-	protected final String TEXT_82 = NL + "\t\treturn rootObject;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_82 = ".create(eClass);" + NL + "\t\trootObject.eSet(eStructuralFeature, ";

+	protected final String TEXT_83 = ".create((EClass)eStructuralFeature.getEType()));";

+	protected final String TEXT_84 = NL + "\t\treturn rootObject;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Do the work after everything is specified." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

-	protected final String TEXT_83 = NL + "\t@Override";

-	protected final String TEXT_84 = NL + "\tpublic boolean performFinish()" + NL + "\t{" + NL + "\t\ttry" + NL

+	protected final String TEXT_85 = NL + "\tpublic boolean performFinish()" + NL + "\t{" + NL + "\t\ttry" + NL

 			+ "\t\t{";

-	protected final String TEXT_85 = NL + "\t\t\t// Get the URI of the model file." + NL + "\t\t\t//" + NL

+	protected final String TEXT_86 = NL + "\t\t\t// Get the URI of the model file." + NL + "\t\t\t//" + NL

 			+ "\t\t\tfinal URI fileURI = getModelURI();" + NL + "\t\t\tif (new ";

-	protected final String TEXT_86 = "(fileURI.toFileString()).exists())" + NL + "\t\t\t{" + NL

+	protected final String TEXT_87 = "(fileURI.toFileString()).exists())" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tif (!MessageDialog.openQuestion" + NL + "\t\t\t\t\t\t(getShell()," + NL + "\t\t\t\t\t\t ";

-	protected final String TEXT_87 = ".INSTANCE.getString(\"_UI_Question_title\"),";

-	protected final String TEXT_88 = NL + "\t\t\t\t\t\t ";

-	protected final String TEXT_89 = ".INSTANCE.getString(\"_WARN_FileConflict\", new String []{ fileURI.toFileString() })))";

-	protected final String TEXT_90 = NL + "\t\t\t\t{" + NL + "\t\t\t\t\tinitialObjectCreationPage.selectFileField();"

+	protected final String TEXT_88 = ".INSTANCE.getString(\"_UI_Question_title\"),";

+	protected final String TEXT_89 = NL + "\t\t\t\t\t\t ";

+	protected final String TEXT_90 = ".INSTANCE.getString(\"_WARN_FileConflict\", new String []{ fileURI.toFileString() })))";

+	protected final String TEXT_91 = NL + "\t\t\t\t{" + NL + "\t\t\t\t\tinitialObjectCreationPage.selectFileField();"

 			+ NL + "\t\t\t\t\treturn false;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\t" + NL

 			+ "\t\t\t// Do the work within an operation." + NL + "\t\t\t//" + NL + "\t\t\t";

-	protected final String TEXT_91 = " operation = new ";

-	protected final String TEXT_92 = "()" + NL + "\t\t\t{" + NL

-			+ "\t\t\t\tpublic void run(IProgressMonitor progressMonitor)";

-	protected final String TEXT_93 = NL + "\t\t\t// Remember the file." + NL + "\t\t\t//" + NL

+	protected final String TEXT_92 = " operation = new ";

+	protected final String TEXT_93 = "()" + NL + "\t\t\t{";

+	protected final String TEXT_94 = NL + "\t\t\t\t@Override";

+	protected final String TEXT_95 = NL + "\t\t\t\tpublic void run(IProgressMonitor progressMonitor)";

+	protected final String TEXT_96 = NL + "\t\t\t// Remember the file." + NL + "\t\t\t//" + NL

 			+ "\t\t\tfinal IFile modelFile = getModelFile();" + NL + "" + NL

 			+ "\t\t\t// Do the work within an operation." + NL + "\t\t\t//" + NL

 			+ "\t\t\tWorkspaceModifyOperation operation =" + NL + "\t\t\t\tnew WorkspaceModifyOperation()" + NL

 			+ "\t\t\t\t{";

-	protected final String TEXT_94 = NL + "\t\t\t\t\t@Override";

-	protected final String TEXT_95 = NL + "\t\t\t\t\tprotected void execute(IProgressMonitor progressMonitor)";

-	protected final String TEXT_96 = NL + "\t\t\t\t\t{" + NL + "\t\t\t\t\t\ttry" + NL + "\t\t\t\t\t\t{" + NL

+	protected final String TEXT_97 = NL + "\t\t\t\t\t@Override";

+	protected final String TEXT_98 = NL + "\t\t\t\t\tprotected void execute(IProgressMonitor progressMonitor)";

+	protected final String TEXT_99 = NL + "\t\t\t\t\t{" + NL + "\t\t\t\t\t\ttry" + NL + "\t\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\t\t// Create a resource set" + NL + "\t\t\t\t\t\t\t//" + NL

 			+ "\t\t\t\t\t\t\tResourceSet resourceSet = new ResourceSetImpl();" + NL;

-	protected final String TEXT_97 = NL + "\t\t\t\t\t\t\t// Get the URI of the model file." + NL + "\t\t\t\t\t\t\t//"

+	protected final String TEXT_100 = NL + "\t\t\t\t\t\t\t// Get the URI of the model file." + NL + "\t\t\t\t\t\t\t//"

 			+ NL

 			+ "\t\t\t\t\t\t\tURI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);"

 			+ NL;

-	protected final String TEXT_98 = NL + "\t\t\t\t\t\t\t// Create a resource for this file." + NL + "\t\t\t\t\t\t\t//"

+	protected final String TEXT_101 = NL + "\t\t\t\t\t\t\t// Create a resource for this file." + NL + "\t\t\t\t\t\t\t//"

 			+ NL + "\t\t\t\t\t\t\tResource resource = resourceSet.createResource(fileURI";

-	protected final String TEXT_99 = ", ";

-	protected final String TEXT_100 = ".eCONTENT_TYPE";

-	protected final String TEXT_101 = ");" + NL + "" + NL

+	protected final String TEXT_102 = ", ";

+	protected final String TEXT_103 = ".eCONTENT_TYPE";

+	protected final String TEXT_104 = ");" + NL + "" + NL

 			+ "\t\t\t\t\t\t\t// Add the initial model object to the contents." + NL + "\t\t\t\t\t\t\t//" + NL

 			+ "\t\t\t\t\t\t\tEObject rootObject = createInitialModel();" + NL + "\t\t\t\t\t\t\tif (rootObject != null)"

 			+ NL + "\t\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\t\tresource.getContents().add(rootObject);" + NL

 			+ "\t\t\t\t\t\t\t}" + NL + "" + NL

 			+ "\t\t\t\t\t\t\t// Save the contents of the resource to the file system." + NL + "\t\t\t\t\t\t\t//" + NL

 			+ "\t\t\t\t\t\t\t";

-	protected final String TEXT_102 = " options = new ";

-	protected final String TEXT_103 = "();" + NL

+	protected final String TEXT_105 = " options = new ";

+	protected final String TEXT_106 = "();" + NL

 			+ "\t\t\t\t\t\t\toptions.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());" + NL

 			+ "\t\t\t\t\t\t\tresource.save(options);" + NL + "\t\t\t\t\t\t}" + NL

 			+ "\t\t\t\t\t\tcatch (Exception exception)" + NL + "\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\t";

-	protected final String TEXT_104 = ".INSTANCE.log(exception);" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\tfinally"

+	protected final String TEXT_107 = ".INSTANCE.log(exception);" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\tfinally"

 			+ NL + "\t\t\t\t\t\t{" + NL + "\t\t\t\t\t\t\tprogressMonitor.done();" + NL + "\t\t\t\t\t\t}" + NL

 			+ "\t\t\t\t\t}" + NL + "\t\t\t\t};" + NL + "" + NL + "\t\t\tgetContainer().run(false, false, operation);"

 			+ NL;

-	protected final String TEXT_105 = NL + "\t\t\treturn ";

-	protected final String TEXT_106 = ".openEditor(workbench, fileURI);\t\t\t";

-	protected final String TEXT_107 = NL + "\t\t\t// Select the new file resource in the current view." + NL

+	protected final String TEXT_108 = NL + "\t\t\treturn ";

+	protected final String TEXT_109 = ".openEditor(workbench, fileURI);\t\t\t";

+	protected final String TEXT_110 = NL + "\t\t\t// Select the new file resource in the current view." + NL

 			+ "\t\t\t//" + NL + "\t\t\t";

-	protected final String TEXT_108 = " workbenchWindow = workbench.getActiveWorkbenchWindow();" + NL + "\t\t\t";

-	protected final String TEXT_109 = " page = workbenchWindow.getActivePage();" + NL + "\t\t\tfinal ";

-	protected final String TEXT_110 = " activePart = page.getActivePart();" + NL

+	protected final String TEXT_111 = " workbenchWindow = workbench.getActiveWorkbenchWindow();" + NL + "\t\t\t";

+	protected final String TEXT_112 = " page = workbenchWindow.getActivePage();" + NL + "\t\t\tfinal ";

+	protected final String TEXT_113 = " activePart = page.getActivePart();" + NL

 			+ "\t\t\tif (activePart instanceof ISetSelectionTarget)" + NL + "\t\t\t{" + NL + "\t\t\t\tfinal ";

-	protected final String TEXT_111 = " targetSelection = new ";

-	protected final String TEXT_112 = "(modelFile);" + NL + "\t\t\t\tgetShell().getDisplay().asyncExec" + NL

-			+ "\t\t\t\t\t(new Runnable()" + NL + "\t\t\t\t\t {" + NL + "\t\t\t\t\t\t public void run()" + NL

-			+ "\t\t\t\t\t\t {" + NL + "\t\t\t\t\t\t\t ((ISetSelectionTarget)activePart).selectReveal(targetSelection);"

-			+ NL + "\t\t\t\t\t\t }" + NL + "\t\t\t\t\t });" + NL + "\t\t\t}" + NL + "" + NL

-			+ "\t\t\t// Open an editor on the new file." + NL + "\t\t\t//" + NL + "\t\t\ttry" + NL + "\t\t\t{" + NL

-			+ "\t\t\t\tpage.openEditor" + NL + "\t\t\t\t\t(new FileEditorInput(modelFile)," + NL

+	protected final String TEXT_114 = " targetSelection = new ";

+	protected final String TEXT_115 = "(modelFile);" + NL + "\t\t\t\tgetShell().getDisplay().asyncExec" + NL

+			+ "\t\t\t\t\t(new Runnable()" + NL + "\t\t\t\t\t {";

+	protected final String TEXT_116 = NL + "\t\t\t\t\t\t @Override";

+	protected final String TEXT_117 = NL + "\t\t\t\t\t\t public void run()" + NL + "\t\t\t\t\t\t {" + NL

+			+ "\t\t\t\t\t\t\t ((ISetSelectionTarget)activePart).selectReveal(targetSelection);" + NL + "\t\t\t\t\t\t }"

+			+ NL + "\t\t\t\t\t });" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\t// Open an editor on the new file." + NL

+			+ "\t\t\t//" + NL + "\t\t\ttry" + NL + "\t\t\t{" + NL + "\t\t\t\tpage.openEditor" + NL

+			+ "\t\t\t\t\t(new FileEditorInput(modelFile)," + NL

 			+ "\t\t\t\t\t workbench.getEditorRegistry().getDefaultEditor";

-	protected final String TEXT_113 = "(modelFile.getFullPath().toString()).getId());";

-	protected final String TEXT_114 = NL + "\t\t\t\t\t \t(modelFile.getFullPath().toString()," + NL + "\t\t\t\t\t \t ";

-	protected final String TEXT_115 = ".getContentTypeManager().getContentType(";

-	protected final String TEXT_116 = ".eCONTENT_TYPE)).getId());";

-	protected final String TEXT_117 = "\t\t\t\t\t \t " + NL + "\t\t\t}" + NL + "\t\t\tcatch (";

-	protected final String TEXT_118 = " exception)" + NL + "\t\t\t{" + NL

+	protected final String TEXT_118 = "(modelFile.getFullPath().toString()).getId());";

+	protected final String TEXT_119 = NL + "\t\t\t\t\t \t(modelFile.getFullPath().toString()," + NL + "\t\t\t\t\t \t ";

+	protected final String TEXT_120 = ".getContentTypeManager().getContentType(";

+	protected final String TEXT_121 = ".eCONTENT_TYPE)).getId());";

+	protected final String TEXT_122 = "\t\t\t\t\t \t " + NL + "\t\t\t}" + NL + "\t\t\tcatch (";

+	protected final String TEXT_123 = " exception)" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tMessageDialog.openError(workbenchWindow.getShell(), ";

-	protected final String TEXT_119 = ".INSTANCE.getString(\"_UI_OpenEditorError_label\"), exception.getMessage());";

-	protected final String TEXT_120 = NL + "\t\t\t\treturn false;" + NL + "\t\t\t}" + NL + "" + NL

+	protected final String TEXT_124 = ".INSTANCE.getString(\"_UI_OpenEditorError_label\"), exception.getMessage());";

+	protected final String TEXT_125 = NL + "\t\t\t\treturn false;" + NL + "\t\t\t}" + NL + "" + NL

 			+ "\t\t\treturn true;";

-	protected final String TEXT_121 = NL + "\t\t}" + NL + "\t\tcatch (Exception exception)" + NL + "\t\t{" + NL

+	protected final String TEXT_126 = NL + "\t\t}" + NL + "\t\tcatch (Exception exception)" + NL + "\t\t{" + NL

 			+ "\t\t\t";

-	protected final String TEXT_122 = ".INSTANCE.log(exception);" + NL + "\t\t\treturn false;" + NL + "\t\t}" + NL

+	protected final String TEXT_127 = ".INSTANCE.log(exception);" + NL + "\t\t\treturn false;" + NL + "\t\t}" + NL

 			+ "\t}" + NL;

-	protected final String TEXT_123 = NL + "\t/**" + NL + "\t * This is the one page of the wizard." + NL

+	protected final String TEXT_128 = NL + "\t/**" + NL + "\t * This is the one page of the wizard." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tpublic class ";

-	protected final String TEXT_124 = "NewFileCreationPage extends WizardNewFileCreationPage" + NL + "\t{" + NL

+	protected final String TEXT_129 = "NewFileCreationPage extends WizardNewFileCreationPage" + NL + "\t{" + NL

 			+ "\t\t/**" + NL + "\t\t * Pass in the selection." + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic ";

-	protected final String TEXT_125 = "NewFileCreationPage(String pageId, IStructuredSelection selection)" + NL

+	protected final String TEXT_130 = "NewFileCreationPage(String pageId, IStructuredSelection selection)" + NL

 			+ "\t\t{" + NL + "\t\t\tsuper(pageId, selection);" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL

 			+ "\t\t * The framework calls this to see if the file is correct." + NL + "\t\t * <!-- begin-user-doc -->"

 			+ NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */";

-	protected final String TEXT_126 = NL + "\t\t@Override";

-	protected final String TEXT_127 = NL + "\t\tprotected boolean validatePage()" + NL + "\t\t{" + NL

+	protected final String TEXT_131 = NL + "\t\t@Override";

+	protected final String TEXT_132 = NL + "\t\tprotected boolean validatePage()" + NL + "\t\t{" + NL

 			+ "\t\t\tif (super.validatePage())" + NL + "\t\t\t{" + NL + "\t\t\t\tString extension = new ";

-	protected final String TEXT_128 = "(getFileName()).getFileExtension();" + NL

+	protected final String TEXT_133 = "(getFileName()).getFileExtension();" + NL

 			+ "\t\t\t\tif (extension == null || !FILE_EXTENSIONS.contains(extension))" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\tString key = FILE_EXTENSIONS.size() > 1 ? \"_WARN_FilenameExtensions\" : \"_WARN_FilenameExtension\";";

-	protected final String TEXT_129 = NL + "\t\t\t\t\tsetErrorMessage(";

-	protected final String TEXT_130 = ".INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));" + NL

+	protected final String TEXT_134 = NL + "\t\t\t\t\tsetErrorMessage(";

+	protected final String TEXT_135 = ".INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));" + NL

 			+ "\t\t\t\t\treturn false;" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn true;" + NL + "\t\t\t}" + NL

 			+ "\t\t\treturn false;" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->"

 			+ NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL

 			+ "\t\tpublic IFile getModelFile()" + NL + "\t\t{" + NL

 			+ "\t\t\treturn ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));"

 			+ NL + "\t\t}" + NL + "\t}" + NL;

-	protected final String TEXT_131 = NL + "\t/**" + NL

+	protected final String TEXT_136 = NL + "\t/**" + NL

 			+ "\t * This is the page where the type of object to create is selected." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tpublic class ";

-	protected final String TEXT_132 = "InitialObjectCreationPage extends WizardPage" + NL + "\t{";

-	protected final String TEXT_133 = NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_137 = "InitialObjectCreationPage extends WizardPage" + NL + "\t{";

+	protected final String TEXT_138 = NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";

-	protected final String TEXT_134 = " fileField;" + NL;

-	protected final String TEXT_135 = NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_139 = " fileField;" + NL;

+	protected final String TEXT_140 = NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL

 			+ "\t\tprotected Combo initialObjectField;" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL

 			+ "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t */" + NL

 			+ "\t\tprotected ";

-	protected final String TEXT_136 = " encodings;" + NL + "" + NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->"

+	protected final String TEXT_141 = " encodings;" + NL + "" + NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->"

 			+ NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL

 			+ "\t\tprotected Combo encodingField;" + NL + "" + NL + "\t\t/**" + NL + "\t\t * Pass in the selection."

 			+ NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated"

 			+ NL + "\t\t */" + NL + "\t\tpublic ";

-	protected final String TEXT_137 = "InitialObjectCreationPage(String pageId)" + NL + "\t\t{" + NL

+	protected final String TEXT_142 = "InitialObjectCreationPage(String pageId)" + NL + "\t\t{" + NL

 			+ "\t\t\tsuper(pageId);" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->"

-			+ NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL

-			+ "\t\tpublic void createControl(Composite parent)" + NL + "\t\t{" + NL

+			+ NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */";

+	protected final String TEXT_143 = NL + "\t\tpublic void createControl(Composite parent)" + NL + "\t\t{" + NL

 			+ "\t\t\tComposite composite = new Composite(parent, SWT.NONE);" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tGridLayout layout = new GridLayout();" + NL + "\t\t\t\tlayout.numColumns = 1;" + NL

 			+ "\t\t\t\tlayout.verticalSpacing = 12;" + NL + "\t\t\t\tcomposite.setLayout(layout);" + NL + "" + NL

 			+ "\t\t\t\tGridData data = new GridData();" + NL + "\t\t\t\tdata.verticalAlignment = GridData.FILL;" + NL

 			+ "\t\t\t\tdata.grabExcessVerticalSpace = true;" + NL + "\t\t\t\tdata.horizontalAlignment = GridData.FILL;"

 			+ NL + "\t\t\t\tcomposite.setLayoutData(data);" + NL + "\t\t\t}" + NL;

-	protected final String TEXT_138 = "\t\t\t" + NL + "\t\t\tLabel resourceURILabel = new Label(composite, SWT.LEFT);"

+	protected final String TEXT_144 = "\t\t\t" + NL + "\t\t\tLabel resourceURILabel = new Label(composite, SWT.LEFT);"

 			+ NL + "\t\t\t{" + NL + "\t\t\t\tresourceURILabel.setText(";

-	protected final String TEXT_139 = ".INSTANCE.getString(\"_UI_File_label\"));";

-	protected final String TEXT_140 = NL + NL + "\t\t\t\tGridData data = new GridData();" + NL

+	protected final String TEXT_145 = ".INSTANCE.getString(\"_UI_File_label\"));";

+	protected final String TEXT_146 = NL + NL + "\t\t\t\tGridData data = new GridData();" + NL

 			+ "\t\t\t\tdata.horizontalAlignment = GridData.FILL;" + NL + "\t\t\t\tresourceURILabel.setLayoutData(data);"

 			+ NL + "\t\t\t}" + NL + "" + NL + "\t\t\tComposite fileComposite = new Composite(composite, SWT.NONE);" + NL

 			+ "\t\t\t{" + NL + "\t\t\t\tGridData data = new GridData();" + NL

@@ -321,102 +325,103 @@
 			+ "\t\t\t\tdata.horizontalAlignment = GridData.FILL;" + NL + "\t\t\t\tlayout.marginHeight = 0;" + NL

 			+ "\t\t\t\tlayout.marginWidth = 0;" + NL + "\t\t\t\tlayout.numColumns = 2;" + NL

 			+ "\t\t\t\tfileComposite.setLayout(layout);" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tfileField = new ";

-	protected final String TEXT_141 = "(fileComposite, SWT.BORDER);" + NL + "\t\t\t{" + NL

+	protected final String TEXT_147 = "(fileComposite, SWT.BORDER);" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tGridData data = new GridData();" + NL + "\t\t\t\tdata.horizontalAlignment = GridData.FILL;" + NL

 			+ "\t\t\t\tdata.grabExcessHorizontalSpace = true;" + NL + "\t\t\t\tdata.horizontalSpan = 1;" + NL

 			+ "\t\t\t\tfileField.setLayoutData(data);" + NL + "\t\t\t}" + NL + "" + NL

 			+ "\t\t\tfileField.addModifyListener(validator);" + NL;

-	protected final String TEXT_142 = NL + "\t\t\t";

-	protected final String TEXT_143 = " resourceURIBrowseFileSystemButton = new ";

-	protected final String TEXT_144 = "(fileComposite, SWT.PUSH);" + NL

+	protected final String TEXT_148 = NL + "\t\t\t";

+	protected final String TEXT_149 = " resourceURIBrowseFileSystemButton = new ";

+	protected final String TEXT_150 = "(fileComposite, SWT.PUSH);" + NL

 			+ "\t\t\tresourceURIBrowseFileSystemButton.setText(";

-	protected final String TEXT_145 = ".INSTANCE.getString(\"_UI_Browse_label\"));";

-	protected final String TEXT_146 = NL + NL + "\t\t\tresourceURIBrowseFileSystemButton.addSelectionListener" + NL

+	protected final String TEXT_151 = ".INSTANCE.getString(\"_UI_Browse_label\"));";

+	protected final String TEXT_152 = NL + NL + "\t\t\tresourceURIBrowseFileSystemButton.addSelectionListener" + NL

 			+ "\t\t\t\t(new ";

-	protected final String TEXT_147 = "()" + NL + "\t\t\t\t {";

-	protected final String TEXT_148 = NL + "\t\t\t\t\t @Override";

-	protected final String TEXT_149 = NL + "\t\t\t\t\t public void widgetSelected(";

-	protected final String TEXT_150 = " event)" + NL + "\t\t\t\t\t {" + NL + "\t\t\t\t\t\t String[] filters = ";

-	protected final String TEXT_151 = "(String[])";

-	protected final String TEXT_152 = ".FILE_EXTENSION_FILTERS.toArray(new String[";

-	protected final String TEXT_153 = ".FILE_EXTENSION_FILTERS.size()]);" + NL + "\t\t\t\t\t\t String[] files = ";

-	protected final String TEXT_154 = ".openFilePathDialog(getShell(), ";

-	protected final String TEXT_155 = ".SAVE, filters);" + NL + "\t\t\t\t\t\t if (files.length > 0)" + NL

+	protected final String TEXT_153 = "()" + NL + "\t\t\t\t {";

+	protected final String TEXT_154 = NL + "\t\t\t\t\t @Override";

+	protected final String TEXT_155 = NL + "\t\t\t\t\t public void widgetSelected(";

+	protected final String TEXT_156 = " event)" + NL + "\t\t\t\t\t {" + NL + "\t\t\t\t\t\t String[] filters = ";

+	protected final String TEXT_157 = "(String[])";

+	protected final String TEXT_158 = ".FILE_EXTENSION_FILTERS.toArray(new String[";

+	protected final String TEXT_159 = ".FILE_EXTENSION_FILTERS.size()]);" + NL + "\t\t\t\t\t\t String[] files = ";

+	protected final String TEXT_160 = ".openFilePathDialog(getShell(), ";

+	protected final String TEXT_161 = ".SAVE, filters);" + NL + "\t\t\t\t\t\t if (files.length > 0)" + NL

 			+ "\t\t\t\t\t\t {" + NL + "\t\t\t\t\t\t\t fileField.setText(files[0]);" + NL + "\t\t\t\t\t\t }" + NL

 			+ "\t\t\t\t\t }" + NL + "\t\t\t\t });";

-	protected final String TEXT_156 = NL + "\t\t\tLabel containerLabel = new Label(composite, SWT.LEFT);" + NL

+	protected final String TEXT_162 = NL + "\t\t\tLabel containerLabel = new Label(composite, SWT.LEFT);" + NL

 			+ "\t\t\t{" + NL + "\t\t\t\tcontainerLabel.setText(";

-	protected final String TEXT_157 = ".INSTANCE.getString(\"_UI_ModelObject\"));";

-	protected final String TEXT_158 = NL + NL + "\t\t\t\tGridData data = new GridData();" + NL

+	protected final String TEXT_163 = ".INSTANCE.getString(\"_UI_ModelObject\"));";

+	protected final String TEXT_164 = NL + NL + "\t\t\t\tGridData data = new GridData();" + NL

 			+ "\t\t\t\tdata.horizontalAlignment = GridData.FILL;" + NL + "\t\t\t\tcontainerLabel.setLayoutData(data);"

 			+ NL + "\t\t\t}" + NL + "" + NL + "\t\t\tinitialObjectField = new Combo(composite, SWT.BORDER);" + NL

 			+ "\t\t\t{" + NL + "\t\t\t\tGridData data = new GridData();" + NL

 			+ "\t\t\t\tdata.horizontalAlignment = GridData.FILL;" + NL

 			+ "\t\t\t\tdata.grabExcessHorizontalSpace = true;" + NL + "\t\t\t\tinitialObjectField.setLayoutData(data);"

 			+ NL + "\t\t\t}" + NL;

-	protected final String TEXT_159 = NL + "\t\t\tfor (String objectName : getInitialObjectNames())" + NL + "\t\t\t{"

+	protected final String TEXT_165 = NL + "\t\t\tfor (String objectName : getInitialObjectNames())" + NL + "\t\t\t{"

 			+ NL + "\t\t\t\tinitialObjectField.add(getLabel(objectName));" + NL + "\t\t\t}";

-	protected final String TEXT_160 = NL + "\t\t\tfor (Iterator i = getInitialObjectNames().iterator(); i.hasNext(); )"

+	protected final String TEXT_166 = NL + "\t\t\tfor (Iterator i = getInitialObjectNames().iterator(); i.hasNext(); )"

 			+ NL + "\t\t\t{" + NL + "\t\t\t\tinitialObjectField.add(getLabel((String)i.next()));" + NL + "\t\t\t}";

-	protected final String TEXT_161 = NL + NL + "\t\t\tif (initialObjectField.getItemCount() == 1)" + NL + "\t\t\t{"

+	protected final String TEXT_167 = NL + NL + "\t\t\tif (initialObjectField.getItemCount() == 1)" + NL + "\t\t\t{"

 			+ NL + "\t\t\t\tinitialObjectField.select(0);" + NL + "\t\t\t}" + NL

 			+ "\t\t\tinitialObjectField.addModifyListener(validator);" + NL + "" + NL

 			+ "\t\t\tLabel encodingLabel = new Label(composite, SWT.LEFT);" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tencodingLabel.setText(";

-	protected final String TEXT_162 = ".INSTANCE.getString(\"_UI_XMLEncoding\"));";

-	protected final String TEXT_163 = NL + NL + "\t\t\t\tGridData data = new GridData();" + NL

+	protected final String TEXT_168 = ".INSTANCE.getString(\"_UI_XMLEncoding\"));";

+	protected final String TEXT_169 = NL + NL + "\t\t\t\tGridData data = new GridData();" + NL

 			+ "\t\t\t\tdata.horizontalAlignment = GridData.FILL;" + NL + "\t\t\t\tencodingLabel.setLayoutData(data);"

 			+ NL + "\t\t\t}" + NL + "\t\t\tencodingField = new Combo(composite, SWT.BORDER);" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tGridData data = new GridData();" + NL + "\t\t\t\tdata.horizontalAlignment = GridData.FILL;" + NL

 			+ "\t\t\t\tdata.grabExcessHorizontalSpace = true;" + NL + "\t\t\t\tencodingField.setLayoutData(data);" + NL

 			+ "\t\t\t}" + NL;

-	protected final String TEXT_164 = NL + "\t\t\tfor (String encoding : getEncodings())" + NL + "\t\t\t{" + NL

+	protected final String TEXT_170 = NL + "\t\t\tfor (String encoding : getEncodings())" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tencodingField.add(encoding);" + NL + "\t\t\t}";

-	protected final String TEXT_165 = NL + "\t\t\tfor (Iterator i = getEncodings().iterator(); i.hasNext(); )" + NL

+	protected final String TEXT_171 = NL + "\t\t\tfor (Iterator i = getEncodings().iterator(); i.hasNext(); )" + NL

 			+ "\t\t\t{" + NL + "\t\t\t\tencodingField.add((String)i.next());" + NL + "\t\t\t}";

-	protected final String TEXT_166 = NL + NL + "\t\t\tencodingField.select(0);" + NL

+	protected final String TEXT_172 = NL + NL + "\t\t\tencodingField.select(0);" + NL

 			+ "\t\t\tencodingField.addModifyListener(validator);" + NL + "" + NL

 			+ "\t\t\tsetPageComplete(validatePage());" + NL + "\t\t\tsetControl(composite);" + NL + "\t\t}" + NL + ""

 			+ NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL

 			+ "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ModifyListener validator =" + NL

-			+ "\t\t\tnew ModifyListener()" + NL + "\t\t\t{" + NL + "\t\t\t\tpublic void modifyText(ModifyEvent e)" + NL

-			+ "\t\t\t\t{" + NL + "\t\t\t\t\tsetPageComplete(validatePage());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL

-			+ "" + NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL

+			+ "\t\t\tnew ModifyListener()" + NL + "\t\t\t{";

+	protected final String TEXT_173 = NL + "\t\t\t\tpublic void modifyText(ModifyEvent e)" + NL + "\t\t\t\t{" + NL

+			+ "\t\t\t\t\tsetPageComplete(validatePage());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "" + NL

+			+ "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL

 			+ "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean validatePage()" + NL + "\t\t{";

-	protected final String TEXT_167 = NL + "\t\t\tURI fileURI = getFileURI();" + NL

+	protected final String TEXT_174 = NL + "\t\t\tURI fileURI = getFileURI();" + NL

 			+ "\t\t\tif (fileURI == null || fileURI.isEmpty())" + NL + "\t\t\t{" + NL + "\t\t\t\tsetErrorMessage(null);"

 			+ NL + "\t\t\t\treturn false;" + NL + "\t\t\t}" + NL + "" + NL

 			+ "\t\t\tString extension = fileURI.fileExtension();" + NL

 			+ "\t\t\tif (extension == null || !FILE_EXTENSIONS.contains(extension))" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\tString key = FILE_EXTENSIONS.size() > 1 ? \"_WARN_FilenameExtensions\" : \"_WARN_FilenameExtension\";";

-	protected final String TEXT_168 = NL + "\t\t\t\tsetErrorMessage(";

-	protected final String TEXT_169 = ".INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));" + NL

+	protected final String TEXT_175 = NL + "\t\t\t\tsetErrorMessage(";

+	protected final String TEXT_176 = ".INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));" + NL

 			+ "\t\t\t\treturn false;" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tsetErrorMessage(null);";

-	protected final String TEXT_170 = NL

+	protected final String TEXT_177 = NL

 			+ "\t\t\treturn getInitialObjectName() != null && getEncodings().contains(encodingField.getText());" + NL

 			+ "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */";

-	protected final String TEXT_171 = NL + "\t\tpublic void setVisible(boolean visible)" + NL + "\t\t{" + NL

+	protected final String TEXT_178 = NL + "\t\tpublic void setVisible(boolean visible)" + NL + "\t\t{" + NL

 			+ "\t\t\tsuper.setVisible(visible);" + NL + "\t\t\tif (visible)" + NL + "\t\t\t{";

-	protected final String TEXT_172 = NL + "\t\t\t\tif (initialObjectField.getItemCount() == 1)" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_179 = NL + "\t\t\t\tif (initialObjectField.getItemCount() == 1)" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\tinitialObjectField.clearSelection();" + NL + "\t\t\t\t\tencodingField.setFocus();" + NL

 			+ "\t\t\t\t}" + NL + "\t\t\t\telse" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\tencodingField.clearSelection();"

 			+ NL + "\t\t\t\t\tinitialObjectField.setFocus();" + NL + "\t\t\t\t}";

-	protected final String TEXT_173 = NL + "\t\t\t\tinitialObjectField.clearSelection();" + NL

+	protected final String TEXT_180 = NL + "\t\t\t\tinitialObjectField.clearSelection();" + NL

 			+ "\t\t\t\tencodingField.clearSelection();" + NL + "\t\t\t\tfileField.setFocus();";

-	protected final String TEXT_174 = NL + "\t\t\t}" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL

+	protected final String TEXT_181 = NL + "\t\t\t}" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL

 			+ "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL

 			+ "\t\t */" + NL + "\t\tpublic String getInitialObjectName()" + NL + "\t\t{" + NL

 			+ "\t\t\tString label = initialObjectField.getText();" + NL;

-	protected final String TEXT_175 = NL + "\t\t\tfor (String name : getInitialObjectNames())";

-	protected final String TEXT_176 = NL + "\t\t\tfor (Iterator i = getInitialObjectNames().iterator(); i.hasNext(); )";

-	protected final String TEXT_177 = NL + "\t\t\t\tString name = (String)i.next();";

-	protected final String TEXT_178 = NL + "\t\t\t\tif (getLabel(name).equals(label))" + NL + "\t\t\t\t{" + NL

+	protected final String TEXT_182 = NL + "\t\t\tfor (String name : getInitialObjectNames())";

+	protected final String TEXT_183 = NL + "\t\t\tfor (Iterator i = getInitialObjectNames().iterator(); i.hasNext(); )";

+	protected final String TEXT_184 = NL + "\t\t\t\tString name = (String)i.next();";

+	protected final String TEXT_185 = NL + "\t\t\t\tif (getLabel(name).equals(label))" + NL + "\t\t\t\t{" + NL

 			+ "\t\t\t\t\treturn name;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\treturn null;" + NL + "\t\t}"

 			+ NL + "" + NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL + "\t\t * <!-- end-user-doc -->"

 			+ NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic String getEncoding()" + NL + "\t\t{" + NL

 			+ "\t\t\treturn encodingField.getText();" + NL + "\t\t}";

-	protected final String TEXT_179 = NL + NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_186 = NL + NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL

 			+ "\t\tpublic URI getFileURI()" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\treturn URI.createFileURI(fileField.getText());" + NL + "\t\t\t}" + NL

@@ -426,45 +431,45 @@
 			+ "\t\tpublic void selectFileField()" + NL + "\t\t{" + NL + "\t\t\t\tinitialObjectField.clearSelection();"

 			+ NL + "\t\t\t\tencodingField.clearSelection();" + NL + "\t\t\t\tfileField.selectAll();" + NL

 			+ "\t\t\t\tfileField.setFocus();" + NL + "\t\t}\t\t";

-	protected final String TEXT_180 = NL + NL + "\t\t/**" + NL + "\t\t * Returns the label for the specified ";

-	protected final String TEXT_181 = " name." + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_187 = NL + NL + "\t\t/**" + NL + "\t\t * Returns the label for the specified ";

+	protected final String TEXT_188 = " name." + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL

 			+ "\t\tprotected String getLabel(String ";

-	protected final String TEXT_182 = "Name)" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{" + NL

+	protected final String TEXT_189 = "Name)" + NL + "\t\t{" + NL + "\t\t\ttry" + NL + "\t\t\t{" + NL

 			+ "\t\t\t\treturn ";

-	protected final String TEXT_183 = ".INSTANCE.getString(\"";

-	protected final String TEXT_184 = "\" + ";

-	protected final String TEXT_185 = "Name + \"_";

-	protected final String TEXT_186 = "\");";

-	protected final String TEXT_187 = NL + "\t\t\t}" + NL + "\t\t\tcatch(MissingResourceException mre)" + NL + "\t\t\t{"

+	protected final String TEXT_190 = ".INSTANCE.getString(\"";

+	protected final String TEXT_191 = "\" + ";

+	protected final String TEXT_192 = "Name + \"_";

+	protected final String TEXT_193 = "\");";

+	protected final String TEXT_194 = NL + "\t\t\t}" + NL + "\t\t\tcatch(MissingResourceException mre)" + NL + "\t\t\t{"

 			+ NL + "\t\t\t\t";

-	protected final String TEXT_188 = ".INSTANCE.log(mre);" + NL + "\t\t\t}" + NL + "\t\t\treturn ";

-	protected final String TEXT_189 = "Name;" + NL + "\t\t}";

-	protected final String TEXT_190 = NL + NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_195 = ".INSTANCE.log(mre);" + NL + "\t\t\t}" + NL + "\t\t\treturn ";

+	protected final String TEXT_196 = "Name;" + NL + "\t\t}";

+	protected final String TEXT_197 = NL + NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";

-	protected final String TEXT_191 = " getEncodings()" + NL + "\t\t{" + NL + "\t\t\tif (encodings == null)" + NL

+	protected final String TEXT_198 = " getEncodings()" + NL + "\t\t{" + NL + "\t\t\tif (encodings == null)" + NL

 			+ "\t\t\t{" + NL + "\t\t\t\tencodings = new ";

-	protected final String TEXT_192 = "();" + NL

+	protected final String TEXT_199 = "();" + NL

 			+ "\t\t\t\tfor (StringTokenizer stringTokenizer = new StringTokenizer(";

-	protected final String TEXT_193 = ".INSTANCE.getString(\"_UI_XMLEncodingChoices\")); stringTokenizer.hasMoreTokens(); )";

-	protected final String TEXT_194 = NL + "\t\t\t\t{" + NL + "\t\t\t\t\tencodings.add(stringTokenizer.nextToken());"

+	protected final String TEXT_200 = ".INSTANCE.getString(\"_UI_XMLEncodingChoices\")); stringTokenizer.hasMoreTokens(); )";

+	protected final String TEXT_201 = NL + "\t\t\t\t{" + NL + "\t\t\t\t\tencodings.add(stringTokenizer.nextToken());"

 			+ NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\treturn encodings;" + NL + "\t\t}" + NL + "\t}" + NL + ""

 			+ NL + "\t/**" + NL + "\t * The framework calls this to create the contents of the wizard." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_195 = NL + "\tpublic void addPages()" + NL + "\t{";

-	protected final String TEXT_196 = NL + "\t\t// Create a page, set the title, and the initial model file name." + NL

+	protected final String TEXT_202 = NL + "\tpublic void addPages()" + NL + "\t{";

+	protected final String TEXT_203 = NL + "\t\t// Create a page, set the title, and the initial model file name." + NL

 			+ "\t\t//" + NL + "\t\tnewFileCreationPage = new ";

-	protected final String TEXT_197 = "NewFileCreationPage(\"Whatever\", selection);";

-	protected final String TEXT_198 = NL + "\t\tnewFileCreationPage.setTitle(";

-	protected final String TEXT_199 = "_label\"));";

-	protected final String TEXT_200 = NL + "\t\tnewFileCreationPage.setDescription(";

-	protected final String TEXT_201 = "_description\"));";

-	protected final String TEXT_202 = NL + "\t\tnewFileCreationPage.setFileName(";

-	protected final String TEXT_203 = "FilenameDefaultBase\") + \".\" + ";

-	protected final String TEXT_204 = "(String)";

-	protected final String TEXT_205 = "FILE_EXTENSIONS.get(0));";

-	protected final String TEXT_206 = NL + "\t\taddPage(newFileCreationPage);" + NL + "" + NL

+	protected final String TEXT_204 = "NewFileCreationPage(\"Whatever\", selection);";

+	protected final String TEXT_205 = NL + "\t\tnewFileCreationPage.setTitle(";

+	protected final String TEXT_206 = "_label\"));";

+	protected final String TEXT_207 = NL + "\t\tnewFileCreationPage.setDescription(";

+	protected final String TEXT_208 = "_description\"));";

+	protected final String TEXT_209 = NL + "\t\tnewFileCreationPage.setFileName(";

+	protected final String TEXT_210 = "FilenameDefaultBase\") + \".\" + ";

+	protected final String TEXT_211 = "(String)";

+	protected final String TEXT_212 = "FILE_EXTENSIONS.get(0));";

+	protected final String TEXT_213 = NL + "\t\taddPage(newFileCreationPage);" + NL + "" + NL

 			+ "\t\t// Try and get the resource selection to determine a current directory for the file dialog." + NL

 			+ "\t\t//" + NL + "\t\tif (selection != null && !selection.isEmpty())" + NL + "\t\t{" + NL

 			+ "\t\t\t// Get the resource..." + NL + "\t\t\t//" + NL

@@ -480,33 +485,33 @@
 			+ "\t\t\t\t\tnewFileCreationPage.setContainerFullPath(selectedResource.getFullPath());" + NL + "" + NL

 			+ "\t\t\t\t\t// Make up a unique new name here." + NL + "\t\t\t\t\t//" + NL

 			+ "\t\t\t\t\tString defaultModelBaseFilename = ";

-	protected final String TEXT_207 = "FilenameDefaultBase\");";

-	protected final String TEXT_208 = NL + "\t\t\t\t\tString defaultModelFilenameExtension = ";

-	protected final String TEXT_209 = "FILE_EXTENSIONS.get(0);" + NL

+	protected final String TEXT_214 = "FilenameDefaultBase\");";

+	protected final String TEXT_215 = NL + "\t\t\t\t\tString defaultModelFilenameExtension = ";

+	protected final String TEXT_216 = "FILE_EXTENSIONS.get(0);" + NL

 			+ "\t\t\t\t\tString modelFilename = defaultModelBaseFilename + \".\" + defaultModelFilenameExtension;";

-	protected final String TEXT_210 = NL

+	protected final String TEXT_217 = NL

 			+ "\t\t\t\t\tfor (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i)" + NL

 			+ "\t\t\t\t\t{" + NL

 			+ "\t\t\t\t\t\tmodelFilename = defaultModelBaseFilename + i + \".\" + defaultModelFilenameExtension;";

-	protected final String TEXT_211 = NL + "\t\t\t\t\t}" + NL

+	protected final String TEXT_218 = NL + "\t\t\t\t\t}" + NL

 			+ "\t\t\t\t\tnewFileCreationPage.setFileName(modelFilename);" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL

 			+ "\t\t}";

-	protected final String TEXT_212 = NL + "\t\tinitialObjectCreationPage = new ";

-	protected final String TEXT_213 = "InitialObjectCreationPage(\"Whatever2\");";

-	protected final String TEXT_214 = NL + "\t\tinitialObjectCreationPage.setTitle(";

-	protected final String TEXT_215 = NL + "\t\tinitialObjectCreationPage.setDescription(";

-	protected final String TEXT_216 = ".INSTANCE.getString(\"_UI_Wizard_initial_object_description\"));";

-	protected final String TEXT_217 = NL + "\t\taddPage(initialObjectCreationPage);" + NL + "\t}" + NL;

-	protected final String TEXT_218 = NL + "\t/**" + NL + "\t * Get the URI from the page." + NL

+	protected final String TEXT_219 = NL + "\t\tinitialObjectCreationPage = new ";

+	protected final String TEXT_220 = "InitialObjectCreationPage(\"Whatever2\");";

+	protected final String TEXT_221 = NL + "\t\tinitialObjectCreationPage.setTitle(";

+	protected final String TEXT_222 = NL + "\t\tinitialObjectCreationPage.setDescription(";

+	protected final String TEXT_223 = ".INSTANCE.getString(\"_UI_Wizard_initial_object_description\"));";

+	protected final String TEXT_224 = NL + "\t\taddPage(initialObjectCreationPage);" + NL + "\t}" + NL;

+	protected final String TEXT_225 = NL + "\t/**" + NL + "\t * Get the URI from the page." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tpublic URI getModelURI()" + NL + "\t{" + NL + "\t\treturn initialObjectCreationPage.getFileURI();"

 			+ NL + "\t}" + NL;

-	protected final String TEXT_219 = NL + "\t/**" + NL + "\t * Get the file from the page." + NL

+	protected final String TEXT_226 = NL + "\t/**" + NL + "\t * Get the file from the page." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tpublic IFile getModelFile()" + NL + "\t{" + NL + "\t\treturn newFileCreationPage.getModelFile();"

 			+ NL + "\t}" + NL;

-	protected final String TEXT_220 = NL + "}";

-	protected final String TEXT_221 = NL;

+	protected final String TEXT_227 = NL + "}";

+	protected final String TEXT_228 = NL;

 

 	public ModelWizard() {

 		//Here is the constructor

@@ -542,8 +547,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_221);

-		stringBuffer.append(TEXT_221);

+		stringBuffer.append(TEXT_228);

+		stringBuffer.append(TEXT_228);

 		return stringBuffer.toString();

 	}

 

@@ -615,9 +620,9 @@
 		/**

 		 * Copyright (c) 2002-2010 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

@@ -760,401 +765,421 @@
 		stringBuffer.append(TEXT_42);

 		stringBuffer.append(_ListOfString);

 		stringBuffer.append(TEXT_43);

-		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-		stringBuffer.append(TEXT_44);

-		stringBuffer.append(genModel.getNonNLS());

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_44);

+		}

 		stringBuffer.append(TEXT_45);

 		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 		stringBuffer.append(TEXT_46);

-		stringBuffer.append(genPackage.getPrefix());

-		stringBuffer.append(TEXT_47);

 		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_47);

+		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 		stringBuffer.append(TEXT_48);

+		stringBuffer.append(genPackage.getPrefix());

+		stringBuffer.append(TEXT_49);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_50);

 		if (!genPackage.hasDocumentRoot()) {

-			stringBuffer.append(TEXT_49);

+			stringBuffer.append(TEXT_51);

 		} else {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_52);

 		}

 		stringBuffer.append(TEXT_42);

 		stringBuffer.append(_CollectionOfString);

-		stringBuffer.append(TEXT_51);

+		stringBuffer.append(TEXT_53);

 		stringBuffer.append(_ArrayListOfString);

-		stringBuffer.append(TEXT_52);

+		stringBuffer.append(TEXT_54);

 		if (!genPackage.hasDocumentRoot()) {

 			if (genModel.useGenerics()) {

-				stringBuffer.append(TEXT_53);

-				stringBuffer.append(genPackage.getUncapPackageName());

-				stringBuffer.append(TEXT_54);

-			} else {

 				stringBuffer.append(TEXT_55);

 				stringBuffer.append(genPackage.getUncapPackageName());

 				stringBuffer.append(TEXT_56);

-			}

-			stringBuffer.append(TEXT_57);

-			if (!genModel.useGenerics()) {

+			} else {

+				stringBuffer.append(TEXT_57);

+				stringBuffer.append(genPackage.getUncapPackageName());

 				stringBuffer.append(TEXT_58);

 			}

 			stringBuffer.append(TEXT_59);

+			if (!genModel.useGenerics()) {

+				stringBuffer.append(TEXT_60);

+			}

+			stringBuffer.append(TEXT_61);

 		} else {

 			if (genModel.useGenerics()) {

-				stringBuffer.append(TEXT_60);

+				stringBuffer.append(TEXT_62);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));

-				stringBuffer.append(TEXT_61);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.ExtendedMetaData"));

-				stringBuffer.append(TEXT_62);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.ExtendedMetaData"));

 				stringBuffer.append(TEXT_63);

-				stringBuffer.append(genPackage.getUncapPackageName());

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.ExtendedMetaData"));

 				stringBuffer.append(TEXT_64);

-			} else {

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.ExtendedMetaData"));

 				stringBuffer.append(TEXT_65);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.ExtendedMetaData"));

-				stringBuffer.append(TEXT_62);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.ExtendedMetaData"));

-				stringBuffer.append(TEXT_63);

 				stringBuffer.append(genPackage.getUncapPackageName());

 				stringBuffer.append(TEXT_66);

-			}

-			stringBuffer.append(TEXT_57);

-			if (!genModel.useGenerics()) {

+			} else {

 				stringBuffer.append(TEXT_67);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.ExtendedMetaData"));

+				stringBuffer.append(TEXT_64);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.ExtendedMetaData"));

+				stringBuffer.append(TEXT_65);

+				stringBuffer.append(genPackage.getUncapPackageName());

 				stringBuffer.append(TEXT_68);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));

-				stringBuffer.append(TEXT_69);

 			}

-			stringBuffer.append(TEXT_70);

-		}

-		stringBuffer.append(TEXT_71);

-		if (!genModel.isRichClientPlatform() && genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) {

+			stringBuffer.append(TEXT_59);

+			if (!genModel.useGenerics()) {

+				stringBuffer.append(TEXT_69);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));

+				stringBuffer.append(TEXT_70);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));

+				stringBuffer.append(TEXT_71);

+			}

 			stringBuffer.append(TEXT_72);

-		} else {

-			stringBuffer.append(TEXT_73);

 		}

-		stringBuffer.append(TEXT_74);

-		if (!genPackage.hasDocumentRoot()) {

+		stringBuffer.append(TEXT_73);

+		if (!genModel.isRichClientPlatform() && genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) {

+			stringBuffer.append(TEXT_74);

+		} else {

 			stringBuffer.append(TEXT_75);

-			stringBuffer.append(genPackage.getUncapPackageName());

-			stringBuffer.append(TEXT_76);

-			stringBuffer.append(genPackage.getUncapFactoryName());

-			stringBuffer.append(TEXT_77);

-		} else {

-			stringBuffer.append(TEXT_78);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.ExtendedMetaData"));

-			stringBuffer.append(TEXT_63);

-			stringBuffer.append(genPackage.getUncapPackageName());

-			stringBuffer.append(TEXT_79);

-			stringBuffer.append(genPackage.getUncapFactoryName());

-			stringBuffer.append(TEXT_80);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.EcoreUtil"));

-			stringBuffer.append(TEXT_81);

 		}

-		stringBuffer.append(TEXT_82);

-		if (genModel.useClassOverrideAnnotation()) {

+		stringBuffer.append(TEXT_76);

+		if (!genPackage.hasDocumentRoot()) {

+			stringBuffer.append(TEXT_77);

+			stringBuffer.append(genPackage.getUncapPackageName());

+			stringBuffer.append(TEXT_78);

+			stringBuffer.append(genPackage.getUncapFactoryName());

+			stringBuffer.append(TEXT_79);

+		} else {

+			stringBuffer.append(TEXT_80);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.ExtendedMetaData"));

+			stringBuffer.append(TEXT_65);

+			stringBuffer.append(genPackage.getUncapPackageName());

+			stringBuffer.append(TEXT_81);

+			stringBuffer.append(genPackage.getUncapFactoryName());

+			stringBuffer.append(TEXT_82);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.EcoreUtil"));

 			stringBuffer.append(TEXT_83);

 		}

 		stringBuffer.append(TEXT_84);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_44);

+		}

+		stringBuffer.append(TEXT_85);

 		if (genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_85);

-			stringBuffer.append(genModel.getImportedName("java.io.File"));

 			stringBuffer.append(TEXT_86);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+			stringBuffer.append(genModel.getImportedName("java.io.File"));

 			stringBuffer.append(TEXT_87);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_88);

 			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-			stringBuffer.append(TEXT_89);

+			stringBuffer.append(TEXT_88);

 			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_89);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 			stringBuffer.append(TEXT_90);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.operation.IRunnableWithProgress"));

+			stringBuffer.append(genModel.getNonNLS());

 			stringBuffer.append(TEXT_91);

 			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.operation.IRunnableWithProgress"));

 			stringBuffer.append(TEXT_92);

-		} else {

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.operation.IRunnableWithProgress"));

 			stringBuffer.append(TEXT_93);

-			if (genModel.useClassOverrideAnnotation()) {

+			if (genModel.useInterfaceOverrideAnnotation()) {

 				stringBuffer.append(TEXT_94);

 			}

 			stringBuffer.append(TEXT_95);

+		} else {

+			stringBuffer.append(TEXT_96);

+			if (genModel.useClassOverrideAnnotation()) {

+				stringBuffer.append(TEXT_97);

+			}

+			stringBuffer.append(TEXT_98);

 		}

-		stringBuffer.append(TEXT_96);

+		stringBuffer.append(TEXT_99);

 		if (!genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_97);

-		}

-		stringBuffer.append(TEXT_98);

-		if (genPackage.isContentType()) {

-			stringBuffer.append(TEXT_99);

-			stringBuffer.append(genPackage.getImportedPackageInterfaceName());

 			stringBuffer.append(TEXT_100);

 		}

 		stringBuffer.append(TEXT_101);

-		stringBuffer.append(_MapOfObjectToObject);

-		stringBuffer.append(TEXT_102);

-		stringBuffer.append(_HashMapOfObjectToObject);

-		stringBuffer.append(TEXT_103);

-		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+		if (genPackage.isContentType()) {

+			stringBuffer.append(TEXT_102);

+			stringBuffer.append(genPackage.getImportedPackageInterfaceName());

+			stringBuffer.append(TEXT_103);

+		}

 		stringBuffer.append(TEXT_104);

+		stringBuffer.append(_MapOfObjectToObject);

+		stringBuffer.append(TEXT_105);

+		stringBuffer.append(_HashMapOfObjectToObject);

+		stringBuffer.append(TEXT_106);

+		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+		stringBuffer.append(TEXT_107);

 		if (genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_105);

-			stringBuffer.append(genModel.getImportedName(genModel.getQualifiedEditorAdvisorClassName()));

-			stringBuffer.append(TEXT_106);

-		} else {

-			stringBuffer.append(TEXT_107);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.ui.IWorkbenchWindow"));

 			stringBuffer.append(TEXT_108);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.ui.IWorkbenchPage"));

+			stringBuffer.append(genModel.getImportedName(genModel.getQualifiedEditorAdvisorClassName()));

 			stringBuffer.append(TEXT_109);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.ui.IWorkbenchPart"));

+		} else {

 			stringBuffer.append(TEXT_110);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.ISelection"));

+			stringBuffer.append(genModel.getImportedName("org.eclipse.ui.IWorkbenchWindow"));

 			stringBuffer.append(TEXT_111);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.StructuredSelection"));

+			stringBuffer.append(genModel.getImportedName("org.eclipse.ui.IWorkbenchPage"));

 			stringBuffer.append(TEXT_112);

-			if (!genPackage.isContentType()) {

-				stringBuffer.append(TEXT_113);

-			} else {

-				stringBuffer.append(TEXT_114);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.core.runtime.Platform"));

-				stringBuffer.append(TEXT_115);

-				stringBuffer.append(genPackage.getImportedPackageInterfaceName());

+			stringBuffer.append(genModel.getImportedName("org.eclipse.ui.IWorkbenchPart"));

+			stringBuffer.append(TEXT_113);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.ISelection"));

+			stringBuffer.append(TEXT_114);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.jface.viewers.StructuredSelection"));

+			stringBuffer.append(TEXT_115);

+			if (genModel.useInterfaceOverrideAnnotation()) {

 				stringBuffer.append(TEXT_116);

 			}

 			stringBuffer.append(TEXT_117);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.ui.PartInitException"));

-			stringBuffer.append(TEXT_118);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-			stringBuffer.append(TEXT_119);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_120);

-		}

-		stringBuffer.append(TEXT_121);

-		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-		stringBuffer.append(TEXT_122);

-		if (!genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_123);

-			stringBuffer.append(genPackage.getModelWizardClassName());

-			stringBuffer.append(TEXT_124);

-			stringBuffer.append(genPackage.getModelWizardClassName());

-			stringBuffer.append(TEXT_125);

-			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_126);

+			if (!genPackage.isContentType()) {

+				stringBuffer.append(TEXT_118);

+			} else {

+				stringBuffer.append(TEXT_119);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.core.runtime.Platform"));

+				stringBuffer.append(TEXT_120);

+				stringBuffer.append(genPackage.getImportedPackageInterfaceName());

+				stringBuffer.append(TEXT_121);

 			}

-			stringBuffer.append(TEXT_127);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.core.runtime.Path"));

+			stringBuffer.append(TEXT_122);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.ui.PartInitException"));

+			stringBuffer.append(TEXT_123);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+			stringBuffer.append(TEXT_124);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_125);

+		}

+		stringBuffer.append(TEXT_126);

+		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+		stringBuffer.append(TEXT_127);

+		if (!genModel.isRichClientPlatform()) {

 			stringBuffer.append(TEXT_128);

+			stringBuffer.append(genPackage.getModelWizardClassName());

+			stringBuffer.append(TEXT_129);

+			stringBuffer.append(genPackage.getModelWizardClassName());

+			stringBuffer.append(TEXT_130);

+			if (genModel.useClassOverrideAnnotation()) {

+				stringBuffer.append(TEXT_131);

+			}

+			stringBuffer.append(TEXT_132);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.core.runtime.Path"));

+			stringBuffer.append(TEXT_133);

 			stringBuffer.append(genModel.getNonNLS());

 			stringBuffer.append(genModel.getNonNLS(2));

-			stringBuffer.append(TEXT_129);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-			stringBuffer.append(TEXT_130);

-		}

-		stringBuffer.append(TEXT_131);

-		stringBuffer.append(genPackage.getModelWizardClassName());

-		stringBuffer.append(TEXT_132);

-		if (genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_133);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.swt.widgets.Text"));

 			stringBuffer.append(TEXT_134);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+			stringBuffer.append(TEXT_135);

 		}

-		stringBuffer.append(TEXT_135);

-		stringBuffer.append(_ListOfString);

 		stringBuffer.append(TEXT_136);

 		stringBuffer.append(genPackage.getModelWizardClassName());

 		stringBuffer.append(TEXT_137);

 		if (genModel.isRichClientPlatform()) {

 			stringBuffer.append(TEXT_138);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-			stringBuffer.append(TEXT_139);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_140);

 			stringBuffer.append(genModel.getImportedName("org.eclipse.swt.widgets.Text"));

-			stringBuffer.append(TEXT_141);

+			stringBuffer.append(TEXT_139);

+		}

+		stringBuffer.append(TEXT_140);

+		stringBuffer.append(_ListOfString);

+		stringBuffer.append(TEXT_141);

+		stringBuffer.append(genPackage.getModelWizardClassName());

+		stringBuffer.append(TEXT_142);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_131);

+		}

+		stringBuffer.append(TEXT_143);

+		if (genModel.isRichClientPlatform()) {

+			stringBuffer.append(TEXT_144);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+			stringBuffer.append(TEXT_145);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_146);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.swt.widgets.Text"));

+			stringBuffer.append(TEXT_147);

 			if (!genModel.isRichAjaxPlatform()) {

-				stringBuffer.append(TEXT_142);

+				stringBuffer.append(TEXT_148);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.swt.widgets.Button"));

-				stringBuffer.append(TEXT_143);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.swt.widgets.Button"));

-				stringBuffer.append(TEXT_144);

-				stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-				stringBuffer.append(TEXT_145);

-				stringBuffer.append(genModel.getNonNLS());

-				stringBuffer.append(TEXT_146);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.swt.events.SelectionAdapter"));

-				stringBuffer.append(TEXT_147);

-				if (genModel.useClassOverrideAnnotation()) {

-					stringBuffer.append(TEXT_148);

-				}

 				stringBuffer.append(TEXT_149);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.swt.events.SelectionEvent"));

+				stringBuffer.append(genModel.getImportedName("org.eclipse.swt.widgets.Button"));

 				stringBuffer.append(TEXT_150);

+				stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+				stringBuffer.append(TEXT_151);

+				stringBuffer.append(genModel.getNonNLS());

+				stringBuffer.append(TEXT_152);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.swt.events.SelectionAdapter"));

+				stringBuffer.append(TEXT_153);

+				if (genModel.useClassOverrideAnnotation()) {

+					stringBuffer.append(TEXT_154);

+				}

+				stringBuffer.append(TEXT_155);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.swt.events.SelectionEvent"));

+				stringBuffer.append(TEXT_156);

 				if (!genModel.useGenerics()) {

-					stringBuffer.append(TEXT_151);

+					stringBuffer.append(TEXT_157);

 				}

 				stringBuffer.append(genPackage.getImportedEditorClassName());

-				stringBuffer.append(TEXT_152);

+				stringBuffer.append(TEXT_158);

 				stringBuffer.append(genPackage.getImportedEditorClassName());

-				stringBuffer.append(TEXT_153);

+				stringBuffer.append(TEXT_159);

 				stringBuffer.append(genModel.getImportedName(genModel.getQualifiedEditorAdvisorClassName()));

-				stringBuffer.append(TEXT_154);

+				stringBuffer.append(TEXT_160);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.swt.SWT"));

-				stringBuffer.append(TEXT_155);

+				stringBuffer.append(TEXT_161);

 			}

 		}

-		stringBuffer.append(TEXT_156);

-		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-		stringBuffer.append(TEXT_157);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_158);

-		if (genModel.useGenerics()) {

-			stringBuffer.append(TEXT_159);

-		} else {

-			stringBuffer.append(TEXT_160);

-		}

-		stringBuffer.append(TEXT_161);

-		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 		stringBuffer.append(TEXT_162);

-		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 		stringBuffer.append(TEXT_163);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_164);

 		if (genModel.useGenerics()) {

-			stringBuffer.append(TEXT_164);

-		} else {

 			stringBuffer.append(TEXT_165);

+		} else {

+			stringBuffer.append(TEXT_166);

 		}

-		stringBuffer.append(TEXT_166);

+		stringBuffer.append(TEXT_167);

+		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+		stringBuffer.append(TEXT_168);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_169);

+		if (genModel.useGenerics()) {

+			stringBuffer.append(TEXT_170);

+		} else {

+			stringBuffer.append(TEXT_171);

+		}

+		stringBuffer.append(TEXT_172);

+		if (genModel.useInterfaceOverrideAnnotation()) {

+			stringBuffer.append(TEXT_94);

+		}

+		stringBuffer.append(TEXT_173);

 		if (genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_167);

+			stringBuffer.append(TEXT_174);

 			stringBuffer.append(genModel.getNonNLS());

 			stringBuffer.append(genModel.getNonNLS(2));

-			stringBuffer.append(TEXT_168);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-			stringBuffer.append(TEXT_169);

-		}

-		stringBuffer.append(TEXT_170);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_126);

-		}

-		stringBuffer.append(TEXT_171);

-		if (!genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_172);

-		} else {

-			stringBuffer.append(TEXT_173);

-		}

-		stringBuffer.append(TEXT_174);

-		if (genModel.useGenerics()) {

 			stringBuffer.append(TEXT_175);

-		} else {

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 			stringBuffer.append(TEXT_176);

 		}

-		stringBuffer.append(TEXT_57);

-		if (!genModel.useGenerics()) {

-			stringBuffer.append(TEXT_177);

+		stringBuffer.append(TEXT_177);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_131);

 		}

 		stringBuffer.append(TEXT_178);

-		if (genModel.isRichClientPlatform()) {

+		if (!genModel.isRichClientPlatform()) {

 			stringBuffer.append(TEXT_179);

+		} else {

+			stringBuffer.append(TEXT_180);

+		}

+		stringBuffer.append(TEXT_181);

+		if (genModel.useGenerics()) {

+			stringBuffer.append(TEXT_182);

+		} else {

+			stringBuffer.append(TEXT_183);

+		}

+		stringBuffer.append(TEXT_59);

+		if (!genModel.useGenerics()) {

+			stringBuffer.append(TEXT_184);

+		}

+		stringBuffer.append(TEXT_185);

+		if (genModel.isRichClientPlatform()) {

+			stringBuffer.append(TEXT_186);

 		}

 		{

 			String type = genPackage.hasDocumentRoot() ? "feature" : "type";

 			String prefix = genPackage.hasDocumentRoot() ? "_UI_DocumentRoot_" : "_UI_";

-			stringBuffer.append(TEXT_180);

-			stringBuffer.append(type);

-			stringBuffer.append(TEXT_181);

-			stringBuffer.append(type);

-			stringBuffer.append(TEXT_182);

-			stringBuffer.append(genPackage.getEditPluginClassName());

-			stringBuffer.append(TEXT_183);

-			stringBuffer.append(prefix);

-			stringBuffer.append(TEXT_184);

-			stringBuffer.append(type);

-			stringBuffer.append(TEXT_185);

-			stringBuffer.append(type);

-			stringBuffer.append(TEXT_186);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(genModel.getNonNLS(2));

 			stringBuffer.append(TEXT_187);

-			stringBuffer.append(genModel.getImportedName(genModel.getQualifiedEditorPluginClassName()));

+			stringBuffer.append(type);

 			stringBuffer.append(TEXT_188);

 			stringBuffer.append(type);

 			stringBuffer.append(TEXT_189);

-		}

-		stringBuffer.append(TEXT_190);

-		stringBuffer.append(_CollectionOfString);

-		stringBuffer.append(TEXT_191);

-		stringBuffer.append(_ArrayListOfString);

-		stringBuffer.append(TEXT_192);

-		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-		stringBuffer.append(TEXT_193);

-		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_194);

-		if (genModel.useClassOverrideAnnotation()) {

-			stringBuffer.append(TEXT_126);

-		}

-		stringBuffer.append(TEXT_195);

-		if (!genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_196);

-			stringBuffer.append(genPackage.getModelWizardClassName());

-			stringBuffer.append(TEXT_197);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_198);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-			stringBuffer.append(TEXT_26);

-			stringBuffer.append(genPackage.getModelWizardClassName());

-			stringBuffer.append(TEXT_199);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_200);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-			stringBuffer.append(TEXT_26);

-			stringBuffer.append(genPackage.getModelWizardClassName());

-			stringBuffer.append(TEXT_201);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_202);

-			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-			stringBuffer.append(TEXT_26);

-			stringBuffer.append(genPackage.getEditorClassName());

-			stringBuffer.append(TEXT_203);

-			if (!genModel.useGenerics()) {

-				stringBuffer.append(TEXT_204);

-			}

-			stringBuffer.append(TEXT_205);

+			stringBuffer.append(genPackage.getEditPluginClassName());

+			stringBuffer.append(TEXT_190);

+			stringBuffer.append(prefix);

+			stringBuffer.append(TEXT_191);

+			stringBuffer.append(type);

+			stringBuffer.append(TEXT_192);

+			stringBuffer.append(type);

+			stringBuffer.append(TEXT_193);

 			stringBuffer.append(genModel.getNonNLS());

 			stringBuffer.append(genModel.getNonNLS(2));

+			stringBuffer.append(TEXT_194);

+			stringBuffer.append(genModel.getImportedName(genModel.getQualifiedEditorPluginClassName()));

+			stringBuffer.append(TEXT_195);

+			stringBuffer.append(type);

+			stringBuffer.append(TEXT_196);

+		}

+		stringBuffer.append(TEXT_197);

+		stringBuffer.append(_CollectionOfString);

+		stringBuffer.append(TEXT_198);

+		stringBuffer.append(_ArrayListOfString);

+		stringBuffer.append(TEXT_199);

+		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+		stringBuffer.append(TEXT_200);

+		stringBuffer.append(genModel.getNonNLS());

+		stringBuffer.append(TEXT_201);

+		if (genModel.useClassOverrideAnnotation()) {

+			stringBuffer.append(TEXT_131);

+		}

+		stringBuffer.append(TEXT_202);

+		if (!genModel.isRichClientPlatform()) {

+			stringBuffer.append(TEXT_203);

+			stringBuffer.append(genPackage.getModelWizardClassName());

+			stringBuffer.append(TEXT_204);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_205);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+			stringBuffer.append(TEXT_26);

+			stringBuffer.append(genPackage.getModelWizardClassName());

 			stringBuffer.append(TEXT_206);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_207);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+			stringBuffer.append(TEXT_26);

+			stringBuffer.append(genPackage.getModelWizardClassName());

+			stringBuffer.append(TEXT_208);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_209);

 			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 			stringBuffer.append(TEXT_26);

 			stringBuffer.append(genPackage.getEditorClassName());

-			stringBuffer.append(TEXT_207);

-			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_208);

-			if (!genModel.useGenerics()) {

-				stringBuffer.append(TEXT_204);

-			}

-			stringBuffer.append(TEXT_209);

-			stringBuffer.append(genModel.getNonNLS());

 			stringBuffer.append(TEXT_210);

+			if (!genModel.useGenerics()) {

+				stringBuffer.append(TEXT_211);

+			}

+			stringBuffer.append(TEXT_212);

 			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_211);

+			stringBuffer.append(genModel.getNonNLS(2));

+			stringBuffer.append(TEXT_213);

+			stringBuffer.append(genPackage.getImportedEditorPluginClassName());

+			stringBuffer.append(TEXT_26);

+			stringBuffer.append(genPackage.getEditorClassName());

+			stringBuffer.append(TEXT_214);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_215);

+			if (!genModel.useGenerics()) {

+				stringBuffer.append(TEXT_211);

+			}

+			stringBuffer.append(TEXT_216);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_217);

+			stringBuffer.append(genModel.getNonNLS());

+			stringBuffer.append(TEXT_218);

 		}

-		stringBuffer.append(TEXT_212);

+		stringBuffer.append(TEXT_219);

 		stringBuffer.append(genPackage.getModelWizardClassName());

-		stringBuffer.append(TEXT_213);

+		stringBuffer.append(TEXT_220);

 		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_214);

+		stringBuffer.append(TEXT_221);

 		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

 		stringBuffer.append(TEXT_26);

 		stringBuffer.append(genPackage.getModelWizardClassName());

-		stringBuffer.append(TEXT_199);

+		stringBuffer.append(TEXT_206);

 		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_215);

+		stringBuffer.append(TEXT_222);

 		stringBuffer.append(genPackage.getImportedEditorPluginClassName());

-		stringBuffer.append(TEXT_216);

+		stringBuffer.append(TEXT_223);

 		stringBuffer.append(genModel.getNonNLS());

-		stringBuffer.append(TEXT_217);

+		stringBuffer.append(TEXT_224);

 		if (genModel.isRichClientPlatform()) {

-			stringBuffer.append(TEXT_218);

+			stringBuffer.append(TEXT_225);

 		} else {

-			stringBuffer.append(TEXT_219);

+			stringBuffer.append(TEXT_226);

 		}

-		stringBuffer.append(TEXT_220);

+		stringBuffer.append(TEXT_227);

 		genModel.emitSortedImports();

 		stringBuffer.append(TEXT_23);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizardIcon.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizardIcon.java
index 1a1ced3..a71dbba 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizardIcon.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModelWizardIcon.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModuleGWTXML.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModuleGWTXML.java
index d84eb72..77b78f6 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModuleGWTXML.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/ModuleGWTXML.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -150,9 +150,9 @@
 		/**

 		 * Copyright (c) 2010 Ed Merks and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   Ed Merks - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
index 4560bfb..596c11b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/Plugin.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -194,9 +194,9 @@
 		/**

 		 * Copyright (c) 2002-2004 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
index 0da659b..e8ff71b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginProperties.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -29,7 +29,7 @@
 	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

 	protected final String TEXT_1 = "";

 	protected final String TEXT_2 = NL + NL + "pluginName = ";

-	protected final String TEXT_3 = " Editor" + NL + "providerName = www.example.org";

+	protected final String TEXT_3 = NL + "providerName = ";

 	protected final String TEXT_4 = NL;

 	protected final String TEXT_5 = NL + "_UI_";

 	protected final String TEXT_6 = "_menu = &";

@@ -159,7 +159,8 @@
 			throws Exception {

 

 		GenModel genModel = parameter;

-		targetPathName = genModel.getEditorProjectDirectory() + "/plugin.properties";

+		targetPathName = genModel.getEditorProjectDirectory() + "/" + genModel.getEditorBundleLocalization()

+				+ ".properties";

 

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "setReporterVariables", stringBuffer.toString());

@@ -189,9 +190,9 @@
 		/**

 		 * Copyright (c) 2002-2006 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

@@ -216,8 +217,9 @@
 		}

 

 		stringBuffer.append(TEXT_2);

-		stringBuffer.append(genModel.getModelName());

+		stringBuffer.append(genModel.getEditorBundleName());

 		stringBuffer.append(TEXT_3);

+		stringBuffer.append(genModel.getEditorBundleVendorName());

 		if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {

 			stringBuffer.append(TEXT_4);

 			boolean hasMultiPageEditor = false;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
index b66655d..a339e62 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/PluginXML.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -262,9 +262,9 @@
 		/**

 		 * Copyright (c) 2002-2010 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/WebXML.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/WebXML.java
index d97118f..2340e04 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/WebXML.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/WebXML.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -147,9 +147,9 @@
 		/**

 		 * Copyright (c) 2010 Ed Merks and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   Ed Merks - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/call/Editor/EditoraddItemProviderFactoriesinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/call/Editor/EditoraddItemProviderFactoriesinsert.java
index d07e651..18be293 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/call/Editor/EditoraddItemProviderFactoriesinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/call/Editor/EditoraddItemProviderFactoriesinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor.call.Editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/call/Editor/EditoraddItemProviderFactoriesoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/call/Editor/EditoraddItemProviderFactoriesoverride.java
index 2c8510f..264d700 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/call/Editor/EditoraddItemProviderFactoriesoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/editor/call/Editor/EditoraddItemProviderFactoriesoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.editor.call.Editor;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
index 03a912c..83ad2ed 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/AdapterFactoryClass.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -212,9 +212,9 @@
 		/**

 		 * Copyright (c) 2002-2006 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
index 9cd340a..4b2008c 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/BuildProperties.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -33,12 +33,14 @@
 	protected final String TEXT_4 = NL + "               icons/,\\";

 	protected final String TEXT_5 = NL + "               META-INF/,\\";

 	protected final String TEXT_6 = NL + "               plugin.xml,\\";

-	protected final String TEXT_7 = NL + "               plugin.properties" + NL + "jars.compile.order = ";

-	protected final String TEXT_8 = NL + "source.";

-	protected final String TEXT_9 = " = ";

-	protected final String TEXT_10 = NL + "output.";

-	protected final String TEXT_11 = " = bin/" + NL;

-	protected final String TEXT_12 = NL;

+	protected final String TEXT_7 = NL + "               ";

+	protected final String TEXT_8 = ".properties";

+	protected final String TEXT_9 = NL + "jars.compile.order = ";

+	protected final String TEXT_10 = NL + "source.";

+	protected final String TEXT_11 = " = ";

+	protected final String TEXT_12 = NL + "output.";

+	protected final String TEXT_13 = " = bin/" + NL;

+	protected final String TEXT_14 = NL;

 

 	public BuildProperties() {

 		//Here is the constructor

@@ -74,8 +76,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_12);

-		stringBuffer.append(TEXT_12);

+		stringBuffer.append(TEXT_14);

+		stringBuffer.append(TEXT_14);

 		return stringBuffer.toString();

 	}

 

@@ -149,9 +151,9 @@
 		/**

 		 * Copyright (c) 2002-2010 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

@@ -188,7 +190,17 @@
 		if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {

 			stringBuffer.append(TEXT_6);

 		}

-		stringBuffer.append(TEXT_7);

+		String modelBundleLocalization = genModel.getModelBundleLocalization();

+		int index = modelBundleLocalization.indexOf("/");

+		if (index == -1) {

+			stringBuffer.append(TEXT_7);

+			stringBuffer.append(modelBundleLocalization);

+			stringBuffer.append(TEXT_8);

+		} else {

+			stringBuffer.append(TEXT_7);

+			stringBuffer.append(modelBundleLocalization.substring(0, index + 1));

+		}

+		stringBuffer.append(TEXT_9);

 		stringBuffer.append(pluginClassesLocation);

 		boolean first = true;

 		for (Iterator<String> i = sourceFolders.iterator(); i.hasNext();) {

@@ -197,18 +209,18 @@
 				sourceFolder += ",\\";

 			}

 			if (first) {

-				stringBuffer.append(TEXT_8);

+				stringBuffer.append(TEXT_10);

 				stringBuffer.append(pluginClassesLocation);

-				stringBuffer.append(TEXT_9);

+				stringBuffer.append(TEXT_11);

 				stringBuffer.append(sourceFolder);

 				first = false;

 			} else {

 				stringBuffer.append(sourceFolder);

 			}

 		}

-		stringBuffer.append(TEXT_10);

+		stringBuffer.append(TEXT_12);

 		stringBuffer.append(pluginClassesLocation);

-		stringBuffer.append(TEXT_11);

+		stringBuffer.append(TEXT_13);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
index 8548dae..7fb58c6 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Class.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -108,7 +108,7 @@
 	protected final String TEXT_58 = "public";

 	protected final String TEXT_59 = "protected";

 	protected final String TEXT_60 = " ";

-	protected final String TEXT_61 = "()" + NL + "\t{" + NL + "\t\tsuper();";

+	protected final String TEXT_61 = "()" + NL + "\t{";

 	protected final String TEXT_62 = NL + "\t\t";

 	protected final String TEXT_63 = " |= ";

 	protected final String TEXT_64 = "_EFLAG";

@@ -151,10 +151,10 @@
 	protected final String TEXT_98 = "();";

 	protected final String TEXT_99 = NL + "\t\t\t\tif (";

 	protected final String TEXT_100 = " != null)";

-	protected final String TEXT_101 = NL + "\t\t\t\t\tmsgs = ((";

-	protected final String TEXT_102 = ").eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

+	protected final String TEXT_101 = NL + "\t\t\t\t\tmsgs = ";

+	protected final String TEXT_102 = ".eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

 	protected final String TEXT_103 = ", null, msgs);";

-	protected final String TEXT_104 = ").eInverseRemove(this, ";

+	protected final String TEXT_104 = ".eInverseRemove(this, ";

 	protected final String TEXT_105 = ", ";

 	protected final String TEXT_106 = ".class, msgs);";

 	protected final String TEXT_107 = NL + "\t\t}";

@@ -309,51 +309,51 @@
 	protected final String TEXT_240 = NL + "\t\tresult.append(')');" + NL + "\t\treturn result.toString();" + NL + "\t}"

 			+ NL;

 	protected final String TEXT_241 = 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\t";

-	protected final String TEXT_242 = " 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 ";

-	protected final String TEXT_243 = " getKey()" + NL + "\t{";

-	protected final String TEXT_244 = NL + "\t\treturn new ";

-	protected final String TEXT_245 = "(getTypedKey());";

-	protected final String TEXT_246 = NL + "\t\treturn getTypedKey();";

-	protected final String TEXT_247 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

-			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setKey(";

-	protected final String TEXT_248 = " key)" + NL + "\t{";

-	protected final String TEXT_249 = NL + "\t\tgetTypedKey().addAll(";

-	protected final String TEXT_250 = "key);";

-	protected final String TEXT_251 = NL + "\t\tsetTypedKey(key);";

-	protected final String TEXT_252 = NL + "\t\tsetTypedKey(((";

-	protected final String TEXT_253 = ")key).";

-	protected final String TEXT_254 = NL + "\t\tsetTypedKey((";

-	protected final String TEXT_255 = ")key);";

-	protected final String TEXT_256 = 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_257 = " getValue()" + NL + "\t{";

-	protected final String TEXT_258 = "(getTypedValue());";

-	protected final String TEXT_259 = NL + "\t\treturn getTypedValue();";

-	protected final String TEXT_260 = " setValue(";

-	protected final String TEXT_261 = " value)" + NL + "\t{" + NL + "\t\t";

-	protected final String TEXT_262 = " oldValue = getValue();";

-	protected final String TEXT_263 = NL + "\t\tgetTypedValue().clear();" + NL + "\t\tgetTypedValue().addAll(";

-	protected final String TEXT_264 = "value);";

-	protected final String TEXT_265 = NL + "\t\tsetTypedValue(value);";

-	protected final String TEXT_266 = NL + "\t\tsetTypedValue(((";

-	protected final String TEXT_267 = ")value).";

-	protected final String TEXT_268 = NL + "\t\tsetTypedValue((";

-	protected final String TEXT_269 = ")value);";

-	protected final String TEXT_270 = NL + "\t\treturn oldValue;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_271 = " getEMap()" + NL + "\t{" + NL + "\t\t";

-	protected final String TEXT_272 = " container = eContainer();" + NL + "\t\treturn container == null ? null : (";

-	protected final String TEXT_273 = ")container.eGet(eContainmentFeature());" + NL + "\t}" + NL;

-	protected final String TEXT_274 = NL + "} //";

-	protected final String TEXT_275 = NL;

+	protected final String TEXT_242 = NL + "\tpublic int getHash()" + NL + "\t{" + NL + "\t\tif (hash == -1)" + NL

+			+ "\t\t{" + NL + "\t\t\t";

+	protected final String TEXT_243 = " 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 */";

+	protected final String TEXT_244 = 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 */";

+	protected final String TEXT_245 = " getKey()" + NL + "\t{";

+	protected final String TEXT_246 = NL + "\t\treturn new ";

+	protected final String TEXT_247 = "(getTypedKey());";

+	protected final String TEXT_248 = NL + "\t\treturn getTypedKey();";

+	protected final String TEXT_249 = NL + "\tpublic void setKey(";

+	protected final String TEXT_250 = " key)" + NL + "\t{";

+	protected final String TEXT_251 = NL + "\t\tgetTypedKey().addAll(";

+	protected final String TEXT_252 = "key);";

+	protected final String TEXT_253 = NL + "\t\tsetTypedKey(key);";

+	protected final String TEXT_254 = NL + "\t\tsetTypedKey(((";

+	protected final String TEXT_255 = ")key).";

+	protected final String TEXT_256 = NL + "\t\tsetTypedKey((";

+	protected final String TEXT_257 = ")key);";

+	protected final String TEXT_258 = " getValue()" + NL + "\t{";

+	protected final String TEXT_259 = "(getTypedValue());";

+	protected final String TEXT_260 = NL + "\t\treturn getTypedValue();";

+	protected final String TEXT_261 = " setValue(";

+	protected final String TEXT_262 = " value)" + NL + "\t{" + NL + "\t\t";

+	protected final String TEXT_263 = " oldValue = getValue();";

+	protected final String TEXT_264 = NL + "\t\tgetTypedValue().clear();" + NL + "\t\tgetTypedValue().addAll(";

+	protected final String TEXT_265 = "value);";

+	protected final String TEXT_266 = NL + "\t\tsetTypedValue(value);";

+	protected final String TEXT_267 = NL + "\t\tsetTypedValue(((";

+	protected final String TEXT_268 = ")value).";

+	protected final String TEXT_269 = NL + "\t\tsetTypedValue((";

+	protected final String TEXT_270 = ")value);";

+	protected final String TEXT_271 = NL + "\t\treturn oldValue;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

+			+ "\t */";

+	protected final String TEXT_272 = " getEMap()" + NL + "\t{" + NL + "\t\t";

+	protected final String TEXT_273 = " container = eContainer();" + NL + "\t\treturn container == null ? null : (";

+	protected final String TEXT_274 = ")container.eGet(eContainmentFeature());" + NL + "\t}" + NL;

+	protected final String TEXT_275 = NL + "} //";

+	protected final String TEXT_276 = NL;

 

 	public Class() {

 		//Here is the constructor

@@ -389,8 +389,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_275);

-		stringBuffer.append(TEXT_275);

+		stringBuffer.append(TEXT_276);

+		stringBuffer.append(TEXT_276);

 		return stringBuffer.toString();

 	}

 

@@ -463,9 +463,9 @@
 		/**

 		 * Copyright (c) 2002-2011 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

@@ -477,6 +477,8 @@
 		final boolean isJDK50 = genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50;

 		final boolean isInterface = Boolean.TRUE.equals(((Object[]) argument)[1]);

 		final boolean isImplementation = Boolean.TRUE.equals(((Object[]) argument)[2]);

+		final boolean useInterfaceOverrideAnnotation = genModel.useInterfaceOverrideAnnotation()

+				&& !(isInterface && isImplementation);

 		final boolean isGWT = genModel.getRuntimePlatform() == GenRuntimePlatform.GWT;

 		final String publicStaticFinalFlag = isImplementation ? "public static final " : "";

 		final String singleWildcard = isJDK50 ? "<?>" : "";

@@ -526,7 +528,7 @@
 		if (isInterface) {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.interface.javadoc.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.interface.javadoc.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -539,6 +541,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -712,7 +715,7 @@
 			for (GenFeature genFeature : genClass.getDeclaredFieldGenFeatures()) {

 				stringBuffer.append(TEXT_4);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.declaredFieldGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.declaredFieldGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -726,6 +729,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -798,6 +802,35 @@
 			stringBuffer.append(TEXT_60);

 			stringBuffer.append(genClass.getClassName());

 			stringBuffer.append(TEXT_61);

+			stringBuffer.append(TEXT_4);

+			{

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.egfCustom.constructor.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+

+				InternalPatternContext ictx = (InternalPatternContext) ctx;

+				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

+				stringBuffer.setLength(0);

+

+				final Map<String, Object> callParameters = new HashMap<String, Object>();

+				callParameters.put("genClass", genClass);

+				callParameters.put("genPackage", genPackage);

+				callParameters.put("genModel", genModel);

+				callParameters.put("isJDK50", isJDK50);

+				callParameters.put("isInterface", isInterface);

+				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

+				callParameters.put("isGWT", isGWT);

+				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

+				callParameters.put("singleWildcard", singleWildcard);

+				callParameters.put("negativeOffsetCorrection", negativeOffsetCorrection);

+				callParameters.put("positiveOffsetCorrection", positiveOffsetCorrection);

+				callParameters.put("negativeOperationOffsetCorrection", negativeOperationOffsetCorrection);

+				callParameters.put("positiveOperationOffsetCorrection", positiveOperationOffsetCorrection);

+				CallHelper.executeWithParameterInjection(

+						"platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#_JLBM0HroEeC0XN9kbwkPYQ",

+						new ExecutionContext((InternalPatternContext) ctx), callParameters);

+				stringBuffer.setLength(0);

+			}

+

 			for (GenFeature genFeature : genClass.getFlagGenFeaturesWithDefault()) {

 				stringBuffer.append(TEXT_62);

 				stringBuffer.append(genClass.getFlagsField(genFeature));

@@ -819,9 +852,40 @@
 			stringBuffer.append(genClass.getQualifiedClassifierAccessor());

 			stringBuffer.append(TEXT_70);

 		}

+		if (isImplementation && genModel.isDynamicDelegation()) {

+			stringBuffer.append(TEXT_4);

+			{

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.dynamicDelegation" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+

+				InternalPatternContext ictx = (InternalPatternContext) ctx;

+				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

+				stringBuffer.setLength(0);

+

+				final Map<String, Object> callParameters = new HashMap<String, Object>();

+				callParameters.put("genClass", genClass);

+				callParameters.put("genPackage", genPackage);

+				callParameters.put("genModel", genModel);

+				callParameters.put("isJDK50", isJDK50);

+				callParameters.put("isInterface", isInterface);

+				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

+				callParameters.put("isGWT", isGWT);

+				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

+				callParameters.put("singleWildcard", singleWildcard);

+				callParameters.put("negativeOffsetCorrection", negativeOffsetCorrection);

+				callParameters.put("positiveOffsetCorrection", positiveOffsetCorrection);

+				callParameters.put("negativeOperationOffsetCorrection", negativeOperationOffsetCorrection);

+				callParameters.put("positiveOperationOffsetCorrection", positiveOperationOffsetCorrection);

+				CallHelper.executeWithParameterInjection(

+						"platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#_WUeasCSWEemxeP6B0lLOpA",

+						new ExecutionContext((InternalPatternContext) ctx), callParameters);

+				stringBuffer.setLength(0);

+			}

+

+		}

 		stringBuffer.append(TEXT_4);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.reflectiveDelegation.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.reflectiveDelegation.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -834,6 +898,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

@@ -858,7 +923,7 @@
 					for (GenFeature genFeature : genClass.getReifiedGenFeatures()) {

 						stringBuffer.append(TEXT_4);

 						{

-							//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeatureReified.override" args="genFeature:genFeature,classExtendsGenClass:classExtendsGenClass,classExtendsAllGenFeatures:classExtendsAllGenFeatures,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+							//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeatureReified.override" args="genFeature:genFeature,classExtendsGenClass:classExtendsGenClass,classExtendsAllGenFeatures:classExtendsAllGenFeatures,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 							InternalPatternContext ictx = (InternalPatternContext) ctx;

 							new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -874,6 +939,7 @@
 							callParameters.put("isJDK50", isJDK50);

 							callParameters.put("isInterface", isInterface);

 							callParameters.put("isImplementation", isImplementation);

+							callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 							callParameters.put("isGWT", isGWT);

 							callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 							callParameters.put("singleWildcard", singleWildcard);

@@ -898,7 +964,7 @@
 						: genClass.getDeclaredGenFeatures())) {

 					stringBuffer.append(TEXT_4);

 					{

-						//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+						//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 						InternalPatternContext ictx = (InternalPatternContext) ctx;

 						new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -912,6 +978,7 @@
 						callParameters.put("isJDK50", isJDK50);

 						callParameters.put("isInterface", isInterface);

 						callParameters.put("isImplementation", isImplementation);

+						callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 						callParameters.put("isGWT", isGWT);

 						callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 						callParameters.put("singleWildcard", singleWildcard);

@@ -933,7 +1000,7 @@
 				: genClass.getDeclaredGenOperations())) {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -947,6 +1014,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -1057,9 +1125,7 @@
 					stringBuffer.append(TEXT_100);

 					if (genFeature.isEffectiveContains()) {

 						stringBuffer.append(TEXT_101);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-						stringBuffer.append(TEXT_83);

-						stringBuffer.append(genFeature.getSafeName());

+						stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), true));

 						stringBuffer.append(TEXT_102);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(negativeOffsetCorrection);

@@ -1071,9 +1137,7 @@
 								? " + " + genClass.getOffsetCorrectionField(genFeature)

 								: "";

 						stringBuffer.append(TEXT_101);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-						stringBuffer.append(TEXT_83);

-						stringBuffer.append(genFeature.getSafeName());

+						stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), true));

 						stringBuffer.append(TEXT_104);

 						stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

 						stringBuffer.append(reverseOffsetCorrection);

@@ -1389,7 +1453,7 @@
 				&& genClass.implementsAny(genClass.getEUnsetGenFeatures())) {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.eUnset.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.eUnset.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -1402,6 +1466,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -1421,7 +1486,7 @@
 				&& genClass.implementsAny(genClass.getEIsSetGenFeatures())) {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.eIsSet.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.eIsSet.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -1434,6 +1499,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -1940,94 +2006,118 @@
 				stringBuffer.append(genModel.getImportedName("com.google.gwt.user.client.rpc.GwtTransient"));

 			}

 			stringBuffer.append(TEXT_241);

-			stringBuffer.append(objectType);

-			stringBuffer.append(TEXT_242);

-			stringBuffer.append(keyType);

-			stringBuffer.append(TEXT_243);

-			if (!isJDK50 && keyFeature.isPrimitiveType()) {

-				stringBuffer.append(TEXT_244);

-				stringBuffer.append(keyFeature.getObjectType(genClass));

-				stringBuffer.append(TEXT_245);

-			} else {

-				stringBuffer.append(TEXT_246);

+			if (useInterfaceOverrideAnnotation) {

+				stringBuffer.append(TEXT_67);

 			}

-			stringBuffer.append(TEXT_247);

+			stringBuffer.append(TEXT_242);

+			stringBuffer.append(objectType);

+			stringBuffer.append(TEXT_243);

+			if (useInterfaceOverrideAnnotation) {

+				stringBuffer.append(TEXT_67);

+			}

+			stringBuffer.append(TEXT_244);

+			if (useInterfaceOverrideAnnotation) {

+				stringBuffer.append(TEXT_67);

+			}

+			stringBuffer.append(TEXT_73);

 			stringBuffer.append(keyType);

-			stringBuffer.append(TEXT_248);

+			stringBuffer.append(TEXT_245);

+			if (!isJDK50 && keyFeature.isPrimitiveType()) {

+				stringBuffer.append(TEXT_246);

+				stringBuffer.append(keyFeature.getObjectType(genClass));

+				stringBuffer.append(TEXT_247);

+			} else {

+				stringBuffer.append(TEXT_248);

+			}

+			stringBuffer.append(TEXT_66);

+			if (useInterfaceOverrideAnnotation) {

+				stringBuffer.append(TEXT_67);

+			}

+			stringBuffer.append(TEXT_249);

+			stringBuffer.append(keyType);

+			stringBuffer.append(TEXT_250);

 			if (keyFeature.isListType()) {

-				stringBuffer.append(TEXT_249);

+				stringBuffer.append(TEXT_251);

 				if (!genModel.useGenerics()) {

 					stringBuffer.append(TEXT_81);

 					stringBuffer.append(genModel.getImportedName("java.util.Collection"));

 					stringBuffer.append(TEXT_83);

 				}

-				stringBuffer.append(TEXT_250);

-			} else if (isJDK50) {

-				stringBuffer.append(TEXT_251);

-			} else if (keyFeature.isPrimitiveType()) {

 				stringBuffer.append(TEXT_252);

-				stringBuffer.append(keyFeature.getObjectType(genClass));

+			} else if (isJDK50) {

 				stringBuffer.append(TEXT_253);

+			} else if (keyFeature.isPrimitiveType()) {

+				stringBuffer.append(TEXT_254);

+				stringBuffer.append(keyFeature.getObjectType(genClass));

+				stringBuffer.append(TEXT_255);

 				stringBuffer.append(keyFeature.getPrimitiveValueFunction());

 				stringBuffer.append(TEXT_132);

 			} else {

-				stringBuffer.append(TEXT_254);

+				stringBuffer.append(TEXT_256);

 				stringBuffer.append(keyFeature.getImportedType(genClass));

-				stringBuffer.append(TEXT_255);

+				stringBuffer.append(TEXT_257);

 			}

-			stringBuffer.append(TEXT_256);

+			stringBuffer.append(TEXT_66);

+			if (useInterfaceOverrideAnnotation) {

+				stringBuffer.append(TEXT_67);

+			}

+			stringBuffer.append(TEXT_73);

 			stringBuffer.append(valueType);

-			stringBuffer.append(TEXT_257);

+			stringBuffer.append(TEXT_258);

 			if (!isJDK50 && valueFeature.isPrimitiveType()) {

-				stringBuffer.append(TEXT_244);

+				stringBuffer.append(TEXT_246);

 				stringBuffer.append(valueFeature.getObjectType(genClass));

-				stringBuffer.append(TEXT_258);

-			} else {

 				stringBuffer.append(TEXT_259);

+			} else {

+				stringBuffer.append(TEXT_260);

 			}

-			stringBuffer.append(TEXT_256);

-			stringBuffer.append(valueType);

-			stringBuffer.append(TEXT_260);

+			stringBuffer.append(TEXT_66);

+			if (useInterfaceOverrideAnnotation) {

+				stringBuffer.append(TEXT_67);

+			}

+			stringBuffer.append(TEXT_73);

 			stringBuffer.append(valueType);

 			stringBuffer.append(TEXT_261);

 			stringBuffer.append(valueType);

 			stringBuffer.append(TEXT_262);

+			stringBuffer.append(valueType);

+			stringBuffer.append(TEXT_263);

 			if (valueFeature.isListType()) {

-				stringBuffer.append(TEXT_263);

+				stringBuffer.append(TEXT_264);

 				if (!genModel.useGenerics()) {

 					stringBuffer.append(TEXT_81);

 					stringBuffer.append(genModel.getImportedName("java.util.Collection"));

 					stringBuffer.append(TEXT_83);

 				}

-				stringBuffer.append(TEXT_264);

-			} else if (isJDK50) {

 				stringBuffer.append(TEXT_265);

-			} else if (valueFeature.isPrimitiveType()) {

+			} else if (isJDK50) {

 				stringBuffer.append(TEXT_266);

-				stringBuffer.append(valueFeature.getObjectType(genClass));

+			} else if (valueFeature.isPrimitiveType()) {

 				stringBuffer.append(TEXT_267);

+				stringBuffer.append(valueFeature.getObjectType(genClass));

+				stringBuffer.append(TEXT_268);

 				stringBuffer.append(valueFeature.getPrimitiveValueFunction());

 				stringBuffer.append(TEXT_132);

 			} else {

-				stringBuffer.append(TEXT_268);

-				stringBuffer.append(valueFeature.getImportedType(genClass));

 				stringBuffer.append(TEXT_269);

+				stringBuffer.append(valueFeature.getImportedType(genClass));

+				stringBuffer.append(TEXT_270);

 			}

-			stringBuffer.append(TEXT_270);

+			stringBuffer.append(TEXT_271);

 			if (genModel.useGenerics()) {

 				stringBuffer.append(TEXT_72);

 			}

 			stringBuffer.append(TEXT_73);

 			stringBuffer.append(eMapType);

-			stringBuffer.append(TEXT_271);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EObject"));

 			stringBuffer.append(TEXT_272);

-			stringBuffer.append(eMapType);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EObject"));

 			stringBuffer.append(TEXT_273);

+			stringBuffer.append(eMapType);

+			stringBuffer.append(TEXT_274);

 		}

 		stringBuffer.append(TEXT_4);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.insert" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.insert" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -2040,6 +2130,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

@@ -2053,7 +2144,7 @@
 			stringBuffer.setLength(0);

 		}

 

-		stringBuffer.append(TEXT_274);

+		stringBuffer.append(TEXT_275);

 		stringBuffer.append(isInterface ? " " + genClass.getInterfaceName() : genClass.getClassName());

 		// TODO fix the space above

 		genModel.emitSortedImports();

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
index a27d580..f06e14a 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/EnumClass.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -55,128 +55,130 @@
 	protected final String TEXT_24 = NL + "\t;" + NL;

 	protected final String TEXT_25 = NL + "\t/**" + NL + "\t * The '<em><b>";

 	protected final String TEXT_26 = "</b></em>' literal object." + NL + "\t * <!-- begin-user-doc -->" + NL

-			+ "\t * <!-- end-user-doc -->" + NL + "\t * @see #";

-	protected final String TEXT_27 = NL + "\t * ";

-	protected final String TEXT_28 = NL + "\t * @generated" + NL + "\t * @ordered" + NL + "\t */";

-	protected final String TEXT_29 = NL + "\t@Deprecated";

-	protected final String TEXT_30 = NL + "\t";

-	protected final String TEXT_31 = "(";

-	protected final String TEXT_32 = ", \"";

-	protected final String TEXT_33 = "\", ";

-	protected final String TEXT_34 = ")";

-	protected final String TEXT_35 = ",";

-	protected final String TEXT_36 = ";";

-	protected final String TEXT_37 = NL;

-	protected final String TEXT_38 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+			+ "\t * <!-- end-user-doc -->";

+	protected final String TEXT_27 = NL + "\t * <!-- begin-model-doc -->" + NL + "\t * ";

+	protected final String TEXT_28 = NL + "\t * <!-- end-model-doc -->";

+	protected final String TEXT_29 = NL + "\t * @see #";

+	protected final String TEXT_30 = NL + "\t * @generated" + NL + "\t * @ordered" + NL + "\t */";

+	protected final String TEXT_31 = NL + "\t@Deprecated";

+	protected final String TEXT_32 = NL + "\t";

+	protected final String TEXT_33 = "(";

+	protected final String TEXT_34 = ", \"";

+	protected final String TEXT_35 = "\", ";

+	protected final String TEXT_36 = ")";

+	protected final String TEXT_37 = ",";

+	protected final String TEXT_38 = ";";

+	protected final String TEXT_39 = NL;

+	protected final String TEXT_40 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static final ";

-	protected final String TEXT_39 = " copyright = ";

-	protected final String TEXT_40 = "</b></em>' literal value." + NL + "\t * <!-- begin-user-doc -->";

-	protected final String TEXT_41 = NL + "\t * <p>" + NL + "\t * If the meaning of '<em><b>";

-	protected final String TEXT_42 = "</b></em>' literal object isn't clear," + NL

+	protected final String TEXT_41 = " copyright = ";

+	protected final String TEXT_42 = "</b></em>' literal value." + NL + "\t * <!-- begin-user-doc -->";

+	protected final String TEXT_43 = NL + "\t * <p>" + NL + "\t * If the meaning of '<em><b>";

+	protected final String TEXT_44 = "</b></em>' literal object isn't clear," + NL

 			+ "\t * there really should be more of a description here..." + NL + "\t * </p>";

-	protected final String TEXT_43 = NL + "\t * <!-- end-user-doc -->";

-	protected final String TEXT_44 = NL + "\t * <!-- begin-model-doc -->" + NL + "\t * ";

-	protected final String TEXT_45 = NL + "\t * <!-- end-model-doc -->";

-	protected final String TEXT_46 = NL + "\t * @see #";

-	protected final String TEXT_47 = NL + "\t * @model ";

-	protected final String TEXT_48 = NL + "\t *        ";

-	protected final String TEXT_49 = NL + "\t * @model";

-	protected final String TEXT_50 = NL + "\tpublic static final int ";

-	protected final String TEXT_51 = " = ";

-	protected final String TEXT_52 = NL + "\tpublic static final ";

-	protected final String TEXT_53 = " = new ";

-	protected final String TEXT_54 = ");";

-	protected final String TEXT_55 = NL + "\t/**" + NL + "\t * An array of all the '<em><b>";

-	protected final String TEXT_56 = "</b></em>' enumerators." + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_45 = NL + "\t * <!-- end-user-doc -->";

+	protected final String TEXT_46 = NL + "\t * @model ";

+	protected final String TEXT_47 = NL + "\t *        ";

+	protected final String TEXT_48 = NL + "\t * @model";

+	protected final String TEXT_49 = NL + "\tpublic static final int ";

+	protected final String TEXT_50 = " = ";

+	protected final String TEXT_51 = "</b></em>' literal object." + NL + "\t * <!-- begin-user-doc -->" + NL

+			+ "\t * <!-- end-user-doc -->" + NL + "\t * @see #";

+	protected final String TEXT_52 = NL + "\t * ";

+	protected final String TEXT_53 = NL + "\tpublic static final ";

+	protected final String TEXT_54 = " = new ";

+	protected final String TEXT_55 = ");";

+	protected final String TEXT_56 = NL + "\t/**" + NL + "\t * An array of all the '<em><b>";

+	protected final String TEXT_57 = "</b></em>' enumerators." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static final ";

-	protected final String TEXT_57 = "[] VALUES_ARRAY =" + NL + "\t\tnew ";

-	protected final String TEXT_58 = "[]" + NL + "\t\t{";

-	protected final String TEXT_59 = NL + "\t\t\t";

-	protected final String TEXT_60 = NL + "\t\t};" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_58 = "[] VALUES_ARRAY =" + NL + "\t\tnew ";

+	protected final String TEXT_59 = "[]" + NL + "\t\t{";

+	protected final String TEXT_60 = NL + "\t\t\t";

+	protected final String TEXT_61 = NL + "\t\t};" + NL + "" + NL + "\t/**" + NL

 			+ "\t * A public read-only list of all the '<em><b>";

-	protected final String TEXT_61 = "</b></em>' enumerators." + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_62 = "</b></em>' enumerators." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static final List";

-	protected final String TEXT_62 = "<";

-	protected final String TEXT_63 = ">";

-	protected final String TEXT_64 = " VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));" + NL + ""

+	protected final String TEXT_63 = "<";

+	protected final String TEXT_64 = ">";

+	protected final String TEXT_65 = " VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));" + NL + ""

 			+ NL + "\t/**" + NL + "\t * Returns the '<em><b>";

-	protected final String TEXT_65 = "</b></em>' literal with the specified literal value." + NL

+	protected final String TEXT_66 = "</b></em>' literal with the specified literal value." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL

 			+ "\t * @param literal the literal." + NL + "\t * @return the matching enumerator or <code>null</code>."

 			+ NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static ";

-	protected final String TEXT_66 = " get(";

-	protected final String TEXT_67 = " literal)" + NL + "\t{" + NL + "\t\tfor (int i = 0; i < VALUES_ARRAY.length; ++i)"

+	protected final String TEXT_67 = " get(";

+	protected final String TEXT_68 = " literal)" + NL + "\t{" + NL + "\t\tfor (int i = 0; i < VALUES_ARRAY.length; ++i)"

 			+ NL + "\t\t{" + NL + "\t\t\t";

-	protected final String TEXT_68 = " result = VALUES_ARRAY[i];" + NL + "\t\t\tif (result.toString().equals(literal))"

+	protected final String TEXT_69 = " result = VALUES_ARRAY[i];" + NL + "\t\t\tif (result.toString().equals(literal))"

 			+ NL + "\t\t\t{" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn null;"

 			+ NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Returns the '<em><b>";

-	protected final String TEXT_69 = "</b></em>' literal with the specified name." + NL + "\t * <!-- begin-user-doc -->"

+	protected final String TEXT_70 = "</b></em>' literal with the specified name." + NL + "\t * <!-- begin-user-doc -->"

 			+ NL + "\t * <!-- end-user-doc -->" + NL + "\t * @param name the name." + NL

 			+ "\t * @return the matching enumerator or <code>null</code>." + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tpublic static ";

-	protected final String TEXT_70 = " getByName(";

-	protected final String TEXT_71 = " name)" + NL + "\t{" + NL + "\t\tfor (int i = 0; i < VALUES_ARRAY.length; ++i)"

+	protected final String TEXT_71 = " getByName(";

+	protected final String TEXT_72 = " name)" + NL + "\t{" + NL + "\t\tfor (int i = 0; i < VALUES_ARRAY.length; ++i)"

 			+ NL + "\t\t{" + NL + "\t\t\t";

-	protected final String TEXT_72 = " result = VALUES_ARRAY[i];" + NL + "\t\t\tif (result.getName().equals(name))" + NL

+	protected final String TEXT_73 = " result = VALUES_ARRAY[i];" + NL + "\t\t\tif (result.getName().equals(name))" + NL

 			+ "\t\t\t{" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn null;" + NL

 			+ "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Returns the '<em><b>";

-	protected final String TEXT_73 = "</b></em>' literal with the specified integer value." + NL

+	protected final String TEXT_74 = "</b></em>' literal with the specified integer value." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL

 			+ "\t * @param value the integer value." + NL + "\t * @return the matching enumerator or <code>null</code>."

 			+ NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static ";

-	protected final String TEXT_74 = " get(int value)" + NL + "\t{" + NL + "\t\tswitch (value)" + NL + "\t\t{";

-	protected final String TEXT_75 = NL + "\t\t\tcase ";

-	protected final String TEXT_76 = ": return ";

-	protected final String TEXT_77 = NL + "\t\t}" + NL + "\t\treturn null;" + NL + "\t}" + NL;

-	protected final String TEXT_78 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_75 = " get(int value)" + NL + "\t{" + NL + "\t\tswitch (value)" + NL + "\t\t{";

+	protected final String TEXT_76 = NL + "\t\t\tcase ";

+	protected final String TEXT_77 = ": return ";

+	protected final String TEXT_78 = NL + "\t\t}" + NL + "\t\treturn null;" + NL + "\t}" + NL;

+	protected final String TEXT_79 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate final int value;"

 			+ NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL

 			+ "\t * @generated" + NL + "\t */" + NL + "\tprivate final ";

-	protected final String TEXT_79 = " name;" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_80 = " name;" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate final ";

-	protected final String TEXT_80 = " literal;" + NL;

-	protected final String TEXT_81 = NL + "\t/**" + NL + "\t * Only this class can construct instances." + NL

+	protected final String TEXT_81 = " literal;" + NL;

+	protected final String TEXT_82 = NL + "\t/**" + NL + "\t * Only this class can construct instances." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tprivate ";

-	protected final String TEXT_82 = "(int value, ";

-	protected final String TEXT_83 = " name, ";

-	protected final String TEXT_84 = " literal)" + NL + "\t{";

-	protected final String TEXT_85 = NL + "\t\tthis.value = value;" + NL + "\t\tthis.name = name;" + NL

+	protected final String TEXT_83 = "(int value, ";

+	protected final String TEXT_84 = " name, ";

+	protected final String TEXT_85 = " literal)" + NL + "\t{";

+	protected final String TEXT_86 = NL + "\t\tthis.value = value;" + NL + "\t\tthis.name = name;" + NL

 			+ "\t\tthis.literal = literal;";

-	protected final String TEXT_86 = NL + "\t\tsuper(value, name, literal);";

-	protected final String TEXT_87 = NL + "\t}" + NL;

-	protected final String TEXT_88 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

-			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int getValue()" + NL

-			+ "\t{" + NL + "\t  return value;" + 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_89 = " getName()" + NL + "\t{" + NL + "\t  return name;" + NL + "\t}" + NL + "" + NL

+	protected final String TEXT_87 = NL + "\t\tsuper(value, name, literal);";

+	protected final String TEXT_88 = NL + "\t}" + NL;

+	protected final String TEXT_89 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

+	protected final String TEXT_90 = NL + "\t@Override";

+	protected final String TEXT_91 = NL + "\tpublic int getValue()" + NL + "\t{" + NL + "\t  return value;" + NL + "\t}"

+			+ NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL

+			+ "\t * @generated" + NL + "\t */";

+	protected final String TEXT_92 = NL + "\tpublic ";

+	protected final String TEXT_93 = " getName()" + NL + "\t{" + NL + "\t  return name;" + 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_90 = " getLiteral()" + NL + "\t{" + NL + "\t  return literal;" + NL + "\t}" + NL + ""

+			+ NL + "\t */";

+	protected final String TEXT_94 = " getLiteral()" + NL + "\t{" + NL + "\t  return literal;" + NL + "\t}" + NL + ""

 			+ NL + "\t/**" + NL

 			+ "\t * Returns the literal value of the enumerator, which is its string representation." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_91 = NL + "\t@Override";

-	protected final String TEXT_92 = NL + "\tpublic ";

-	protected final String TEXT_93 = " toString()" + NL + "\t{" + NL + "\t\treturn literal;" + NL + "\t}" + NL + "\t";

-	protected final String TEXT_94 = NL + "} //";

-	protected final String TEXT_95 = NL + "/**" + NL

+	protected final String TEXT_95 = " toString()" + NL + "\t{" + NL + "\t\treturn literal;" + NL + "\t}" + NL + "\t";

+	protected final String TEXT_96 = NL + "} //";

+	protected final String TEXT_97 = NL + "/**" + NL

 			+ " * A private implementation interface used to hide the inheritance from Enumerator." + NL

 			+ " * <!-- begin-user-doc -->" + NL + " * <!-- end-user-doc -->" + NL + " * @generated" + NL + " */" + NL

 			+ "interface Internal";

-	protected final String TEXT_96 = " extends org.eclipse.emf.common.util.Enumerator" + NL + "{" + NL + "\t// Empty "

+	protected final String TEXT_98 = " extends org.eclipse.emf.common.util.Enumerator" + NL + "{" + NL + "\t// Empty "

 			+ NL + "}";

-	protected final String TEXT_97 = NL + "/**" + NL + " * A private implementation class to construct the instances."

+	protected final String TEXT_99 = NL + "/**" + NL + " * A private implementation class to construct the instances."

 			+ NL + " * <!-- begin-user-doc -->" + NL + " * <!-- end-user-doc -->" + NL + " * @generated" + NL + " */"

 			+ NL + "class Internal";

-	protected final String TEXT_98 = " extends org.eclipse.emf.common.util.AbstractEnumerator" + NL + "{" + NL + "\t/**"

-			+ NL + "\t * Only this class can construct instances." + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_100 = " extends org.eclipse.emf.common.util.AbstractEnumerator" + NL + "{" + NL

+			+ "\t/**" + NL + "\t * Only this class can construct instances." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected Internal";

-	protected final String TEXT_99 = " literal)" + NL + "\t{" + NL + "\t\tsuper(value, name, literal);" + NL + "\t}"

+	protected final String TEXT_101 = " literal)" + NL + "\t{" + NL + "\t\tsuper(value, name, literal);" + NL + "\t}"

 			+ NL + "}";

-	protected final String TEXT_100 = NL;

+	protected final String TEXT_102 = NL;

 

 	public EnumClass() {

 		//Here is the constructor

@@ -212,8 +214,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_100);

-		stringBuffer.append(TEXT_100);

+		stringBuffer.append(TEXT_102);

+		stringBuffer.append(TEXT_102);

 		return stringBuffer.toString();

 	}

 

@@ -285,9 +287,9 @@
 		/**

 		 * Copyright (c) 2002-2007 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

@@ -389,60 +391,62 @@
 					stringBuffer.append(TEXT_25);

 					stringBuffer.append(genEnumLiteral.getFormattedName());

 					stringBuffer.append(TEXT_26);

-					stringBuffer.append(genEnumLiteral.getEnumLiteralValueConstantName());

-					if (genEnumLiteral.hasAPITags()) {

+					if (genEnumLiteral.hasDocumentation()) {

 						stringBuffer.append(TEXT_27);

-						stringBuffer.append(genEnumLiteral.getAPITags(genModel.getIndentation(stringBuffer)));

+						stringBuffer.append(genEnumLiteral.getDocumentation(genModel.getIndentation(stringBuffer)));

+						stringBuffer.append(TEXT_28);

 					}

-					stringBuffer.append(TEXT_28);

-					if (isJDK50 && genEnumLiteral.hasAPIDeprecatedTag()) {

-						stringBuffer.append(TEXT_29);

-					}

+					stringBuffer.append(TEXT_29);

+					stringBuffer.append(genEnumLiteral.getEnumLiteralValueConstantName());

 					stringBuffer.append(TEXT_30);

-					stringBuffer.append(genEnumLiteral.getEnumLiteralInstanceConstantName());

-					stringBuffer.append(TEXT_31);

-					stringBuffer.append(genEnumLiteral.getValue());

+					if (isJDK50 && genEnumLiteral.hasAPIDeprecatedTag()) {

+						stringBuffer.append(TEXT_31);

+					}

 					stringBuffer.append(TEXT_32);

-					stringBuffer.append(genEnumLiteral.getName());

+					stringBuffer.append(genEnumLiteral.getEnumLiteralInstanceConstantName());

 					stringBuffer.append(TEXT_33);

-					stringBuffer.append(Literals.toStringLiteral(genEnumLiteral.getLiteral(), genModel));

+					stringBuffer.append(genEnumLiteral.getValue());

 					stringBuffer.append(TEXT_34);

+					stringBuffer.append(genEnumLiteral.getName());

+					stringBuffer.append(TEXT_35);

+					stringBuffer.append(Literals.toStringLiteral(genEnumLiteral.getLiteral(), genModel));

+					stringBuffer.append(TEXT_36);

 					if (l.hasNext()) {

-						stringBuffer.append(TEXT_35);

+						stringBuffer.append(TEXT_37);

 					} else {

-						stringBuffer.append(TEXT_36);

+						stringBuffer.append(TEXT_38);

 					}

 					stringBuffer.append(genModel.getNonNLS());

 					stringBuffer.append(genModel.getNonNLS(2));

-					stringBuffer.append(TEXT_37);

+					stringBuffer.append(TEXT_39);

 				}

 			}

 		}

 		if (genModel.hasCopyrightField()) {

-			stringBuffer.append(TEXT_38);

+			stringBuffer.append(TEXT_40);

 			stringBuffer.append(genModel.getImportedName("java.lang.String"));

-			stringBuffer.append(TEXT_39);

+			stringBuffer.append(TEXT_41);

 			stringBuffer.append(genModel.getCopyrightFieldLiteral());

-			stringBuffer.append(TEXT_36);

+			stringBuffer.append(TEXT_38);

 			stringBuffer.append(genModel.getNonNLS());

-			stringBuffer.append(TEXT_37);

+			stringBuffer.append(TEXT_39);

 		}

 		for (GenEnumLiteral genEnumLiteral : genEnum.getGenEnumLiterals()) {

 			stringBuffer.append(TEXT_25);

 			stringBuffer.append(genEnumLiteral.getFormattedName());

-			stringBuffer.append(TEXT_40);

+			stringBuffer.append(TEXT_42);

 			if (!genEnumLiteral.hasDocumentation()) {

-				stringBuffer.append(TEXT_41);

+				stringBuffer.append(TEXT_43);

 				stringBuffer.append(genEnumLiteral.getFormattedName());

-				stringBuffer.append(TEXT_42);

-			}

-			stringBuffer.append(TEXT_43);

-			if (genEnumLiteral.hasDocumentation()) {

 				stringBuffer.append(TEXT_44);

-				stringBuffer.append(genEnumLiteral.getDocumentation(genModel.getIndentation(stringBuffer)));

-				stringBuffer.append(TEXT_45);

 			}

-			stringBuffer.append(TEXT_46);

+			stringBuffer.append(TEXT_45);

+			if (genEnumLiteral.hasDocumentation()) {

+				stringBuffer.append(TEXT_27);

+				stringBuffer.append(genEnumLiteral.getDocumentation(genModel.getIndentation(stringBuffer)));

+				stringBuffer.append(TEXT_28);

+			}

+			stringBuffer.append(TEXT_29);

 			stringBuffer.append(genEnumLiteral.getEnumLiteralInstanceConstantName());

 			if (!genModel.isSuppressEMFModelTags()) {

 				boolean first = true;

@@ -451,24 +455,24 @@
 					String modelInfo = stringTokenizer.nextToken();

 					if (first) {

 						first = false;

-						stringBuffer.append(TEXT_47);

+						stringBuffer.append(TEXT_46);

 						stringBuffer.append(modelInfo);

 					} else {

-						stringBuffer.append(TEXT_48);

+						stringBuffer.append(TEXT_47);

 						stringBuffer.append(modelInfo);

 					}

 				}

 				if (first) {

-					stringBuffer.append(TEXT_49);

+					stringBuffer.append(TEXT_48);

 				}

 			}

-			stringBuffer.append(TEXT_28);

+			stringBuffer.append(TEXT_30);

 			if (isJDK50 && genEnumLiteral.hasAPIDeprecatedTag()) {

-				stringBuffer.append(TEXT_29);

+				stringBuffer.append(TEXT_31);

 			}

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_49);

 			stringBuffer.append(genEnumLiteral.getEnumLiteralValueConstantName());

-			stringBuffer.append(TEXT_51);

+			stringBuffer.append(TEXT_50);

 			stringBuffer.append(genEnumLiteral.getValue());

 			stringBuffer.append(TEXT_3);

 		}

@@ -476,137 +480,149 @@
 			for (GenEnumLiteral genEnumLiteral : genEnum.getGenEnumLiterals()) {

 				stringBuffer.append(TEXT_25);

 				stringBuffer.append(genEnumLiteral.getFormattedName());

-				stringBuffer.append(TEXT_26);

+				stringBuffer.append(TEXT_51);

 				stringBuffer.append(genEnumLiteral.getEnumLiteralValueConstantName());

 				if (genEnumLiteral.hasAPITags()) {

-					stringBuffer.append(TEXT_27);

+					stringBuffer.append(TEXT_52);

 					stringBuffer.append(genEnumLiteral.getAPITags(genModel.getIndentation(stringBuffer)));

 				}

-				stringBuffer.append(TEXT_28);

+				stringBuffer.append(TEXT_30);

 				if (isJDK50 && genEnumLiteral.hasAPIDeprecatedTag()) {

-					stringBuffer.append(TEXT_29);

+					stringBuffer.append(TEXT_31);

 				}

-				stringBuffer.append(TEXT_52);

+				stringBuffer.append(TEXT_53);

 				stringBuffer.append(genEnum.getName());

 				stringBuffer.append(TEXT_20);

 				stringBuffer.append(genEnumLiteral.getEnumLiteralInstanceConstantName());

-				stringBuffer.append(TEXT_53);

-				stringBuffer.append(genEnum.getName());

-				stringBuffer.append(TEXT_31);

-				stringBuffer.append(genEnumLiteral.getEnumLiteralValueConstantName());

-				stringBuffer.append(TEXT_32);

-				stringBuffer.append(genEnumLiteral.getName());

-				stringBuffer.append(TEXT_33);

-				stringBuffer.append(Literals.toStringLiteral(genEnumLiteral.getLiteral(), genModel));

 				stringBuffer.append(TEXT_54);

+				stringBuffer.append(genEnum.getName());

+				stringBuffer.append(TEXT_33);

+				stringBuffer.append(genEnumLiteral.getEnumLiteralValueConstantName());

+				stringBuffer.append(TEXT_34);

+				stringBuffer.append(genEnumLiteral.getName());

+				stringBuffer.append(TEXT_35);

+				stringBuffer.append(Literals.toStringLiteral(genEnumLiteral.getLiteral(), genModel));

+				stringBuffer.append(TEXT_55);

 				stringBuffer.append(genModel.getNonNLS());

 				stringBuffer.append(genModel.getNonNLS(2));

-				stringBuffer.append(TEXT_37);

+				stringBuffer.append(TEXT_39);

 			}

-		stringBuffer.append(TEXT_55);

-		stringBuffer.append(genEnum.getFormattedName());

 		stringBuffer.append(TEXT_56);

-		stringBuffer.append(genEnum.getName());

+		stringBuffer.append(genEnum.getFormattedName());

 		stringBuffer.append(TEXT_57);

 		stringBuffer.append(genEnum.getName());

 		stringBuffer.append(TEXT_58);

+		stringBuffer.append(genEnum.getName());

+		stringBuffer.append(TEXT_59);

 		for (GenEnumLiteral genEnumLiteral : genEnum.getGenEnumLiterals()) {

-			stringBuffer.append(TEXT_59);

+			stringBuffer.append(TEXT_60);

 			stringBuffer.append(genEnumLiteral.getEnumLiteralInstanceConstantName());

-			stringBuffer.append(TEXT_35);

+			stringBuffer.append(TEXT_37);

 		}

-		stringBuffer.append(TEXT_60);

-		stringBuffer.append(genEnum.getFormattedName());

 		stringBuffer.append(TEXT_61);

+		stringBuffer.append(genEnum.getFormattedName());

+		stringBuffer.append(TEXT_62);

 		if (isEnum) {

-			stringBuffer.append(TEXT_62);

-			stringBuffer.append(genEnum.getName());

 			stringBuffer.append(TEXT_63);

+			stringBuffer.append(genEnum.getName());

+			stringBuffer.append(TEXT_64);

 		}

-		stringBuffer.append(TEXT_64);

-		stringBuffer.append(genEnum.getFormattedName());

 		stringBuffer.append(TEXT_65);

-		stringBuffer.append(genEnum.getName());

+		stringBuffer.append(genEnum.getFormattedName());

 		stringBuffer.append(TEXT_66);

-		stringBuffer.append(genModel.getImportedName("java.lang.String"));

+		stringBuffer.append(genEnum.getName());

 		stringBuffer.append(TEXT_67);

-		stringBuffer.append(genEnum.getName());

-		stringBuffer.append(TEXT_68);

-		stringBuffer.append(genEnum.getFormattedName());

-		stringBuffer.append(TEXT_69);

-		stringBuffer.append(genEnum.getName());

-		stringBuffer.append(TEXT_70);

 		stringBuffer.append(genModel.getImportedName("java.lang.String"));

-		stringBuffer.append(TEXT_71);

+		stringBuffer.append(TEXT_68);

 		stringBuffer.append(genEnum.getName());

-		stringBuffer.append(TEXT_72);

+		stringBuffer.append(TEXT_69);

 		stringBuffer.append(genEnum.getFormattedName());

-		stringBuffer.append(TEXT_73);

+		stringBuffer.append(TEXT_70);

 		stringBuffer.append(genEnum.getName());

+		stringBuffer.append(TEXT_71);

+		stringBuffer.append(genModel.getImportedName("java.lang.String"));

+		stringBuffer.append(TEXT_72);

+		stringBuffer.append(genEnum.getName());

+		stringBuffer.append(TEXT_73);

+		stringBuffer.append(genEnum.getFormattedName());

 		stringBuffer.append(TEXT_74);

+		stringBuffer.append(genEnum.getName());

+		stringBuffer.append(TEXT_75);

 		for (GenEnumLiteral genEnumLiteral : genEnum.getUniqueValuedGenEnumLiterals()) {

-			stringBuffer.append(TEXT_75);

-			stringBuffer.append(genEnumLiteral.getEnumLiteralValueConstantName());

 			stringBuffer.append(TEXT_76);

+			stringBuffer.append(genEnumLiteral.getEnumLiteralValueConstantName());

+			stringBuffer.append(TEXT_77);

 			stringBuffer.append(genEnumLiteral.getEnumLiteralInstanceConstantName());

-			stringBuffer.append(TEXT_36);

+			stringBuffer.append(TEXT_38);

 		}

-		stringBuffer.append(TEXT_77);

+		stringBuffer.append(TEXT_78);

 		if (isEnum) {

-			stringBuffer.append(TEXT_78);

-			stringBuffer.append(genModel.getImportedName("java.lang.String"));

 			stringBuffer.append(TEXT_79);

 			stringBuffer.append(genModel.getImportedName("java.lang.String"));

 			stringBuffer.append(TEXT_80);

+			stringBuffer.append(genModel.getImportedName("java.lang.String"));

+			stringBuffer.append(TEXT_81);

 		}

-		stringBuffer.append(TEXT_81);

-		stringBuffer.append(genEnum.getName());

 		stringBuffer.append(TEXT_82);

-		stringBuffer.append(genModel.getImportedName("java.lang.String"));

+		stringBuffer.append(genEnum.getName());

 		stringBuffer.append(TEXT_83);

 		stringBuffer.append(genModel.getImportedName("java.lang.String"));

 		stringBuffer.append(TEXT_84);

+		stringBuffer.append(genModel.getImportedName("java.lang.String"));

+		stringBuffer.append(TEXT_85);

 		if (isEnum) {

-			stringBuffer.append(TEXT_85);

-		} else {

 			stringBuffer.append(TEXT_86);

+		} else {

+			stringBuffer.append(TEXT_87);

 		}

-		stringBuffer.append(TEXT_87);

+		stringBuffer.append(TEXT_88);

 		if (isEnum) {

-			stringBuffer.append(TEXT_88);

-			stringBuffer.append(genModel.getImportedName("java.lang.String"));

 			stringBuffer.append(TEXT_89);

-			stringBuffer.append(genModel.getImportedName("java.lang.String"));

-			stringBuffer.append(TEXT_90);

-			if (genModel.useClassOverrideAnnotation()) {

-				stringBuffer.append(TEXT_91);

+			if (genModel.useInterfaceOverrideAnnotation()) {

+				stringBuffer.append(TEXT_90);

+			}

+			stringBuffer.append(TEXT_91);

+			if (genModel.useInterfaceOverrideAnnotation()) {

+				stringBuffer.append(TEXT_90);

 			}

 			stringBuffer.append(TEXT_92);

 			stringBuffer.append(genModel.getImportedName("java.lang.String"));

 			stringBuffer.append(TEXT_93);

+			if (genModel.useInterfaceOverrideAnnotation()) {

+				stringBuffer.append(TEXT_90);

+			}

+			stringBuffer.append(TEXT_92);

+			stringBuffer.append(genModel.getImportedName("java.lang.String"));

+			stringBuffer.append(TEXT_94);

+			if (genModel.useClassOverrideAnnotation()) {

+				stringBuffer.append(TEXT_90);

+			}

+			stringBuffer.append(TEXT_92);

+			stringBuffer.append(genModel.getImportedName("java.lang.String"));

+			stringBuffer.append(TEXT_95);

 		}

-		stringBuffer.append(TEXT_94);

+		stringBuffer.append(TEXT_96);

 		stringBuffer.append(genEnum.getName());

 		if (genModel.isSuppressEMFMetaData() && !genModel.isSuppressInterfaces()) {

-			stringBuffer.append(TEXT_37);

+			stringBuffer.append(TEXT_39);

 			if (isEnum) {

-				stringBuffer.append(TEXT_95);

-				stringBuffer.append(genEnum.getName());

-				stringBuffer.append(TEXT_96);

-			} else {

 				stringBuffer.append(TEXT_97);

 				stringBuffer.append(genEnum.getName());

 				stringBuffer.append(TEXT_98);

+			} else {

+				stringBuffer.append(TEXT_99);

 				stringBuffer.append(genEnum.getName());

-				stringBuffer.append(TEXT_82);

-				stringBuffer.append(genModel.getImportedName("java.lang.String"));

+				stringBuffer.append(TEXT_100);

+				stringBuffer.append(genEnum.getName());

 				stringBuffer.append(TEXT_83);

 				stringBuffer.append(genModel.getImportedName("java.lang.String"));

-				stringBuffer.append(TEXT_99);

+				stringBuffer.append(TEXT_84);

+				stringBuffer.append(genModel.getImportedName("java.lang.String"));

+				stringBuffer.append(TEXT_101);

 			}

 		}

 		genModel.emitSortedImports();

-		stringBuffer.append(TEXT_37);

+		stringBuffer.append(TEXT_39);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
index c5f7eb0..d21173b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryClass.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -286,16 +286,14 @@
 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL

 			+ "\t * @return the package supported by this factory." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";

 	protected final String TEXT_212 = " get";

-	protected final String TEXT_213 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

-			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";

-	protected final String TEXT_214 = "()" + NL + "\t{" + NL + "\t\treturn (";

-	protected final String TEXT_215 = ")getEPackage();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_213 = "()" + NL + "\t{" + NL + "\t\treturn (";

+	protected final String TEXT_214 = ")getEPackage();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @deprecated" + NL

 			+ "\t * @generated" + NL + "\t */";

-	protected final String TEXT_216 = " getPackage()" + NL + "\t{" + NL + "\t\treturn ";

-	protected final String TEXT_217 = ".eINSTANCE;" + NL + "\t}" + NL;

-	protected final String TEXT_218 = NL + "} //";

-	protected final String TEXT_219 = NL;

+	protected final String TEXT_215 = " getPackage()" + NL + "\t{" + NL + "\t\treturn ";

+	protected final String TEXT_216 = ".eINSTANCE;" + NL + "\t}" + NL;

+	protected final String TEXT_217 = NL + "} //";

+	protected final String TEXT_218 = NL;

 

 	public FactoryClass() {

 		//Here is the constructor

@@ -331,8 +329,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_219);

-		stringBuffer.append(TEXT_219);

+		stringBuffer.append(TEXT_218);

+		stringBuffer.append(TEXT_218);

 		return stringBuffer.toString();

 	}

 

@@ -405,9 +403,9 @@
 		/**

 		 * Copyright (c) 2002-2010 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

@@ -419,6 +417,8 @@
 		final boolean isJDK50 = genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50;

 		boolean isInterface = Boolean.TRUE.equals(((Object[]) argument)[1]);

 		boolean isImplementation = Boolean.TRUE.equals(((Object[]) argument)[2]);

+		boolean useInterfaceOverrideAnnotation = genModel.useInterfaceOverrideAnnotation()

+				&& !(isInterface && isImplementation);

 		String publicStaticFinalFlag = isImplementation ? "public static final " : "";

 		stringBuffer.append(TEXT_1);

 		{

@@ -480,9 +480,16 @@
 			stringBuffer.append(TEXT_10);

 		}

 		if (isImplementation) {

-			if (isJDK50 && GenModelUtil.hasAPIDeprecatedTag(genPackage.getGenClassifiers())

-					&& !genPackage.hasAPIDeprecatedTag()) {

-				stringBuffer.append(TEXT_11);

+			if (isJDK50 && !genPackage.hasAPIDeprecatedTag()) {

+				List<GenClassifier> genClassifiers = new ArrayList<GenClassifier>(genPackage.getGenClassifiers());

+				for (Iterator<GenClassifier> i = genClassifiers.iterator(); i.hasNext();) {

+					GenClassifier genClassifier = i.next();

+					if (genClassifier instanceof GenClass && ((GenClass) genClassifier).isAbstract())

+						i.remove();

+				}

+				if (GenModelUtil.hasAPIDeprecatedTag(genClassifiers)) {

+					stringBuffer.append(TEXT_11);

+				}

 			}

 			stringBuffer.append(TEXT_12);

 			stringBuffer.append(genPackage.getFactoryClassName());

@@ -636,6 +643,9 @@
 					if (isJDK50 && genClass.hasAPIDeprecatedTag()) {

 						stringBuffer.append(TEXT_61);

 					}

+					if (useInterfaceOverrideAnnotation && !genClass.isMapEntry()) {

+						stringBuffer.append(TEXT_38);

+					}

 					stringBuffer.append(TEXT_62);

 					stringBuffer.append(genClass.getTypeParameters());

 					stringBuffer.append(genClass.getImportedInterfaceName());

@@ -691,6 +701,9 @@
 						if (isJDK50 && genDataType.hasAPIDeprecatedTag()) {

 							stringBuffer.append(TEXT_61);

 						}

+						if (genPackage.isDataTypeConverters() && useInterfaceOverrideAnnotation) {

+							stringBuffer.append(TEXT_38);

+						}

 						stringBuffer.append(TEXT_62);

 						stringBuffer.append(genDataType.getImportedParameterizedInstanceClassName());

 						stringBuffer.append(TEXT_63);

@@ -1136,6 +1149,9 @@
 						if (isJDK50 && genDataType.hasAPIDeprecatedTag()) {

 							stringBuffer.append(TEXT_61);

 						}

+						if (genPackage.isDataTypeConverters() && useInterfaceOverrideAnnotation) {

+							stringBuffer.append(TEXT_38);

+						}

 						stringBuffer.append(TEXT_151);

 						stringBuffer.append(genDataType.getName());

 						stringBuffer.append(TEXT_76);

@@ -1641,23 +1657,27 @@
 			stringBuffer.append(genPackage.getBasicPackageName());

 			stringBuffer.append(TEXT_204);

 		} else if (isImplementation) {

-			stringBuffer.append(TEXT_213);

+			stringBuffer.append(TEXT_47);

+			if (useInterfaceOverrideAnnotation && !genModel.isSuppressEMFMetaData()) {

+				stringBuffer.append(TEXT_38);

+			}

+			stringBuffer.append(TEXT_62);

 			stringBuffer.append(genPackage.getImportedPackageInterfaceName());

 			stringBuffer.append(TEXT_212);

 			stringBuffer.append(genPackage.getBasicPackageName());

-			stringBuffer.append(TEXT_214);

+			stringBuffer.append(TEXT_213);

 			stringBuffer.append(genPackage.getImportedPackageInterfaceName());

-			stringBuffer.append(TEXT_215);

+			stringBuffer.append(TEXT_214);

 			if (genModel.useClassOverrideAnnotation()) {

 				stringBuffer.append(TEXT_61);

 			}

 			stringBuffer.append(TEXT_26);

 			stringBuffer.append(genPackage.getImportedPackageInterfaceName());

-			stringBuffer.append(TEXT_216);

+			stringBuffer.append(TEXT_215);

 			stringBuffer.append(genPackage.getImportedPackageInterfaceName());

-			stringBuffer.append(TEXT_217);

+			stringBuffer.append(TEXT_216);

 		}

-		stringBuffer.append(TEXT_218);

+		stringBuffer.append(TEXT_217);

 		stringBuffer.append(isInterface ? genPackage.getFactoryInterfaceName() : genPackage.getFactoryClassName());

 		genModel.emitSortedImports();

 		stringBuffer.append(TEXT_4);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
index 60d83c1..6fab6cf 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/FactoryInterface.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -286,16 +286,14 @@
 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL

 			+ "\t * @return the package supported by this factory." + NL + "\t * @generated" + NL + "\t */" + NL + "\t";

 	protected final String TEXT_212 = " get";

-	protected final String TEXT_213 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

-			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";

-	protected final String TEXT_214 = "()" + NL + "\t{" + NL + "\t\treturn (";

-	protected final String TEXT_215 = ")getEPackage();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_213 = "()" + NL + "\t{" + NL + "\t\treturn (";

+	protected final String TEXT_214 = ")getEPackage();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @deprecated" + NL

 			+ "\t * @generated" + NL + "\t */";

-	protected final String TEXT_216 = " getPackage()" + NL + "\t{" + NL + "\t\treturn ";

-	protected final String TEXT_217 = ".eINSTANCE;" + NL + "\t}" + NL;

-	protected final String TEXT_218 = NL + "} //";

-	protected final String TEXT_219 = NL;

+	protected final String TEXT_215 = " getPackage()" + NL + "\t{" + NL + "\t\treturn ";

+	protected final String TEXT_216 = ".eINSTANCE;" + NL + "\t}" + NL;

+	protected final String TEXT_217 = NL + "} //";

+	protected final String TEXT_218 = NL;

 

 	public FactoryInterface() {

 		//Here is the constructor

@@ -331,8 +329,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_219);

-		stringBuffer.append(TEXT_219);

+		stringBuffer.append(TEXT_218);

+		stringBuffer.append(TEXT_218);

 		return stringBuffer.toString();

 	}

 

@@ -404,9 +402,9 @@
 		/**

 		 * Copyright (c) 2002-2010 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

@@ -418,6 +416,8 @@
 		final boolean isJDK50 = genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50;

 		boolean isInterface = Boolean.TRUE.equals(((Object[]) argument)[1]);

 		boolean isImplementation = Boolean.TRUE.equals(((Object[]) argument)[2]);

+		boolean useInterfaceOverrideAnnotation = genModel.useInterfaceOverrideAnnotation()

+				&& !(isInterface && isImplementation);

 		String publicStaticFinalFlag = isImplementation ? "public static final " : "";

 		stringBuffer.append(TEXT_1);

 		{

@@ -479,9 +479,16 @@
 			stringBuffer.append(TEXT_10);

 		}

 		if (isImplementation) {

-			if (isJDK50 && GenModelUtil.hasAPIDeprecatedTag(genPackage.getGenClassifiers())

-					&& !genPackage.hasAPIDeprecatedTag()) {

-				stringBuffer.append(TEXT_11);

+			if (isJDK50 && !genPackage.hasAPIDeprecatedTag()) {

+				List<GenClassifier> genClassifiers = new ArrayList<GenClassifier>(genPackage.getGenClassifiers());

+				for (Iterator<GenClassifier> i = genClassifiers.iterator(); i.hasNext();) {

+					GenClassifier genClassifier = i.next();

+					if (genClassifier instanceof GenClass && ((GenClass) genClassifier).isAbstract())

+						i.remove();

+				}

+				if (GenModelUtil.hasAPIDeprecatedTag(genClassifiers)) {

+					stringBuffer.append(TEXT_11);

+				}

 			}

 			stringBuffer.append(TEXT_12);

 			stringBuffer.append(genPackage.getFactoryClassName());

@@ -635,6 +642,9 @@
 					if (isJDK50 && genClass.hasAPIDeprecatedTag()) {

 						stringBuffer.append(TEXT_61);

 					}

+					if (useInterfaceOverrideAnnotation && !genClass.isMapEntry()) {

+						stringBuffer.append(TEXT_38);

+					}

 					stringBuffer.append(TEXT_62);

 					stringBuffer.append(genClass.getTypeParameters());

 					stringBuffer.append(genClass.getImportedInterfaceName());

@@ -690,6 +700,9 @@
 						if (isJDK50 && genDataType.hasAPIDeprecatedTag()) {

 							stringBuffer.append(TEXT_61);

 						}

+						if (genPackage.isDataTypeConverters() && useInterfaceOverrideAnnotation) {

+							stringBuffer.append(TEXT_38);

+						}

 						stringBuffer.append(TEXT_62);

 						stringBuffer.append(genDataType.getImportedParameterizedInstanceClassName());

 						stringBuffer.append(TEXT_63);

@@ -1135,6 +1148,9 @@
 						if (isJDK50 && genDataType.hasAPIDeprecatedTag()) {

 							stringBuffer.append(TEXT_61);

 						}

+						if (genPackage.isDataTypeConverters() && useInterfaceOverrideAnnotation) {

+							stringBuffer.append(TEXT_38);

+						}

 						stringBuffer.append(TEXT_151);

 						stringBuffer.append(genDataType.getName());

 						stringBuffer.append(TEXT_76);

@@ -1640,23 +1656,27 @@
 			stringBuffer.append(genPackage.getBasicPackageName());

 			stringBuffer.append(TEXT_204);

 		} else if (isImplementation) {

-			stringBuffer.append(TEXT_213);

+			stringBuffer.append(TEXT_47);

+			if (useInterfaceOverrideAnnotation && !genModel.isSuppressEMFMetaData()) {

+				stringBuffer.append(TEXT_38);

+			}

+			stringBuffer.append(TEXT_62);

 			stringBuffer.append(genPackage.getImportedPackageInterfaceName());

 			stringBuffer.append(TEXT_212);

 			stringBuffer.append(genPackage.getBasicPackageName());

-			stringBuffer.append(TEXT_214);

+			stringBuffer.append(TEXT_213);

 			stringBuffer.append(genPackage.getImportedPackageInterfaceName());

-			stringBuffer.append(TEXT_215);

+			stringBuffer.append(TEXT_214);

 			if (genModel.useClassOverrideAnnotation()) {

 				stringBuffer.append(TEXT_61);

 			}

 			stringBuffer.append(TEXT_26);

 			stringBuffer.append(genPackage.getImportedPackageInterfaceName());

-			stringBuffer.append(TEXT_216);

+			stringBuffer.append(TEXT_215);

 			stringBuffer.append(genPackage.getImportedPackageInterfaceName());

-			stringBuffer.append(TEXT_217);

+			stringBuffer.append(TEXT_216);

 		}

-		stringBuffer.append(TEXT_218);

+		stringBuffer.append(TEXT_217);

 		stringBuffer.append(isInterface ? genPackage.getFactoryInterfaceName() : genPackage.getFactoryClassName());

 		genModel.emitSortedImports();

 		stringBuffer.append(TEXT_4);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
index 8def4cb..498db88 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Interface.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -108,7 +108,7 @@
 	protected final String TEXT_58 = "public";

 	protected final String TEXT_59 = "protected";

 	protected final String TEXT_60 = " ";

-	protected final String TEXT_61 = "()" + NL + "\t{" + NL + "\t\tsuper();";

+	protected final String TEXT_61 = "()" + NL + "\t{";

 	protected final String TEXT_62 = NL + "\t\t";

 	protected final String TEXT_63 = " |= ";

 	protected final String TEXT_64 = "_EFLAG";

@@ -151,10 +151,10 @@
 	protected final String TEXT_98 = "();";

 	protected final String TEXT_99 = NL + "\t\t\t\tif (";

 	protected final String TEXT_100 = " != null)";

-	protected final String TEXT_101 = NL + "\t\t\t\t\tmsgs = ((";

-	protected final String TEXT_102 = ").eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

+	protected final String TEXT_101 = NL + "\t\t\t\t\tmsgs = ";

+	protected final String TEXT_102 = ".eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

 	protected final String TEXT_103 = ", null, msgs);";

-	protected final String TEXT_104 = ").eInverseRemove(this, ";

+	protected final String TEXT_104 = ".eInverseRemove(this, ";

 	protected final String TEXT_105 = ", ";

 	protected final String TEXT_106 = ".class, msgs);";

 	protected final String TEXT_107 = NL + "\t\t}";

@@ -309,51 +309,51 @@
 	protected final String TEXT_240 = NL + "\t\tresult.append(')');" + NL + "\t\treturn result.toString();" + NL + "\t}"

 			+ NL;

 	protected final String TEXT_241 = 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\t";

-	protected final String TEXT_242 = " 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 ";

-	protected final String TEXT_243 = " getKey()" + NL + "\t{";

-	protected final String TEXT_244 = NL + "\t\treturn new ";

-	protected final String TEXT_245 = "(getTypedKey());";

-	protected final String TEXT_246 = NL + "\t\treturn getTypedKey();";

-	protected final String TEXT_247 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

-			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setKey(";

-	protected final String TEXT_248 = " key)" + NL + "\t{";

-	protected final String TEXT_249 = NL + "\t\tgetTypedKey().addAll(";

-	protected final String TEXT_250 = "key);";

-	protected final String TEXT_251 = NL + "\t\tsetTypedKey(key);";

-	protected final String TEXT_252 = NL + "\t\tsetTypedKey(((";

-	protected final String TEXT_253 = ")key).";

-	protected final String TEXT_254 = NL + "\t\tsetTypedKey((";

-	protected final String TEXT_255 = ")key);";

-	protected final String TEXT_256 = 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_257 = " getValue()" + NL + "\t{";

-	protected final String TEXT_258 = "(getTypedValue());";

-	protected final String TEXT_259 = NL + "\t\treturn getTypedValue();";

-	protected final String TEXT_260 = " setValue(";

-	protected final String TEXT_261 = " value)" + NL + "\t{" + NL + "\t\t";

-	protected final String TEXT_262 = " oldValue = getValue();";

-	protected final String TEXT_263 = NL + "\t\tgetTypedValue().clear();" + NL + "\t\tgetTypedValue().addAll(";

-	protected final String TEXT_264 = "value);";

-	protected final String TEXT_265 = NL + "\t\tsetTypedValue(value);";

-	protected final String TEXT_266 = NL + "\t\tsetTypedValue(((";

-	protected final String TEXT_267 = ")value).";

-	protected final String TEXT_268 = NL + "\t\tsetTypedValue((";

-	protected final String TEXT_269 = ")value);";

-	protected final String TEXT_270 = NL + "\t\treturn oldValue;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_271 = " getEMap()" + NL + "\t{" + NL + "\t\t";

-	protected final String TEXT_272 = " container = eContainer();" + NL + "\t\treturn container == null ? null : (";

-	protected final String TEXT_273 = ")container.eGet(eContainmentFeature());" + NL + "\t}" + NL;

-	protected final String TEXT_274 = NL + "} //";

-	protected final String TEXT_275 = NL;

+	protected final String TEXT_242 = NL + "\tpublic int getHash()" + NL + "\t{" + NL + "\t\tif (hash == -1)" + NL

+			+ "\t\t{" + NL + "\t\t\t";

+	protected final String TEXT_243 = " 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 */";

+	protected final String TEXT_244 = 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 */";

+	protected final String TEXT_245 = " getKey()" + NL + "\t{";

+	protected final String TEXT_246 = NL + "\t\treturn new ";

+	protected final String TEXT_247 = "(getTypedKey());";

+	protected final String TEXT_248 = NL + "\t\treturn getTypedKey();";

+	protected final String TEXT_249 = NL + "\tpublic void setKey(";

+	protected final String TEXT_250 = " key)" + NL + "\t{";

+	protected final String TEXT_251 = NL + "\t\tgetTypedKey().addAll(";

+	protected final String TEXT_252 = "key);";

+	protected final String TEXT_253 = NL + "\t\tsetTypedKey(key);";

+	protected final String TEXT_254 = NL + "\t\tsetTypedKey(((";

+	protected final String TEXT_255 = ")key).";

+	protected final String TEXT_256 = NL + "\t\tsetTypedKey((";

+	protected final String TEXT_257 = ")key);";

+	protected final String TEXT_258 = " getValue()" + NL + "\t{";

+	protected final String TEXT_259 = "(getTypedValue());";

+	protected final String TEXT_260 = NL + "\t\treturn getTypedValue();";

+	protected final String TEXT_261 = " setValue(";

+	protected final String TEXT_262 = " value)" + NL + "\t{" + NL + "\t\t";

+	protected final String TEXT_263 = " oldValue = getValue();";

+	protected final String TEXT_264 = NL + "\t\tgetTypedValue().clear();" + NL + "\t\tgetTypedValue().addAll(";

+	protected final String TEXT_265 = "value);";

+	protected final String TEXT_266 = NL + "\t\tsetTypedValue(value);";

+	protected final String TEXT_267 = NL + "\t\tsetTypedValue(((";

+	protected final String TEXT_268 = ")value).";

+	protected final String TEXT_269 = NL + "\t\tsetTypedValue((";

+	protected final String TEXT_270 = ")value);";

+	protected final String TEXT_271 = NL + "\t\treturn oldValue;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

+			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

+			+ "\t */";

+	protected final String TEXT_272 = " getEMap()" + NL + "\t{" + NL + "\t\t";

+	protected final String TEXT_273 = " container = eContainer();" + NL + "\t\treturn container == null ? null : (";

+	protected final String TEXT_274 = ")container.eGet(eContainmentFeature());" + NL + "\t}" + NL;

+	protected final String TEXT_275 = NL + "} //";

+	protected final String TEXT_276 = NL;

 

 	public Interface() {

 		//Here is the constructor

@@ -389,8 +389,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_275);

-		stringBuffer.append(TEXT_275);

+		stringBuffer.append(TEXT_276);

+		stringBuffer.append(TEXT_276);

 		return stringBuffer.toString();

 	}

 

@@ -462,9 +462,9 @@
 		/**

 		 * Copyright (c) 2002-2011 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

@@ -476,6 +476,8 @@
 		final boolean isJDK50 = genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50;

 		final boolean isInterface = Boolean.TRUE.equals(((Object[]) argument)[1]);

 		final boolean isImplementation = Boolean.TRUE.equals(((Object[]) argument)[2]);

+		final boolean useInterfaceOverrideAnnotation = genModel.useInterfaceOverrideAnnotation()

+				&& !(isInterface && isImplementation);

 		final boolean isGWT = genModel.getRuntimePlatform() == GenRuntimePlatform.GWT;

 		final String publicStaticFinalFlag = isImplementation ? "public static final " : "";

 		final String singleWildcard = isJDK50 ? "<?>" : "";

@@ -525,7 +527,7 @@
 		if (isInterface) {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.interface.javadoc.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.interface.javadoc.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -538,6 +540,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -711,7 +714,7 @@
 			for (GenFeature genFeature : genClass.getDeclaredFieldGenFeatures()) {

 				stringBuffer.append(TEXT_4);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.declaredFieldGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.declaredFieldGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -725,6 +728,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -797,6 +801,35 @@
 			stringBuffer.append(TEXT_60);

 			stringBuffer.append(genClass.getClassName());

 			stringBuffer.append(TEXT_61);

+			stringBuffer.append(TEXT_4);

+			{

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.egfCustom.constructor.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+

+				InternalPatternContext ictx = (InternalPatternContext) ctx;

+				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

+				stringBuffer.setLength(0);

+

+				final Map<String, Object> callParameters = new HashMap<String, Object>();

+				callParameters.put("genClass", genClass);

+				callParameters.put("genPackage", genPackage);

+				callParameters.put("genModel", genModel);

+				callParameters.put("isJDK50", isJDK50);

+				callParameters.put("isInterface", isInterface);

+				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

+				callParameters.put("isGWT", isGWT);

+				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

+				callParameters.put("singleWildcard", singleWildcard);

+				callParameters.put("negativeOffsetCorrection", negativeOffsetCorrection);

+				callParameters.put("positiveOffsetCorrection", positiveOffsetCorrection);

+				callParameters.put("negativeOperationOffsetCorrection", negativeOperationOffsetCorrection);

+				callParameters.put("positiveOperationOffsetCorrection", positiveOperationOffsetCorrection);

+				CallHelper.executeWithParameterInjection(

+						"platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#_K9da0HroEeC0XN9kbwkPYQ",

+						new ExecutionContext((InternalPatternContext) ctx), callParameters);

+				stringBuffer.setLength(0);

+			}

+

 			for (GenFeature genFeature : genClass.getFlagGenFeaturesWithDefault()) {

 				stringBuffer.append(TEXT_62);

 				stringBuffer.append(genClass.getFlagsField(genFeature));

@@ -818,9 +851,40 @@
 			stringBuffer.append(genClass.getQualifiedClassifierAccessor());

 			stringBuffer.append(TEXT_70);

 		}

+		if (isImplementation && genModel.isDynamicDelegation()) {

+			stringBuffer.append(TEXT_4);

+			{

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.dynamicDelegation" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+

+				InternalPatternContext ictx = (InternalPatternContext) ctx;

+				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

+				stringBuffer.setLength(0);

+

+				final Map<String, Object> callParameters = new HashMap<String, Object>();

+				callParameters.put("genClass", genClass);

+				callParameters.put("genPackage", genPackage);

+				callParameters.put("genModel", genModel);

+				callParameters.put("isJDK50", isJDK50);

+				callParameters.put("isInterface", isInterface);

+				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

+				callParameters.put("isGWT", isGWT);

+				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

+				callParameters.put("singleWildcard", singleWildcard);

+				callParameters.put("negativeOffsetCorrection", negativeOffsetCorrection);

+				callParameters.put("positiveOffsetCorrection", positiveOffsetCorrection);

+				callParameters.put("negativeOperationOffsetCorrection", negativeOperationOffsetCorrection);

+				callParameters.put("positiveOperationOffsetCorrection", positiveOperationOffsetCorrection);

+				CallHelper.executeWithParameterInjection(

+						"platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#_cAErkCSWEemxeP6B0lLOpA",

+						new ExecutionContext((InternalPatternContext) ctx), callParameters);

+				stringBuffer.setLength(0);

+			}

+

+		}

 		stringBuffer.append(TEXT_4);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.reflectiveDelegation.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.reflectiveDelegation.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -833,6 +897,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

@@ -857,7 +922,7 @@
 					for (GenFeature genFeature : genClass.getReifiedGenFeatures()) {

 						stringBuffer.append(TEXT_4);

 						{

-							//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeatureReified.override" args="genFeature:genFeature,classExtendsGenClass:classExtendsGenClass,classExtendsAllGenFeatures:classExtendsAllGenFeatures,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+							//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeatureReified.override" args="genFeature:genFeature,classExtendsGenClass:classExtendsGenClass,classExtendsAllGenFeatures:classExtendsAllGenFeatures,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 							InternalPatternContext ictx = (InternalPatternContext) ctx;

 							new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -873,6 +938,7 @@
 							callParameters.put("isJDK50", isJDK50);

 							callParameters.put("isInterface", isInterface);

 							callParameters.put("isImplementation", isImplementation);

+							callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 							callParameters.put("isGWT", isGWT);

 							callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 							callParameters.put("singleWildcard", singleWildcard);

@@ -897,7 +963,7 @@
 						: genClass.getDeclaredGenFeatures())) {

 					stringBuffer.append(TEXT_4);

 					{

-						//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+						//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 						InternalPatternContext ictx = (InternalPatternContext) ctx;

 						new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -911,6 +977,7 @@
 						callParameters.put("isJDK50", isJDK50);

 						callParameters.put("isInterface", isInterface);

 						callParameters.put("isImplementation", isImplementation);

+						callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 						callParameters.put("isGWT", isGWT);

 						callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 						callParameters.put("singleWildcard", singleWildcard);

@@ -932,7 +999,7 @@
 				: genClass.getDeclaredGenOperations())) {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -946,6 +1013,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -1056,9 +1124,7 @@
 					stringBuffer.append(TEXT_100);

 					if (genFeature.isEffectiveContains()) {

 						stringBuffer.append(TEXT_101);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-						stringBuffer.append(TEXT_83);

-						stringBuffer.append(genFeature.getSafeName());

+						stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), true));

 						stringBuffer.append(TEXT_102);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(negativeOffsetCorrection);

@@ -1070,9 +1136,7 @@
 								? " + " + genClass.getOffsetCorrectionField(genFeature)

 								: "";

 						stringBuffer.append(TEXT_101);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-						stringBuffer.append(TEXT_83);

-						stringBuffer.append(genFeature.getSafeName());

+						stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), true));

 						stringBuffer.append(TEXT_104);

 						stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

 						stringBuffer.append(reverseOffsetCorrection);

@@ -1388,7 +1452,7 @@
 				&& genClass.implementsAny(genClass.getEUnsetGenFeatures())) {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.eUnset.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.eUnset.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -1401,6 +1465,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -1420,7 +1485,7 @@
 				&& genClass.implementsAny(genClass.getEIsSetGenFeatures())) {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.eIsSet.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.eIsSet.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -1433,6 +1498,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -1939,94 +2005,118 @@
 				stringBuffer.append(genModel.getImportedName("com.google.gwt.user.client.rpc.GwtTransient"));

 			}

 			stringBuffer.append(TEXT_241);

-			stringBuffer.append(objectType);

-			stringBuffer.append(TEXT_242);

-			stringBuffer.append(keyType);

-			stringBuffer.append(TEXT_243);

-			if (!isJDK50 && keyFeature.isPrimitiveType()) {

-				stringBuffer.append(TEXT_244);

-				stringBuffer.append(keyFeature.getObjectType(genClass));

-				stringBuffer.append(TEXT_245);

-			} else {

-				stringBuffer.append(TEXT_246);

+			if (useInterfaceOverrideAnnotation) {

+				stringBuffer.append(TEXT_67);

 			}

-			stringBuffer.append(TEXT_247);

+			stringBuffer.append(TEXT_242);

+			stringBuffer.append(objectType);

+			stringBuffer.append(TEXT_243);

+			if (useInterfaceOverrideAnnotation) {

+				stringBuffer.append(TEXT_67);

+			}

+			stringBuffer.append(TEXT_244);

+			if (useInterfaceOverrideAnnotation) {

+				stringBuffer.append(TEXT_67);

+			}

+			stringBuffer.append(TEXT_73);

 			stringBuffer.append(keyType);

-			stringBuffer.append(TEXT_248);

+			stringBuffer.append(TEXT_245);

+			if (!isJDK50 && keyFeature.isPrimitiveType()) {

+				stringBuffer.append(TEXT_246);

+				stringBuffer.append(keyFeature.getObjectType(genClass));

+				stringBuffer.append(TEXT_247);

+			} else {

+				stringBuffer.append(TEXT_248);

+			}

+			stringBuffer.append(TEXT_66);

+			if (useInterfaceOverrideAnnotation) {

+				stringBuffer.append(TEXT_67);

+			}

+			stringBuffer.append(TEXT_249);

+			stringBuffer.append(keyType);

+			stringBuffer.append(TEXT_250);

 			if (keyFeature.isListType()) {

-				stringBuffer.append(TEXT_249);

+				stringBuffer.append(TEXT_251);

 				if (!genModel.useGenerics()) {

 					stringBuffer.append(TEXT_81);

 					stringBuffer.append(genModel.getImportedName("java.util.Collection"));

 					stringBuffer.append(TEXT_83);

 				}

-				stringBuffer.append(TEXT_250);

-			} else if (isJDK50) {

-				stringBuffer.append(TEXT_251);

-			} else if (keyFeature.isPrimitiveType()) {

 				stringBuffer.append(TEXT_252);

-				stringBuffer.append(keyFeature.getObjectType(genClass));

+			} else if (isJDK50) {

 				stringBuffer.append(TEXT_253);

+			} else if (keyFeature.isPrimitiveType()) {

+				stringBuffer.append(TEXT_254);

+				stringBuffer.append(keyFeature.getObjectType(genClass));

+				stringBuffer.append(TEXT_255);

 				stringBuffer.append(keyFeature.getPrimitiveValueFunction());

 				stringBuffer.append(TEXT_132);

 			} else {

-				stringBuffer.append(TEXT_254);

+				stringBuffer.append(TEXT_256);

 				stringBuffer.append(keyFeature.getImportedType(genClass));

-				stringBuffer.append(TEXT_255);

+				stringBuffer.append(TEXT_257);

 			}

-			stringBuffer.append(TEXT_256);

+			stringBuffer.append(TEXT_66);

+			if (useInterfaceOverrideAnnotation) {

+				stringBuffer.append(TEXT_67);

+			}

+			stringBuffer.append(TEXT_73);

 			stringBuffer.append(valueType);

-			stringBuffer.append(TEXT_257);

+			stringBuffer.append(TEXT_258);

 			if (!isJDK50 && valueFeature.isPrimitiveType()) {

-				stringBuffer.append(TEXT_244);

+				stringBuffer.append(TEXT_246);

 				stringBuffer.append(valueFeature.getObjectType(genClass));

-				stringBuffer.append(TEXT_258);

-			} else {

 				stringBuffer.append(TEXT_259);

+			} else {

+				stringBuffer.append(TEXT_260);

 			}

-			stringBuffer.append(TEXT_256);

-			stringBuffer.append(valueType);

-			stringBuffer.append(TEXT_260);

+			stringBuffer.append(TEXT_66);

+			if (useInterfaceOverrideAnnotation) {

+				stringBuffer.append(TEXT_67);

+			}

+			stringBuffer.append(TEXT_73);

 			stringBuffer.append(valueType);

 			stringBuffer.append(TEXT_261);

 			stringBuffer.append(valueType);

 			stringBuffer.append(TEXT_262);

+			stringBuffer.append(valueType);

+			stringBuffer.append(TEXT_263);

 			if (valueFeature.isListType()) {

-				stringBuffer.append(TEXT_263);

+				stringBuffer.append(TEXT_264);

 				if (!genModel.useGenerics()) {

 					stringBuffer.append(TEXT_81);

 					stringBuffer.append(genModel.getImportedName("java.util.Collection"));

 					stringBuffer.append(TEXT_83);

 				}

-				stringBuffer.append(TEXT_264);

-			} else if (isJDK50) {

 				stringBuffer.append(TEXT_265);

-			} else if (valueFeature.isPrimitiveType()) {

+			} else if (isJDK50) {

 				stringBuffer.append(TEXT_266);

-				stringBuffer.append(valueFeature.getObjectType(genClass));

+			} else if (valueFeature.isPrimitiveType()) {

 				stringBuffer.append(TEXT_267);

+				stringBuffer.append(valueFeature.getObjectType(genClass));

+				stringBuffer.append(TEXT_268);

 				stringBuffer.append(valueFeature.getPrimitiveValueFunction());

 				stringBuffer.append(TEXT_132);

 			} else {

-				stringBuffer.append(TEXT_268);

-				stringBuffer.append(valueFeature.getImportedType(genClass));

 				stringBuffer.append(TEXT_269);

+				stringBuffer.append(valueFeature.getImportedType(genClass));

+				stringBuffer.append(TEXT_270);

 			}

-			stringBuffer.append(TEXT_270);

+			stringBuffer.append(TEXT_271);

 			if (genModel.useGenerics()) {

 				stringBuffer.append(TEXT_72);

 			}

 			stringBuffer.append(TEXT_73);

 			stringBuffer.append(eMapType);

-			stringBuffer.append(TEXT_271);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EObject"));

 			stringBuffer.append(TEXT_272);

-			stringBuffer.append(eMapType);

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EObject"));

 			stringBuffer.append(TEXT_273);

+			stringBuffer.append(eMapType);

+			stringBuffer.append(TEXT_274);

 		}

 		stringBuffer.append(TEXT_4);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.insert" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.insert" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -2039,6 +2129,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

@@ -2052,7 +2143,7 @@
 			stringBuffer.setLength(0);

 		}

 

-		stringBuffer.append(TEXT_274);

+		stringBuffer.append(TEXT_275);

 		stringBuffer.append(isInterface ? " " + genClass.getInterfaceName() : genClass.getClassName());

 		// TODO fix the space above

 		genModel.emitSortedImports();

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
index 3153989..4cc849f 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ManifestMF.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -27,31 +27,33 @@
 	}

 

 	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

-	protected final String TEXT_1 = "Manifest-Version: 1.0" + NL + "Bundle-ManifestVersion: 2" + NL

-			+ "Bundle-Name: %pluginName" + NL + "Bundle-SymbolicName: ";

-	protected final String TEXT_2 = ";singleton:=true" + NL + "Bundle-Version: 1.0.0.qualifier" + NL

-			+ "Bundle-ClassPath: ";

-	protected final String TEXT_3 = ".jar";

-	protected final String TEXT_4 = ".";

-	protected final String TEXT_5 = NL + "Bundle-Activator: ";

-	protected final String TEXT_6 = "$Implementation";

-	protected final String TEXT_7 = "$Activator";

-	protected final String TEXT_8 = NL + "Bundle-Vendor: %providerName" + NL + "Bundle-Localization: plugin";

-	protected final String TEXT_9 = NL + "Bundle-RequiredExecutionEnvironment: J2SE-1.5";

-	protected final String TEXT_10 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.6";

-	protected final String TEXT_11 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.7";

-	protected final String TEXT_12 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.8";

-	protected final String TEXT_13 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-9";

-	protected final String TEXT_14 = NL + "Export-Package: ";

-	protected final String TEXT_15 = ",";

-	protected final String TEXT_16 = NL + " ";

-	protected final String TEXT_17 = NL + "Require-Bundle: ";

-	protected final String TEXT_18 = ";resolution:=optional;x-installation:=greedy";

-	protected final String TEXT_19 = ";visibility:=reexport";

-	protected final String TEXT_20 = NL + "Import-Package: org.osgi.framework";

-	protected final String TEXT_21 = NL + "Eclipse-LazyStart: true";

-	protected final String TEXT_22 = NL + "Bundle-ActivationPolicy: lazy" + NL;

-	protected final String TEXT_23 = NL;

+	protected final String TEXT_1 = "Manifest-Version: 1.0" + NL + "Bundle-ManifestVersion: 2" + NL + "Bundle-Name: ";

+	protected final String TEXT_2 = NL + "Bundle-SymbolicName: ";

+	protected final String TEXT_3 = ";singleton:=true" + NL + "Automatic-Module-Name: ";

+	protected final String TEXT_4 = NL + "Bundle-Version: 1.0.0.qualifier" + NL + "Bundle-ClassPath: ";

+	protected final String TEXT_5 = ".jar";

+	protected final String TEXT_6 = ".";

+	protected final String TEXT_7 = NL + "Bundle-Activator: ";

+	protected final String TEXT_8 = "$Implementation";

+	protected final String TEXT_9 = "$Activator";

+	protected final String TEXT_10 = NL + "Bundle-Vendor: ";

+	protected final String TEXT_11 = NL + "Bundle-Localization: ";

+	protected final String TEXT_12 = NL + "Bundle-RequiredExecutionEnvironment: J2SE-1.5";

+	protected final String TEXT_13 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.6";

+	protected final String TEXT_14 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.7";

+	protected final String TEXT_15 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.8";

+	protected final String TEXT_16 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-9";

+	protected final String TEXT_17 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-10";

+	protected final String TEXT_18 = NL + "Export-Package: ";

+	protected final String TEXT_19 = ",";

+	protected final String TEXT_20 = NL + " ";

+	protected final String TEXT_21 = NL + "Require-Bundle: ";

+	protected final String TEXT_22 = ";resolution:=optional;x-installation:=greedy";

+	protected final String TEXT_23 = ";visibility:=reexport";

+	protected final String TEXT_24 = NL + "Import-Package: org.osgi.framework";

+	protected final String TEXT_25 = NL + "Eclipse-LazyStart: true";

+	protected final String TEXT_26 = NL + "Bundle-ActivationPolicy: lazy" + NL;

+	protected final String TEXT_27 = NL;

 

 	public ManifestMF() {

 		//Here is the constructor

@@ -87,8 +89,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_23);

-		stringBuffer.append(TEXT_23);

+		stringBuffer.append(TEXT_27);

+		stringBuffer.append(TEXT_27);

 		return stringBuffer.toString();

 	}

 

@@ -160,9 +162,9 @@
 		/**

 		 * Copyright (c) 2005-2007 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

@@ -170,81 +172,90 @@
 

 		GenModel genModel = (GenModel) argument;

 		stringBuffer.append(TEXT_1);

-		stringBuffer.append(genModel.getModelPluginID());

+		stringBuffer.append(genModel.getModelBundleNameKey());

 		stringBuffer.append(TEXT_2);

+		stringBuffer.append(genModel.getModelPluginID());

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(genModel.getModelPluginID());

+		stringBuffer.append(TEXT_4);

 		if (genModel.isRuntimeJar()) {

 			stringBuffer.append(genModel.getModelPluginID());

-			stringBuffer.append(TEXT_3);

+			stringBuffer.append(TEXT_5);

 		} else {

-			stringBuffer.append(TEXT_4);

+			stringBuffer.append(TEXT_6);

 		}

 		if (genModel.hasModelPluginClass()) {

-			stringBuffer.append(TEXT_5);

+			stringBuffer.append(TEXT_7);

 			stringBuffer.append(genModel.getQualifiedModelPluginClassName());

-			stringBuffer.append(TEXT_6);

+			stringBuffer.append(TEXT_8);

 			if (genModel.isOSGiCompatible()) {

-				stringBuffer.append(TEXT_7);

+				stringBuffer.append(TEXT_9);

 			}

 		}

-		stringBuffer.append(TEXT_8);

+		stringBuffer.append(TEXT_10);

+		stringBuffer.append(genModel.getModelBundleVendorKey());

+		stringBuffer.append(TEXT_11);

+		stringBuffer.append(genModel.getModelBundleLocalization());

 		if (genModel.getComplianceLevel() == GenJDKLevel.JDK50_LITERAL) {

-			stringBuffer.append(TEXT_9);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK60_LITERAL) {

-			stringBuffer.append(TEXT_10);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK70_LITERAL) {

-			stringBuffer.append(TEXT_11);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK80_LITERAL) {

 			stringBuffer.append(TEXT_12);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK90_LITERAL) {

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK60_LITERAL) {

 			stringBuffer.append(TEXT_13);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK70_LITERAL) {

+			stringBuffer.append(TEXT_14);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK80_LITERAL) {

+			stringBuffer.append(TEXT_15);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK90_LITERAL) {

+			stringBuffer.append(TEXT_16);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK100_LITERAL) {

+			stringBuffer.append(TEXT_17);

 		}

 		Iterator<String> packagesIterator = genModel.getModelQualifiedPackageNames().iterator();

 		if (packagesIterator.hasNext()) {

 			String pack = packagesIterator.next();

-			stringBuffer.append(TEXT_14);

+			stringBuffer.append(TEXT_18);

 			stringBuffer.append(pack);

 			while (packagesIterator.hasNext()) {

 				pack = packagesIterator.next();

-				stringBuffer.append(TEXT_15);

-				stringBuffer.append(TEXT_16);

+				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_20);

 				stringBuffer.append(pack);

 			}

 		}

 		Iterator<String> requiredPluginIterator = genModel.getModelRequiredPlugins().iterator();

 		if (requiredPluginIterator.hasNext()) {

 			String pluginID = requiredPluginIterator.next();

-			stringBuffer.append(TEXT_17);

+			stringBuffer.append(TEXT_21);

 			stringBuffer.append(pluginID);

 			if (pluginID.startsWith("org.eclipse.core.runtime")) {

 				if (genModel.isOSGiCompatible()) {

-					stringBuffer.append(TEXT_18);

+					stringBuffer.append(TEXT_22);

 				}

 			} else {

-				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_23);

 			}

 			while (requiredPluginIterator.hasNext()) {

 				pluginID = requiredPluginIterator.next();

-				stringBuffer.append(TEXT_15);

-				stringBuffer.append(TEXT_16);

+				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_20);

 				stringBuffer.append(pluginID);

 				if (pluginID.startsWith("org.eclipse.core.runtime")) {

 					if (genModel.isOSGiCompatible()) {

-						stringBuffer.append(TEXT_18);

+						stringBuffer.append(TEXT_22);

 					}

 				} else if (!pluginID.equals("org.eclipse.xtext.xbase.lib")

 						&& !pluginID.equals("org.eclipse.emf.ecore.xcore.lib")) {

-					stringBuffer.append(TEXT_19);

+					stringBuffer.append(TEXT_23);

 				}

 			}

 		}

 		if (genModel.isOSGiCompatible() && genModel.hasModelPluginClass()) {

-			stringBuffer.append(TEXT_20);

+			stringBuffer.append(TEXT_24);

 		}

 		if (genModel.getRuntimeVersion() == GenRuntimeVersion.EMF22

 				|| genModel.getRuntimeVersion() == GenRuntimeVersion.EMF23) {

-			stringBuffer.append(TEXT_21);

+			stringBuffer.append(TEXT_25);

 		}

-		stringBuffer.append(TEXT_22);

+		stringBuffer.append(TEXT_26);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ModuleGWTXML.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ModuleGWTXML.java
index 1be8eef..fdcf48f 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ModuleGWTXML.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ModuleGWTXML.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -147,9 +147,9 @@
 		/**

 		 * Copyright (c) 2010 Ed Merks and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   Ed Merks - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
index dab1942..7af80c5 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageClass.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -176,231 +176,234 @@
 	protected final String TEXT_110 = NL + "\t\t// Register package validator" + NL + "\t\t";

 	protected final String TEXT_111 = ".Registry.INSTANCE.put" + NL + "\t\t\t(the";

 	protected final String TEXT_112 = "," + NL + "\t\t\t new ";

-	protected final String TEXT_113 = ".Descriptor()" + NL + "\t\t\t {" + NL + "\t\t\t\t public ";

-	protected final String TEXT_114 = " getEValidator()" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return ";

-	protected final String TEXT_115 = ".INSTANCE;" + NL + "\t\t\t\t }" + NL + "\t\t\t });" + NL;

-	protected final String TEXT_116 = NL + "\t\t// Mark meta-data to indicate it can't be changed" + NL + "\t\tthe";

-	protected final String TEXT_117 = ".freeze();" + NL;

-	protected final String TEXT_118 = NL + "\t\t// Update the registry and return the package" + NL + "\t\t";

-	protected final String TEXT_119 = ".Registry.INSTANCE.put(";

-	protected final String TEXT_120 = ".eNS_URI, the";

-	protected final String TEXT_121 = ");" + NL + "\t\treturn the";

-	protected final String TEXT_122 = ";" + NL + "\t}";

-	protected final String TEXT_123 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_113 = ".Descriptor()" + NL + "\t\t\t {";

+	protected final String TEXT_114 = NL + "\t\t\t\t @Override";

+	protected final String TEXT_115 = NL + "\t\t\t\t public ";

+	protected final String TEXT_116 = " getEValidator()" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return ";

+	protected final String TEXT_117 = ".INSTANCE;" + NL + "\t\t\t\t }" + NL + "\t\t\t });" + NL;

+	protected final String TEXT_118 = NL + "\t\t// Mark meta-data to indicate it can't be changed" + NL + "\t\tthe";

+	protected final String TEXT_119 = ".freeze();" + NL;

+	protected final String TEXT_120 = NL + "\t\t// Update the registry and return the package" + NL + "\t\t";

+	protected final String TEXT_121 = ".Registry.INSTANCE.put(";

+	protected final String TEXT_122 = ".eNS_URI, the";

+	protected final String TEXT_123 = ");" + NL + "\t\treturn the";

+	protected final String TEXT_124 = ";" + NL + "\t}";

+	protected final String TEXT_125 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tpublic static void initializeRegistryHelpers()" + NL + "\t{";

-	protected final String TEXT_124 = ".register" + NL + "\t\t\t(";

-	protected final String TEXT_125 = ".class," + NL + "\t\t\t new ";

-	protected final String TEXT_126 = ".Helper()" + NL + "\t\t\t {" + NL

+	protected final String TEXT_126 = ".register" + NL + "\t\t\t(";

+	protected final String TEXT_127 = ".class," + NL + "\t\t\t new ";

+	protected final String TEXT_128 = ".Helper()" + NL + "\t\t\t {" + NL

 			+ "\t\t\t\t public boolean isInstance(Object instance)" + NL + "\t\t\t\t {" + NL

 			+ "\t\t\t\t\t return instance instanceof ";

-	protected final String TEXT_127 = ";" + NL + "\t\t\t\t }" + NL + "" + NL

-			+ "\t\t\t\t public Object newArrayInstance(int size)" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return new ";

-	protected final String TEXT_128 = "[size];" + NL + "\t\t\t\t }" + NL + "\t\t\t });";

 	protected final String TEXT_129 = ";" + NL + "\t\t\t\t }" + NL + "" + NL

+			+ "\t\t\t\t public Object newArrayInstance(int size)" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return new ";

+	protected final String TEXT_130 = "[size];" + NL + "\t\t\t\t }" + NL + "\t\t\t });";

+	protected final String TEXT_131 = ";" + NL + "\t\t\t\t }" + NL + "" + NL

 			+ "\t\t\t\t public Object newArrayInstance(int size)" + NL + "\t\t\t\t {";

-	protected final String TEXT_130 = NL + "\t\t\t\t\t return new ";

-	protected final String TEXT_131 = "[size]";

-	protected final String TEXT_132 = "[size];";

-	protected final String TEXT_133 = NL + "\t\t\t\t }" + NL + "\t\t});";

-	protected final String TEXT_134 = NL + "\t}" + NL + "" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_132 = NL + "\t\t\t\t\t return new ";

+	protected final String TEXT_133 = "[size]";

+	protected final String TEXT_134 = "[size];";

+	protected final String TEXT_135 = NL + "\t\t\t\t }" + NL + "\t\t});";

+	protected final String TEXT_136 = NL + "\t}" + NL + "" + NL + "" + NL + "\t/**" + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tpublic static class WhiteList implements ";

-	protected final String TEXT_135 = ", EBasicWhiteList" + NL + "\t{";

-	protected final String TEXT_136 = NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_137 = ", EBasicWhiteList" + NL + "\t{";

+	protected final String TEXT_138 = NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";

-	protected final String TEXT_137 = NL + "\t}";

-	protected final String TEXT_138 = NL + "\t * Returns the meta object for class '{@link ";

-	protected final String TEXT_139 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_139 = NL + "\t}";

+	protected final String TEXT_140 = NL + "\t * Returns the meta object for class '{@link ";

+	protected final String TEXT_141 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for class '<em>";

-	protected final String TEXT_140 = "</em>'." + NL + "\t * @see ";

-	protected final String TEXT_141 = NL + "\t * @model ";

-	protected final String TEXT_142 = NL + "\t *        ";

-	protected final String TEXT_143 = NL + "\t * @model";

-	protected final String TEXT_144 = NL + "\t * Returns the meta object for enum '{@link ";

-	protected final String TEXT_145 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_142 = "</em>'." + NL + "\t * @see ";

+	protected final String TEXT_143 = NL + "\t * @model ";

+	protected final String TEXT_144 = NL + "\t *        ";

+	protected final String TEXT_145 = NL + "\t * @model";

+	protected final String TEXT_146 = NL + "\t * Returns the meta object for enum '{@link ";

+	protected final String TEXT_147 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for enum '<em>";

-	protected final String TEXT_146 = NL + "\t * Returns the meta object for data type '<em>";

-	protected final String TEXT_147 = "</em>'.";

-	protected final String TEXT_148 = NL + "\t * Returns the meta object for data type '{@link ";

-	protected final String TEXT_149 = "</em>}'.";

-	protected final String TEXT_150 = NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->";

-	protected final String TEXT_151 = NL + "     * <!-- begin-model-doc -->" + NL + "     * ";

-	protected final String TEXT_152 = NL + "     * <!-- end-model-doc -->";

-	protected final String TEXT_153 = NL + "\t * @return the meta object for data type '<em>";

-	protected final String TEXT_154 = NL + "\tpublic ";

-	protected final String TEXT_155 = " get";

-	protected final String TEXT_156 = "()" + NL + "\t{";

-	protected final String TEXT_157 = NL + "\t\tif (";

-	protected final String TEXT_158 = " == null)" + NL + "\t\t{" + NL + "\t\t\t";

-	protected final String TEXT_159 = ".eNS_URI).getEClassifiers().get(";

-	protected final String TEXT_160 = ");" + NL + "\t\t}";

-	protected final String TEXT_161 = NL + "\t\treturn ";

-	protected final String TEXT_162 = ";" + NL + "\t}" + NL;

-	protected final String TEXT_163 = "();" + NL;

-	protected final String TEXT_164 = NL + "\t/**" + NL + "\t * Returns the meta object for the ";

-	protected final String TEXT_165 = " '{@link ";

-	protected final String TEXT_166 = "#";

-	protected final String TEXT_167 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_148 = NL + "\t * Returns the meta object for data type '<em>";

+	protected final String TEXT_149 = "</em>'.";

+	protected final String TEXT_150 = NL + "\t * Returns the meta object for data type '{@link ";

+	protected final String TEXT_151 = "</em>}'.";

+	protected final String TEXT_152 = NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->";

+	protected final String TEXT_153 = NL + "     * <!-- begin-model-doc -->" + NL + "     * ";

+	protected final String TEXT_154 = NL + "     * <!-- end-model-doc -->";

+	protected final String TEXT_155 = NL + "\t * @return the meta object for data type '<em>";

+	protected final String TEXT_156 = NL + "\t@Override";

+	protected final String TEXT_157 = NL + "\tpublic ";

+	protected final String TEXT_158 = " get";

+	protected final String TEXT_159 = "()" + NL + "\t{";

+	protected final String TEXT_160 = NL + "\t\tif (";

+	protected final String TEXT_161 = " == null)" + NL + "\t\t{" + NL + "\t\t\t";

+	protected final String TEXT_162 = ".eNS_URI).getEClassifiers().get(";

+	protected final String TEXT_163 = ");" + NL + "\t\t}";

+	protected final String TEXT_164 = NL + "\t\treturn ";

+	protected final String TEXT_165 = ";" + NL + "\t}" + NL;

+	protected final String TEXT_166 = "();" + NL;

+	protected final String TEXT_167 = NL + "\t/**" + NL + "\t * Returns the meta object for the ";

+	protected final String TEXT_168 = " '{@link ";

+	protected final String TEXT_169 = "#";

+	protected final String TEXT_170 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for the ";

-	protected final String TEXT_168 = " '<em>";

-	protected final String TEXT_169 = NL + "\t * @see #get";

-	protected final String TEXT_170 = NL + "\t\treturn (";

-	protected final String TEXT_171 = ".getEStructuralFeatures().get(";

-	protected final String TEXT_172 = ");";

-	protected final String TEXT_173 = NL + "        return (";

-	protected final String TEXT_174 = ")get";

-	protected final String TEXT_175 = "().getEStructuralFeatures().get(";

-	protected final String TEXT_176 = "();";

-	protected final String TEXT_177 = NL + "\t/**" + NL + "\t * Returns the meta object for the '{@link ";

-	protected final String TEXT_178 = "(";

-	protected final String TEXT_179 = ") <em>";

-	protected final String TEXT_180 = "</em>}' operation." + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_171 = " '<em>";

+	protected final String TEXT_172 = NL + "\t * @see #get";

+	protected final String TEXT_173 = NL + "\t\treturn (";

+	protected final String TEXT_174 = ".getEStructuralFeatures().get(";

+	protected final String TEXT_175 = ");";

+	protected final String TEXT_176 = NL + "        return (";

+	protected final String TEXT_177 = ")get";

+	protected final String TEXT_178 = "().getEStructuralFeatures().get(";

+	protected final String TEXT_179 = "();";

+	protected final String TEXT_180 = NL + "\t/**" + NL + "\t * Returns the meta object for the '{@link ";

+	protected final String TEXT_181 = "(";

+	protected final String TEXT_182 = ") <em>";

+	protected final String TEXT_183 = "</em>}' operation." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for the '<em>";

-	protected final String TEXT_181 = "</em>' operation." + NL + "\t * @see ";

-	protected final String TEXT_182 = ".getEOperations().get(";

-	protected final String TEXT_183 = NL + "        return get";

-	protected final String TEXT_184 = "().getEOperations().get(";

-	protected final String TEXT_185 = NL + "\t/**" + NL

+	protected final String TEXT_184 = "</em>' operation." + NL + "\t * @see ";

+	protected final String TEXT_185 = ".getEOperations().get(";

+	protected final String TEXT_186 = NL + "        return get";

+	protected final String TEXT_187 = "().getEOperations().get(";

+	protected final String TEXT_188 = NL + "\t/**" + NL

 			+ "\t * Returns the factory that creates the instances of the model." + NL + "\t * <!-- begin-user-doc -->"

 			+ NL + "\t * <!-- end-user-doc -->" + NL

 			+ "\t * @return the factory that creates the instances of the model." + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_186 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

-			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

-	protected final String TEXT_187 = "()" + NL + "\t{" + NL + "\t\treturn (";

-	protected final String TEXT_188 = ")getEFactoryInstance();" + NL + "\t}";

 	protected final String TEXT_189 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

+	protected final String TEXT_190 = "()" + NL + "\t{" + NL + "\t\treturn (";

+	protected final String TEXT_191 = ")getEFactoryInstance();" + NL + "\t}";

+	protected final String TEXT_192 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprivate boolean isCreated = false;" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Creates the meta-model objects for the package.  This method is" + NL

 			+ "\t * guarded to have no affect on any invocation but its first." + NL + "\t * <!-- begin-user-doc -->"

 			+ NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

-	protected final String TEXT_190 = NL + "\t@SuppressWarnings(\"deprecation\")";

-	protected final String TEXT_191 = NL + "\tpublic void createPackageContents()" + NL + "\t{" + NL

+	protected final String TEXT_193 = NL + "\t@SuppressWarnings(\"deprecation\")";

+	protected final String TEXT_194 = NL + "\tpublic void createPackageContents()" + NL + "\t{" + NL

 			+ "\t\tif (isCreated) return;" + NL + "\t\tisCreated = true;";

-	protected final String TEXT_192 = NL + NL + "\t\t// Create classes and their features";

-	protected final String TEXT_193 = " = create";

-	protected final String TEXT_194 = NL + "\t\tcreate";

-	protected final String TEXT_195 = ", ";

-	protected final String TEXT_196 = NL + "\t\tcreateEOperation(";

-	protected final String TEXT_197 = NL + NL + "\t\t// Create enums";

-	protected final String TEXT_198 = " = createEEnum(";

-	protected final String TEXT_199 = NL + NL + "\t\t// Create data types";

-	protected final String TEXT_200 = " = createEDataType(";

-	protected final String TEXT_201 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_195 = NL + NL + "\t\t// Create classes and their features";

+	protected final String TEXT_196 = " = create";

+	protected final String TEXT_197 = NL + "\t\tcreate";

+	protected final String TEXT_198 = ", ";

+	protected final String TEXT_199 = NL + "\t\tcreateEOperation(";

+	protected final String TEXT_200 = NL + NL + "\t\t// Create enums";

+	protected final String TEXT_201 = " = createEEnum(";

+	protected final String TEXT_202 = NL + NL + "\t\t// Create data types";

+	protected final String TEXT_203 = " = createEDataType(";

+	protected final String TEXT_204 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprivate boolean isInitialized = false;" + NL;

-	protected final String TEXT_202 = NL + "\t/**" + NL

+	protected final String TEXT_205 = NL + "\t/**" + NL

 			+ "\t * Complete the initialization of the package and its meta-model.  This" + NL

 			+ "\t * method is guarded to have no affect on any invocation but its first." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_203 = NL + "\tpublic void initializePackageContents()" + NL + "\t{" + NL

+	protected final String TEXT_206 = NL + "\tpublic void initializePackageContents()" + NL + "\t{" + NL

 			+ "\t\tif (isInitialized) return;" + NL + "\t\tisInitialized = true;" + NL + "" + NL

 			+ "\t\t// Initialize package" + NL + "\t\tsetName(eNAME);" + NL + "\t\tsetNsPrefix(eNS_PREFIX);" + NL

 			+ "\t\tsetNsURI(eNS_URI);";

-	protected final String TEXT_204 = NL + NL + "\t\t// Obtain other dependent packages";

-	protected final String TEXT_205 = ".eNS_URI);";

-	protected final String TEXT_206 = NL + NL + "\t\t// Add subpackages";

-	protected final String TEXT_207 = NL + "\t\tgetESubpackages().add(";

-	protected final String TEXT_208 = NL + NL + "\t\t// Create type parameters";

-	protected final String TEXT_209 = "_";

-	protected final String TEXT_210 = " = addETypeParameter(";

-	protected final String TEXT_211 = ", \"";

-	protected final String TEXT_212 = "\");";

-	protected final String TEXT_213 = NL + "\t\taddETypeParameter(";

-	protected final String TEXT_214 = NL + NL + "\t\t// Set bounds for type parameters";

-	protected final String TEXT_215 = "g";

-	protected final String TEXT_216 = " = createEGenericType(";

-	protected final String TEXT_217 = NL + "\t\tg";

-	protected final String TEXT_218 = ".";

-	protected final String TEXT_219 = "(g";

-	protected final String TEXT_220 = ".getEBounds().add(g1);";

-	protected final String TEXT_221 = NL + NL + "\t\t// Add supertypes to classes";

-	protected final String TEXT_222 = ".getESuperTypes().add(";

-	protected final String TEXT_223 = ".get";

-	protected final String TEXT_224 = "());";

-	protected final String TEXT_225 = ".getEGenericSuperTypes().add(g1);";

-	protected final String TEXT_226 = NL + NL + "\t\t// Initialize classes";

-	protected final String TEXT_227 = ", features, and operations; add parameters";

-	protected final String TEXT_228 = " and features; add operations and parameters";

-	protected final String TEXT_229 = NL + "\t\tinitEClass(";

-	protected final String TEXT_230 = "null";

-	protected final String TEXT_231 = ".class";

-	protected final String TEXT_232 = "\", ";

-	protected final String TEXT_233 = "\"";

-	protected final String TEXT_234 = NL + "\t\tinitEReference(get";

-	protected final String TEXT_235 = "(), ";

-	protected final String TEXT_236 = "g1";

-	protected final String TEXT_237 = NL + "\t\tget";

-	protected final String TEXT_238 = "().getEKeys().add(";

-	protected final String TEXT_239 = NL + "\t\tinitEAttribute(get";

-	protected final String TEXT_240 = "initEOperation(get";

-	protected final String TEXT_241 = "addEOperation(";

-	protected final String TEXT_242 = "(), \"";

-	protected final String TEXT_243 = ", null, \"";

-	protected final String TEXT_244 = "addETypeParameter(op, \"";

-	protected final String TEXT_245 = NL + "\t\tt";

-	protected final String TEXT_246 = NL + "\t\taddEParameter(op, ";

-	protected final String TEXT_247 = NL + "\t\taddEException(op, g";

-	protected final String TEXT_248 = NL + "\t\taddEException(op, ";

-	protected final String TEXT_249 = NL + "\t\tinitEOperation(op, g1);";

-	protected final String TEXT_250 = NL + NL + "\t\t// Initialize enums and add enum literals";

-	protected final String TEXT_251 = NL + "\t\tinitEEnum(";

-	protected final String TEXT_252 = ".class, \"";

-	protected final String TEXT_253 = NL + "\t\taddEEnumLiteral(";

-	protected final String TEXT_254 = NL + NL + "\t\t// Initialize data types";

-	protected final String TEXT_255 = NL + "\t\tinitEDataType(";

-	protected final String TEXT_256 = NL + NL + "\t\t// Create resource" + NL + "\t\tcreateResource(";

-	protected final String TEXT_257 = NL + NL + "\t\t// Create annotations";

-	protected final String TEXT_258 = NL + "\t\t// ";

-	protected final String TEXT_259 = "Annotations();";

-	protected final String TEXT_260 = NL + "\t}" + NL;

-	protected final String TEXT_261 = NL + "\t/**" + NL + "\t * Initializes the annotations for <b>";

-	protected final String TEXT_262 = "</b>." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"

+	protected final String TEXT_207 = NL + NL + "\t\t// Obtain other dependent packages";

+	protected final String TEXT_208 = ".eNS_URI);";

+	protected final String TEXT_209 = NL + NL + "\t\t// Add subpackages";

+	protected final String TEXT_210 = NL + "\t\tgetESubpackages().add(";

+	protected final String TEXT_211 = NL + NL + "\t\t// Create type parameters";

+	protected final String TEXT_212 = "_";

+	protected final String TEXT_213 = " = addETypeParameter(";

+	protected final String TEXT_214 = ", \"";

+	protected final String TEXT_215 = "\");";

+	protected final String TEXT_216 = NL + "\t\taddETypeParameter(";

+	protected final String TEXT_217 = NL + NL + "\t\t// Set bounds for type parameters";

+	protected final String TEXT_218 = "g";

+	protected final String TEXT_219 = " = createEGenericType(";

+	protected final String TEXT_220 = NL + "\t\tg";

+	protected final String TEXT_221 = ".";

+	protected final String TEXT_222 = "(g";

+	protected final String TEXT_223 = ".getEBounds().add(g1);";

+	protected final String TEXT_224 = NL + NL + "\t\t// Add supertypes to classes";

+	protected final String TEXT_225 = ".getESuperTypes().add(";

+	protected final String TEXT_226 = ".get";

+	protected final String TEXT_227 = "());";

+	protected final String TEXT_228 = ".getEGenericSuperTypes().add(g1);";

+	protected final String TEXT_229 = NL + NL + "\t\t// Initialize classes";

+	protected final String TEXT_230 = ", features, and operations; add parameters";

+	protected final String TEXT_231 = " and features; add operations and parameters";

+	protected final String TEXT_232 = NL + "\t\tinitEClass(";

+	protected final String TEXT_233 = "null";

+	protected final String TEXT_234 = ".class";

+	protected final String TEXT_235 = "\", ";

+	protected final String TEXT_236 = "\"";

+	protected final String TEXT_237 = NL + "\t\tinitEReference(get";

+	protected final String TEXT_238 = "(), ";

+	protected final String TEXT_239 = "g1";

+	protected final String TEXT_240 = NL + "\t\tget";

+	protected final String TEXT_241 = "().getEKeys().add(";

+	protected final String TEXT_242 = NL + "\t\tinitEAttribute(get";

+	protected final String TEXT_243 = "initEOperation(get";

+	protected final String TEXT_244 = "addEOperation(";

+	protected final String TEXT_245 = "(), \"";

+	protected final String TEXT_246 = ", null, \"";

+	protected final String TEXT_247 = "addETypeParameter(op, \"";

+	protected final String TEXT_248 = NL + "\t\tt";

+	protected final String TEXT_249 = NL + "\t\taddEParameter(op, ";

+	protected final String TEXT_250 = NL + "\t\taddEException(op, g";

+	protected final String TEXT_251 = NL + "\t\taddEException(op, ";

+	protected final String TEXT_252 = NL + "\t\tinitEOperation(op, g1);";

+	protected final String TEXT_253 = NL + NL + "\t\t// Initialize enums and add enum literals";

+	protected final String TEXT_254 = NL + "\t\tinitEEnum(";

+	protected final String TEXT_255 = ".class, \"";

+	protected final String TEXT_256 = NL + "\t\taddEEnumLiteral(";

+	protected final String TEXT_257 = NL + NL + "\t\t// Initialize data types";

+	protected final String TEXT_258 = NL + "\t\tinitEDataType(";

+	protected final String TEXT_259 = NL + NL + "\t\t// Create resource" + NL + "\t\tcreateResource(";

+	protected final String TEXT_260 = NL + NL + "\t\t// Create annotations";

+	protected final String TEXT_261 = NL + "\t\t// ";

+	protected final String TEXT_262 = "Annotations();";

+	protected final String TEXT_263 = NL + "\t}" + NL;

+	protected final String TEXT_264 = NL + "\t/**" + NL + "\t * Initializes the annotations for <b>";

+	protected final String TEXT_265 = "</b>." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"

 			+ NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void create";

-	protected final String TEXT_263 = "Annotations()" + NL + "\t{" + NL + "\t\tString source = ";

-	protected final String TEXT_264 = "null;";

-	protected final String TEXT_265 = NL + "\t\taddAnnotation" + NL + "\t\t  (";

-	protected final String TEXT_266 = "," + NL + "\t\t   source," + NL + "\t\t   new String[]" + NL + "\t\t   {";

-	protected final String TEXT_267 = NL + "\t\t\t   ";

-	protected final String TEXT_268 = NL + "\t\t   }";

-	protected final String TEXT_269 = ",";

-	protected final String TEXT_270 = NL + "\t\t   new ";

-	protected final String TEXT_271 = "[]" + NL + "\t\t   {";

-	protected final String TEXT_272 = NL + "\t\t\t ";

-	protected final String TEXT_273 = ".createURI(";

-	protected final String TEXT_274 = "eNS_URI).appendFragment(\"";

-	protected final String TEXT_275 = "\")";

-	protected final String TEXT_276 = NL + "\t\t   });";

-	protected final String TEXT_277 = "," + NL + "\t\t   ";

-	protected final String TEXT_278 = "new boolean[] { ";

-	protected final String TEXT_279 = " }";

-	protected final String TEXT_280 = "null,";

-	protected final String TEXT_281 = "\",";

-	protected final String TEXT_282 = NL + "\t\t   new String[]" + NL + "\t\t   {";

-	protected final String TEXT_283 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_266 = "Annotations()" + NL + "\t{" + NL + "\t\tString source = ";

+	protected final String TEXT_267 = "null;";

+	protected final String TEXT_268 = NL + "\t\taddAnnotation" + NL + "\t\t  (";

+	protected final String TEXT_269 = "," + NL + "\t\t   source," + NL + "\t\t   new String[]" + NL + "\t\t   {";

+	protected final String TEXT_270 = NL + "\t\t\t   ";

+	protected final String TEXT_271 = NL + "\t\t   }";

+	protected final String TEXT_272 = ",";

+	protected final String TEXT_273 = NL + "\t\t   new ";

+	protected final String TEXT_274 = "[]" + NL + "\t\t   {";

+	protected final String TEXT_275 = NL + "\t\t\t ";

+	protected final String TEXT_276 = ".createURI(";

+	protected final String TEXT_277 = "eNS_URI).appendFragment(\"";

+	protected final String TEXT_278 = "\")";

+	protected final String TEXT_279 = NL + "\t\t   });";

+	protected final String TEXT_280 = "," + NL + "\t\t   ";

+	protected final String TEXT_281 = "new boolean[] { ";

+	protected final String TEXT_282 = " }";

+	protected final String TEXT_283 = "null,";

+	protected final String TEXT_284 = "\",";

+	protected final String TEXT_285 = NL + "\t\t   new String[]" + NL + "\t\t   {";

+	protected final String TEXT_286 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprivate boolean isLoaded = false;" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Laods the package and any sub-packages from their serialized form." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tpublic void loadPackage()" + NL + "\t{" + NL + "\t\tif (isLoaded) return;" + NL

 			+ "\t\tisLoaded = true;" + NL + "" + NL + "\t\t";

-	protected final String TEXT_284 = " url = getClass().getResource(packageFilename);" + NL + "\t\tif (url == null)"

+	protected final String TEXT_287 = " url = getClass().getResource(packageFilename);" + NL + "\t\tif (url == null)"

 			+ NL + "\t\t{" + NL

 			+ "\t\t\tthrow new RuntimeException(\"Missing serialized package: \" + packageFilename);";

-	protected final String TEXT_285 = NL + "\t\t}" + NL + "\t\t";

-	protected final String TEXT_286 = " uri = ";

-	protected final String TEXT_287 = ".createURI(url.toString());" + NL + "\t\t";

-	protected final String TEXT_288 = " resource = new ";

-	protected final String TEXT_289 = "().createResource(uri);" + NL + "\t\ttry" + NL + "\t\t{" + NL

+	protected final String TEXT_288 = NL + "\t\t}" + NL + "\t\t";

+	protected final String TEXT_289 = " uri = ";

+	protected final String TEXT_290 = ".createURI(url.toString());" + NL + "\t\t";

+	protected final String TEXT_291 = " resource = new ";

+	protected final String TEXT_292 = "().createResource(uri);" + NL + "\t\ttry" + NL + "\t\t{" + NL

 			+ "\t\t\tresource.load(null);" + NL + "\t\t}" + NL + "\t\tcatch (";

-	protected final String TEXT_290 = " exception)" + NL + "\t\t{" + NL + "\t\t\tthrow new ";

-	protected final String TEXT_291 = "(exception);" + NL + "\t\t}" + NL + "\t\tinitializeFromLoadedEPackage(this, (";

-	protected final String TEXT_292 = ")resource.getContents().get(0));" + NL + "\t\tcreateResource(eNS_URI);" + NL

+	protected final String TEXT_293 = " exception)" + NL + "\t\t{" + NL + "\t\t\tthrow new ";

+	protected final String TEXT_294 = "(exception);" + NL + "\t\t}" + NL + "\t\tinitializeFromLoadedEPackage(this, (";

+	protected final String TEXT_295 = ")resource.getContents().get(0));" + NL + "\t\tcreateResource(eNS_URI);" + NL

 			+ "\t}" + NL;

-	protected final String TEXT_293 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_296 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprivate boolean isFixed = false;" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Fixes up the loaded package, to make it appear as if it had been programmatically built." + NL

@@ -409,64 +412,63 @@
 			+ "\t\tisFixed = true;" + NL + "\t\tfixEClassifiers();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Sets the instance class on the given classifier." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

-	protected final String TEXT_294 = NL + "\t@Override";

-	protected final String TEXT_295 = NL + "\tprotected void fixInstanceClass(";

-	protected final String TEXT_296 = " eClassifier)" + NL + "\t{" + NL

+	protected final String TEXT_297 = NL + "\tprotected void fixInstanceClass(";

+	protected final String TEXT_298 = " eClassifier)" + NL + "\t{" + NL

 			+ "\t\tif (eClassifier.getInstanceClassName() == null)" + NL + "\t\t{";

-	protected final String TEXT_297 = NL + "\t\t\teClassifier.setInstanceClassName(\"";

-	protected final String TEXT_298 = ".\" + eClassifier.getName());";

-	protected final String TEXT_299 = NL + "\t\t\tsetGeneratedClassName(eClassifier);";

-	protected final String TEXT_300 = NL + "\t\t\tswitch (eClassifier.getClassifierID())" + NL + "\t\t\t{";

-	protected final String TEXT_301 = NL + "\t\t\t\tcase ";

-	protected final String TEXT_302 = ":";

-	protected final String TEXT_303 = NL + "\t\t\t\t{" + NL + "\t\t\t\t\tbreak;" + NL + "\t\t\t\t}" + NL

+	protected final String TEXT_299 = NL + "\t\t\teClassifier.setInstanceClassName(\"";

+	protected final String TEXT_300 = ".\" + eClassifier.getName());";

+	protected final String TEXT_301 = NL + "\t\t\tsetGeneratedClassName(eClassifier);";

+	protected final String TEXT_302 = NL + "\t\t\tswitch (eClassifier.getClassifierID())" + NL + "\t\t\t{";

+	protected final String TEXT_303 = NL + "\t\t\t\tcase ";

+	protected final String TEXT_304 = ":";

+	protected final String TEXT_305 = NL + "\t\t\t\t{" + NL + "\t\t\t\t\tbreak;" + NL + "\t\t\t\t}" + NL

 			+ "\t\t\t\tdefault:" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\teClassifier.setInstanceClassName(\"";

-	protected final String TEXT_304 = NL + "\t\t\t\t\tsetGeneratedClassName(eClassifier);" + NL + "\t\t\t\t\tbreak;"

+	protected final String TEXT_306 = NL + "\t\t\t\t\tsetGeneratedClassName(eClassifier);" + NL + "\t\t\t\t\tbreak;"

 			+ NL + "\t\t\t\t}" + NL + "\t\t\t}";

-	protected final String TEXT_305 = NL + "\t\t}" + NL + "\t}" + NL;

-	protected final String TEXT_306 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_307 = NL + "\t\t}" + NL + "\t}" + NL;

+	protected final String TEXT_308 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";

-	protected final String TEXT_307 = " addEOperation(";

-	protected final String TEXT_308 = " owner, ";

-	protected final String TEXT_309 = " type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered)"

+	protected final String TEXT_309 = " addEOperation(";

+	protected final String TEXT_310 = " owner, ";

+	protected final String TEXT_311 = " type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered)"

 			+ NL + "\t{" + NL + "\t\t";

-	protected final String TEXT_310 = " o = addEOperation(owner, type, name, lowerBound, upperBound);" + NL

+	protected final String TEXT_312 = " o = addEOperation(owner, type, name, lowerBound, upperBound);" + NL

 			+ "\t\to.setUnique(isUnique);" + NL + "\t\to.setOrdered(isOrdered);" + NL + "\t\treturn o;" + NL + "\t}"

 			+ NL;

-	protected final String TEXT_311 = " addEParameter(";

-	protected final String TEXT_312 = " p = ecoreFactory.createEParameter();" + NL + "\t\tp.setEType(type);" + NL

+	protected final String TEXT_313 = " addEParameter(";

+	protected final String TEXT_314 = " p = ecoreFactory.createEParameter();" + NL + "\t\tp.setEType(type);" + NL

 			+ "\t\tp.setName(name);" + NL + "\t\tp.setLowerBound(lowerBound);" + NL + "\t\tp.setUpperBound(upperBound);"

 			+ NL + "\t\tp.setUnique(isUnique);" + NL + "\t\tp.setOrdered(isOrdered);" + NL

 			+ "\t\towner.getEParameters().add(p);" + NL + "\t\treturn p;" + NL + "\t}" + NL;

-	protected final String TEXT_313 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_315 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * Defines literals for the meta objects that represent" + NL + "\t * <ul>" + NL

 			+ "\t *   <li>each class,</li>" + NL + "\t *   <li>each feature of each class,</li>";

-	protected final String TEXT_314 = NL + "\t *   <li>each operation of each class,</li>";

-	protected final String TEXT_315 = NL + "\t *   <li>each enum,</li>" + NL + "\t *   <li>and each data type</li>" + NL

+	protected final String TEXT_316 = NL + "\t *   <li>each operation of each class,</li>";

+	protected final String TEXT_317 = NL + "\t *   <li>each enum,</li>" + NL + "\t *   <li>and each data type</li>" + NL

 			+ "\t * </ul>" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\t";

-	protected final String TEXT_316 = "public ";

-	protected final String TEXT_317 = "interface Literals" + NL + "\t{";

-	protected final String TEXT_318 = NL + "\t\t/**";

-	protected final String TEXT_319 = NL + "\t\t * The meta object literal for the '{@link ";

-	protected final String TEXT_320 = "</em>}' class." + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_318 = "public ";

+	protected final String TEXT_319 = "interface Literals" + NL + "\t{";

+	protected final String TEXT_320 = NL + "\t\t/**";

+	protected final String TEXT_321 = NL + "\t\t * The meta object literal for the '{@link ";

+	protected final String TEXT_322 = "</em>}' class." + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see ";

-	protected final String TEXT_321 = "</em>}' enum." + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_323 = "</em>}' enum." + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see ";

-	protected final String TEXT_322 = NL + "\t\t * The meta object literal for the '<em>";

-	protected final String TEXT_323 = "</em>' data type." + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_324 = NL + "\t\t * The meta object literal for the '<em>";

+	protected final String TEXT_325 = "</em>' data type." + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->";

-	protected final String TEXT_324 = NL + "\t\t * @see ";

-	protected final String TEXT_325 = NL + "\t\t * ";

-	protected final String TEXT_326 = NL + "\t\t * @generated" + NL + "\t\t */";

-	protected final String TEXT_327 = NL + "\t\t@Deprecated";

-	protected final String TEXT_328 = " = eINSTANCE.get";

-	protected final String TEXT_329 = NL + "\t\t/**" + NL + "\t\t * The meta object literal for the '<em><b>";

-	protected final String TEXT_330 = " feature." + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_326 = NL + "\t\t * @see ";

+	protected final String TEXT_327 = NL + "\t\t * ";

+	protected final String TEXT_328 = NL + "\t\t * @generated" + NL + "\t\t */";

+	protected final String TEXT_329 = NL + "\t\t@Deprecated";

+	protected final String TEXT_330 = " = eINSTANCE.get";

+	protected final String TEXT_331 = NL + "\t\t/**" + NL + "\t\t * The meta object literal for the '<em><b>";

+	protected final String TEXT_332 = " feature." + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->";

-	protected final String TEXT_331 = "</b></em>' operation." + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_333 = "</b></em>' operation." + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->";

-	protected final String TEXT_332 = NL + "} //";

-	protected final String TEXT_333 = NL;

+	protected final String TEXT_334 = NL + "} //";

+	protected final String TEXT_335 = NL;

 

 	public PackageClass() {

 		//Here is the constructor

@@ -502,8 +504,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_333);

-		stringBuffer.append(TEXT_333);

+		stringBuffer.append(TEXT_335);

+		stringBuffer.append(TEXT_335);

 		return stringBuffer.toString();

 	}

 

@@ -579,9 +581,9 @@
 		/**

 		 * Copyright (c) 2002-2010 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

@@ -592,6 +594,8 @@
 		final boolean isJDK50 = genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50;

 		boolean isInterface = Boolean.TRUE.equals(((Object[]) argument)[1]);

 		boolean isImplementation = Boolean.TRUE.equals(((Object[]) argument)[2]);

+		boolean useInterfaceOverrideAnnotation = genModel.useInterfaceOverrideAnnotation()

+				&& !(isInterface && isImplementation);

 		boolean packageNeedsSuppressDeprecation = isJDK50

 				&& GenModelUtil.hasAPIDeprecatedTag(genPackage.getOrderedGenClassifiers())

 				&& !genPackage.hasAPIDeprecatedTag();

@@ -1058,27 +1062,31 @@
 				stringBuffer.append(TEXT_112);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator"));

 				stringBuffer.append(TEXT_113);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator"));

-				stringBuffer.append(TEXT_114);

-				stringBuffer.append(genPackage.getImportedValidatorClassName());

+				if (genModel.useInterfaceOverrideAnnotation()) {

+					stringBuffer.append(TEXT_114);

+				}

 				stringBuffer.append(TEXT_115);

-			}

-			if (!genPackage.isEcorePackage()) {

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator"));

 				stringBuffer.append(TEXT_116);

-				stringBuffer.append(genPackage.getBasicPackageName());

+				stringBuffer.append(genPackage.getImportedValidatorClassName());

 				stringBuffer.append(TEXT_117);

 			}

-			stringBuffer.append(TEXT_118);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage"));

-			stringBuffer.append(TEXT_119);

-			stringBuffer.append(genPackage.getImportedPackageInterfaceName());

+			if (!genPackage.isEcorePackage()) {

+				stringBuffer.append(TEXT_118);

+				stringBuffer.append(genPackage.getBasicPackageName());

+				stringBuffer.append(TEXT_119);

+			}

 			stringBuffer.append(TEXT_120);

-			stringBuffer.append(genPackage.getBasicPackageName());

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage"));

 			stringBuffer.append(TEXT_121);

-			stringBuffer.append(genPackage.getBasicPackageName());

+			stringBuffer.append(genPackage.getImportedPackageInterfaceName());

 			stringBuffer.append(TEXT_122);

+			stringBuffer.append(genPackage.getBasicPackageName());

+			stringBuffer.append(TEXT_123);

+			stringBuffer.append(genPackage.getBasicPackageName());

+			stringBuffer.append(TEXT_124);

 			if (genModel.getRuntimePlatform() == GenRuntimePlatform.GWT) {

-				stringBuffer.append(TEXT_123);

+				stringBuffer.append(TEXT_125);

 				Set<String> helpers = new HashSet<String>();

 				for (GenClassifier genClassifier : genPackage.getGenClassifiers()) {

 					if (genClassifier instanceof GenClass) {

@@ -1089,17 +1097,17 @@
 							if (helpers.add(theClass)) {

 								stringBuffer.append(TEXT_91);

 								stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect"));

-								stringBuffer.append(TEXT_124);

-								stringBuffer.append(theClass);

-								stringBuffer.append(TEXT_125);

-								stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect"));

 								stringBuffer.append(TEXT_126);

+								stringBuffer.append(theClass);

+								stringBuffer.append(TEXT_127);

+								stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect"));

+								stringBuffer.append(TEXT_128);

 								stringBuffer.append(genClass.isMapEntry() ? genClass.getImportedClassName()

 										: genClass.getRawImportedInterfaceName()

 												+ genClass.getInterfaceWildTypeArguments());

-								stringBuffer.append(TEXT_127);

+								stringBuffer.append(TEXT_129);

 								stringBuffer.append(theClass);

-								stringBuffer.append(TEXT_128);

+								stringBuffer.append(TEXT_130);

 							}

 						}

 					} else if (genClassifier instanceof GenDataType) {

@@ -1109,13 +1117,13 @@
 							if (helpers.add(theClass)) {

 								stringBuffer.append(TEXT_91);

 								stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect"));

-								stringBuffer.append(TEXT_124);

-								stringBuffer.append(theClass);

-								stringBuffer.append(TEXT_125);

-								stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect"));

 								stringBuffer.append(TEXT_126);

 								stringBuffer.append(theClass);

-								stringBuffer.append(TEXT_129);

+								stringBuffer.append(TEXT_127);

+								stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect"));

+								stringBuffer.append(TEXT_128);

+								stringBuffer.append(theClass);

+								stringBuffer.append(TEXT_131);

 								if (genDataType.isArrayType()) {

 									String componentType = theClass;

 									String indices = "";

@@ -1123,29 +1131,29 @@
 										componentType = componentType.substring(0, componentType.length() - 2);

 										indices += "[]";

 									}

-									stringBuffer.append(TEXT_130);

+									stringBuffer.append(TEXT_132);

 									stringBuffer.append(componentType);

-									stringBuffer.append(TEXT_131);

+									stringBuffer.append(TEXT_133);

 									stringBuffer.append(indices);

 									stringBuffer.append(TEXT_3);

 								} else {

-									stringBuffer.append(TEXT_130);

-									stringBuffer.append(theClass);

 									stringBuffer.append(TEXT_132);

+									stringBuffer.append(theClass);

+									stringBuffer.append(TEXT_134);

 								}

-								stringBuffer.append(TEXT_133);

+								stringBuffer.append(TEXT_135);

 							}

 						}

 					}

 				}

-				stringBuffer.append(TEXT_134);

+				stringBuffer.append(TEXT_136);

 				stringBuffer.append(genModel.getImportedName("com.google.gwt.user.client.rpc.IsSerializable"));

-				stringBuffer.append(TEXT_135);

+				stringBuffer.append(TEXT_137);

 				for (GenClassifier genClassifier : genPackage.getGenClassifiers()) {

 					if (genClassifier instanceof GenClass) {

 						GenClass genClass = (GenClass) genClassifier;

 						if (!genClass.isDynamic()) {

-							stringBuffer.append(TEXT_136);

+							stringBuffer.append(TEXT_138);

 							stringBuffer.append(genClass.isMapEntry() ? genClass.getImportedClassName()

 									: genClass.getImportedWildcardInstanceClassName());

 							stringBuffer.append(TEXT_67);

@@ -1155,7 +1163,7 @@
 					} else if (genClassifier instanceof GenDataType) {

 						GenDataType genDataType = (GenDataType) genClassifier;

 						if (!genDataType.isObjectType() && genDataType.isSerializable()) {

-							stringBuffer.append(TEXT_136);

+							stringBuffer.append(TEXT_138);

 							stringBuffer.append(genDataType.getImportedWildcardInstanceClassName());

 							stringBuffer.append(TEXT_67);

 							stringBuffer.append(genDataType.getSafeUncapName());

@@ -1163,7 +1171,7 @@
 						}

 					}

 				}

-				stringBuffer.append(TEXT_137);

+				stringBuffer.append(TEXT_139);

 			}

 			stringBuffer.append(TEXT_4);

 		}

@@ -1175,13 +1183,13 @@
 				stringBuffer.append(TEXT_38);

 				if (genClassifier instanceof GenClass) {

 					GenClass genClass = (GenClass) genClassifier;

-					stringBuffer.append(TEXT_138);

+					stringBuffer.append(TEXT_140);

 					stringBuffer.append(genClass.getRawQualifiedInterfaceName());

 					stringBuffer.append(TEXT_40);

 					stringBuffer.append(genClass.getFormattedName());

-					stringBuffer.append(TEXT_139);

+					stringBuffer.append(TEXT_141);

 					stringBuffer.append(genClass.getFormattedName());

-					stringBuffer.append(TEXT_140);

+					stringBuffer.append(TEXT_142);

 					stringBuffer.append(genClass.getRawQualifiedInterfaceName());

 					if (!genModel.isSuppressEMFModelTags()

 							&& (genClass.isExternalInterface() || genClass.isDynamic())) {

@@ -1191,49 +1199,49 @@
 							String modelInfo = stringTokenizer.nextToken();

 							if (first) {

 								first = false;

-								stringBuffer.append(TEXT_141);

+								stringBuffer.append(TEXT_143);

 								stringBuffer.append(modelInfo);

 							} else {

-								stringBuffer.append(TEXT_142);

+								stringBuffer.append(TEXT_144);

 								stringBuffer.append(modelInfo);

 							}

 						}

 						if (first) {

-							stringBuffer.append(TEXT_143);

+							stringBuffer.append(TEXT_145);

 						}

 					}

 				} else if (genClassifier instanceof GenEnum) {

 					GenEnum genEnum = (GenEnum) genClassifier;

-					stringBuffer.append(TEXT_144);

+					stringBuffer.append(TEXT_146);

 					stringBuffer.append(genEnum.getQualifiedName());

 					stringBuffer.append(TEXT_40);

 					stringBuffer.append(genEnum.getFormattedName());

-					stringBuffer.append(TEXT_145);

+					stringBuffer.append(TEXT_147);

 					stringBuffer.append(genEnum.getFormattedName());

-					stringBuffer.append(TEXT_140);

+					stringBuffer.append(TEXT_142);

 					stringBuffer.append(genEnum.getQualifiedName());

 				} else if (genClassifier instanceof GenDataType) {

 					GenDataType genDataType = (GenDataType) genClassifier;

 					if (genDataType.isPrimitiveType() || genDataType.isArrayType()) {

-						stringBuffer.append(TEXT_146);

-						stringBuffer.append(genDataType.getFormattedName());

-						stringBuffer.append(TEXT_147);

-					} else {

 						stringBuffer.append(TEXT_148);

+						stringBuffer.append(genDataType.getFormattedName());

+						stringBuffer.append(TEXT_149);

+					} else {

+						stringBuffer.append(TEXT_150);

 						stringBuffer.append(genDataType.getRawInstanceClassName());

 						stringBuffer.append(TEXT_40);

 						stringBuffer.append(genDataType.getFormattedName());

-						stringBuffer.append(TEXT_149);

-					}

-					stringBuffer.append(TEXT_150);

-					if (genDataType.hasDocumentation()) {

 						stringBuffer.append(TEXT_151);

-						stringBuffer.append(genDataType.getDocumentation(genModel.getIndentation(stringBuffer)));

-						stringBuffer.append(TEXT_152);

 					}

-					stringBuffer.append(TEXT_153);

+					stringBuffer.append(TEXT_152);

+					if (genDataType.hasDocumentation()) {

+						stringBuffer.append(TEXT_153);

+						stringBuffer.append(genDataType.getDocumentation(genModel.getIndentation(stringBuffer)));

+						stringBuffer.append(TEXT_154);

+					}

+					stringBuffer.append(TEXT_155);

 					stringBuffer.append(genDataType.getFormattedName());

-					stringBuffer.append(TEXT_147);

+					stringBuffer.append(TEXT_149);

 					if (!genDataType.isPrimitiveType() && !genDataType.isArrayType()) {

 						stringBuffer.append(TEXT_45);

 						stringBuffer.append(genDataType.getRawInstanceClassName());

@@ -1245,15 +1253,15 @@
 							String modelInfo = stringTokenizer.nextToken();

 							if (first) {

 								first = false;

-								stringBuffer.append(TEXT_141);

+								stringBuffer.append(TEXT_143);

 								stringBuffer.append(modelInfo);

 							} else {

-								stringBuffer.append(TEXT_142);

+								stringBuffer.append(TEXT_144);

 								stringBuffer.append(modelInfo);

 							}

 						}

 						if (first) {

-							stringBuffer.append(TEXT_143);

+							stringBuffer.append(TEXT_145);

 						}

 					}

 				}

@@ -1275,15 +1283,18 @@
 				stringBuffer.append(TEXT_50);

 			}

 			if (isImplementation) {

-				stringBuffer.append(TEXT_154);

+				if (useInterfaceOverrideAnnotation) {

+					stringBuffer.append(TEXT_156);

+				}

+				stringBuffer.append(TEXT_157);

 				stringBuffer.append(genClassifier.getImportedMetaType());

-				stringBuffer.append(TEXT_155);

+				stringBuffer.append(TEXT_158);

 				stringBuffer.append(genClassifier.getClassifierAccessorName());

-				stringBuffer.append(TEXT_156);

+				stringBuffer.append(TEXT_159);

 				if (genPackage.isLoadedInitialization()) {

-					stringBuffer.append(TEXT_157);

+					stringBuffer.append(TEXT_160);

 					stringBuffer.append(genClassifier.getClassifierInstanceName());

-					stringBuffer.append(TEXT_158);

+					stringBuffer.append(TEXT_161);

 					stringBuffer.append(genClassifier.getClassifierInstanceName());

 					stringBuffer.append(TEXT_97);

 					stringBuffer.append(genClassifier.getImportedMetaType());

@@ -1291,46 +1302,46 @@
 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage"));

 					stringBuffer.append(TEXT_78);

 					stringBuffer.append(genPackage.getImportedPackageInterfaceName());

-					stringBuffer.append(TEXT_159);

+					stringBuffer.append(TEXT_162);

 					stringBuffer.append(genPackage.getLocalClassifierIndex(genClassifier));

-					stringBuffer.append(TEXT_160);

+					stringBuffer.append(TEXT_163);

 				}

-				stringBuffer.append(TEXT_161);

+				stringBuffer.append(TEXT_164);

 				stringBuffer.append(genClassifier.getClassifierInstanceName());

-				stringBuffer.append(TEXT_162);

+				stringBuffer.append(TEXT_165);

 			} else {

 				stringBuffer.append(TEXT_51);

 				stringBuffer.append(genClassifier.getImportedMetaType());

-				stringBuffer.append(TEXT_155);

+				stringBuffer.append(TEXT_158);

 				stringBuffer.append(genClassifier.getClassifierAccessorName());

-				stringBuffer.append(TEXT_163);

+				stringBuffer.append(TEXT_166);

 			}

 			if (genClassifier instanceof GenClass) {

 				GenClass genClass = (GenClass) genClassifier;

 				for (GenFeature genFeature : genClass.getGenFeatures()) {

 					if (isInterface) {

-						stringBuffer.append(TEXT_164);

+						stringBuffer.append(TEXT_167);

 						stringBuffer.append(genFeature.getFeatureKind());

-						stringBuffer.append(TEXT_165);

+						stringBuffer.append(TEXT_168);

 						stringBuffer.append(genClass.getRawQualifiedInterfaceName());

 						if (!genClass.isMapEntry() && !genFeature.isSuppressedGetVisibility()) {

-							stringBuffer.append(TEXT_166);

+							stringBuffer.append(TEXT_169);

 							stringBuffer.append(genFeature.getGetAccessor());

 						}

 						stringBuffer.append(TEXT_40);

 						stringBuffer.append(genFeature.getFormattedName());

-						stringBuffer.append(TEXT_167);

+						stringBuffer.append(TEXT_170);

 						stringBuffer.append(genFeature.getFeatureKind());

-						stringBuffer.append(TEXT_168);

+						stringBuffer.append(TEXT_171);

 						stringBuffer.append(genFeature.getFormattedName());

-						stringBuffer.append(TEXT_140);

+						stringBuffer.append(TEXT_142);

 						stringBuffer.append(genClass.getRawQualifiedInterfaceName());

 						if (!genClass.isMapEntry() && !genFeature.isSuppressedGetVisibility()) {

-							stringBuffer.append(TEXT_166);

+							stringBuffer.append(TEXT_169);

 							stringBuffer.append(genFeature.getGetAccessor());

 							stringBuffer.append(TEXT_47);

 						}

-						stringBuffer.append(TEXT_169);

+						stringBuffer.append(TEXT_172);

 						stringBuffer.append(genClass.getClassifierAccessorName());

 						stringBuffer.append(TEXT_47);

 						if (genFeature.hasImplicitAPITags()) {

@@ -1350,56 +1361,59 @@
 						stringBuffer.append(TEXT_50);

 					}

 					if (isImplementation) {

-						stringBuffer.append(TEXT_154);

+						if (useInterfaceOverrideAnnotation) {

+							stringBuffer.append(TEXT_156);

+						}

+						stringBuffer.append(TEXT_157);

 						stringBuffer.append(genFeature.getImportedMetaType());

-						stringBuffer.append(TEXT_155);

+						stringBuffer.append(TEXT_158);

 						stringBuffer.append(genFeature.getFeatureAccessorName());

-						stringBuffer.append(TEXT_156);

+						stringBuffer.append(TEXT_159);

 						if (!genPackage.isLoadedInitialization()) {

-							stringBuffer.append(TEXT_170);

+							stringBuffer.append(TEXT_173);

 							stringBuffer.append(genFeature.getImportedMetaType());

 							stringBuffer.append(TEXT_77);

 							stringBuffer.append(genClass.getClassifierInstanceName());

-							stringBuffer.append(TEXT_171);

-							stringBuffer.append(genClass.getLocalFeatureIndex(genFeature));

-							stringBuffer.append(TEXT_172);

-						} else {

-							stringBuffer.append(TEXT_173);

-							stringBuffer.append(genFeature.getImportedMetaType());

 							stringBuffer.append(TEXT_174);

-							stringBuffer.append(genClassifier.getClassifierAccessorName());

-							stringBuffer.append(TEXT_175);

 							stringBuffer.append(genClass.getLocalFeatureIndex(genFeature));

-							stringBuffer.append(TEXT_172);

+							stringBuffer.append(TEXT_175);

+						} else {

+							stringBuffer.append(TEXT_176);

+							stringBuffer.append(genFeature.getImportedMetaType());

+							stringBuffer.append(TEXT_177);

+							stringBuffer.append(genClassifier.getClassifierAccessorName());

+							stringBuffer.append(TEXT_178);

+							stringBuffer.append(genClass.getLocalFeatureIndex(genFeature));

+							stringBuffer.append(TEXT_175);

 						}

-						stringBuffer.append(TEXT_137);

+						stringBuffer.append(TEXT_139);

 					} else {

 						stringBuffer.append(TEXT_51);

 						stringBuffer.append(genFeature.getImportedMetaType());

-						stringBuffer.append(TEXT_155);

+						stringBuffer.append(TEXT_158);

 						stringBuffer.append(genFeature.getFeatureAccessorName());

-						stringBuffer.append(TEXT_176);

+						stringBuffer.append(TEXT_179);

 					}

 					stringBuffer.append(TEXT_4);

 				}

 				if (genModel.isOperationReflection()) {

 					for (GenOperation genOperation : genClass.getGenOperations()) {

 						if (isInterface) {

-							stringBuffer.append(TEXT_177);

-							stringBuffer.append(genClass.getRawQualifiedInterfaceName());

-							stringBuffer.append(TEXT_166);

-							stringBuffer.append(genOperation.getName());

-							stringBuffer.append(TEXT_178);

-							stringBuffer.append(genOperation.getParameterTypes(", "));

-							stringBuffer.append(TEXT_179);

-							stringBuffer.append(genOperation.getFormattedName());

 							stringBuffer.append(TEXT_180);

-							stringBuffer.append(genOperation.getFormattedName());

-							stringBuffer.append(TEXT_181);

 							stringBuffer.append(genClass.getRawQualifiedInterfaceName());

-							stringBuffer.append(TEXT_166);

+							stringBuffer.append(TEXT_169);

 							stringBuffer.append(genOperation.getName());

-							stringBuffer.append(TEXT_178);

+							stringBuffer.append(TEXT_181);

+							stringBuffer.append(genOperation.getParameterTypes(", "));

+							stringBuffer.append(TEXT_182);

+							stringBuffer.append(genOperation.getFormattedName());

+							stringBuffer.append(TEXT_183);

+							stringBuffer.append(genOperation.getFormattedName());

+							stringBuffer.append(TEXT_184);

+							stringBuffer.append(genClass.getRawQualifiedInterfaceName());

+							stringBuffer.append(TEXT_169);

+							stringBuffer.append(genOperation.getName());

+							stringBuffer.append(TEXT_181);

 							stringBuffer.append(genOperation.getParameterTypes(", "));

 							stringBuffer.append(TEXT_77);

 							if (genOperation.hasImplicitAPITags()) {

@@ -1421,31 +1435,34 @@
 							stringBuffer.append(TEXT_50);

 						}

 						if (isImplementation) {

-							stringBuffer.append(TEXT_154);

-							stringBuffer.append(genOperation.getImportedMetaType());

-							stringBuffer.append(TEXT_155);

-							stringBuffer.append(genOperation.getOperationAccessorName());

-							stringBuffer.append(TEXT_156);

-							if (!genPackage.isLoadedInitialization()) {

-								stringBuffer.append(TEXT_161);

-								stringBuffer.append(genClass.getClassifierInstanceName());

-								stringBuffer.append(TEXT_182);

-								stringBuffer.append(genClass.getLocalOperationIndex(genOperation));

-								stringBuffer.append(TEXT_172);

-							} else {

-								stringBuffer.append(TEXT_183);

-								stringBuffer.append(genClassifier.getClassifierAccessorName());

-								stringBuffer.append(TEXT_184);

-								stringBuffer.append(genClass.getLocalOperationIndex(genOperation));

-								stringBuffer.append(TEXT_172);

+							if (useInterfaceOverrideAnnotation) {

+								stringBuffer.append(TEXT_156);

 							}

-							stringBuffer.append(TEXT_137);

+							stringBuffer.append(TEXT_157);

+							stringBuffer.append(genOperation.getImportedMetaType());

+							stringBuffer.append(TEXT_158);

+							stringBuffer.append(genOperation.getOperationAccessorName());

+							stringBuffer.append(TEXT_159);

+							if (!genPackage.isLoadedInitialization()) {

+								stringBuffer.append(TEXT_164);

+								stringBuffer.append(genClass.getClassifierInstanceName());

+								stringBuffer.append(TEXT_185);

+								stringBuffer.append(genClass.getLocalOperationIndex(genOperation));

+								stringBuffer.append(TEXT_175);

+							} else {

+								stringBuffer.append(TEXT_186);

+								stringBuffer.append(genClassifier.getClassifierAccessorName());

+								stringBuffer.append(TEXT_187);

+								stringBuffer.append(genClass.getLocalOperationIndex(genOperation));

+								stringBuffer.append(TEXT_175);

+							}

+							stringBuffer.append(TEXT_139);

 						} else {

 							stringBuffer.append(TEXT_51);

 							stringBuffer.append(genOperation.getImportedMetaType());

-							stringBuffer.append(TEXT_155);

+							stringBuffer.append(TEXT_158);

 							stringBuffer.append(genOperation.getOperationAccessorName());

-							stringBuffer.append(TEXT_176);

+							stringBuffer.append(TEXT_179);

 						}

 						stringBuffer.append(TEXT_4);

 					}

@@ -1453,29 +1470,32 @@
 			}

 		}

 		if (isInterface) {

-			stringBuffer.append(TEXT_185);

+			stringBuffer.append(TEXT_188);

 		} else {

-			stringBuffer.append(TEXT_186);

+			stringBuffer.append(TEXT_189);

 		}

 		if (isImplementation) {

-			stringBuffer.append(TEXT_154);

+			if (useInterfaceOverrideAnnotation) {

+				stringBuffer.append(TEXT_156);

+			}

+			stringBuffer.append(TEXT_157);

 			stringBuffer.append(genPackage.getImportedFactoryInterfaceName());

-			stringBuffer.append(TEXT_155);

+			stringBuffer.append(TEXT_158);

 			stringBuffer.append(genPackage.getFactoryName());

-			stringBuffer.append(TEXT_187);

+			stringBuffer.append(TEXT_190);

 			stringBuffer.append(genPackage.getImportedFactoryInterfaceName());

-			stringBuffer.append(TEXT_188);

+			stringBuffer.append(TEXT_191);

 		} else {

 			stringBuffer.append(TEXT_51);

 			stringBuffer.append(genPackage.getFactoryInterfaceName());

-			stringBuffer.append(TEXT_155);

+			stringBuffer.append(TEXT_158);

 			stringBuffer.append(genPackage.getFactoryName());

-			stringBuffer.append(TEXT_176);

+			stringBuffer.append(TEXT_179);

 		}

 		stringBuffer.append(TEXT_4);

 		if (isImplementation) {

 			if (!genPackage.isLoadedInitialization()) {

-				stringBuffer.append(TEXT_189);

+				stringBuffer.append(TEXT_192);

 				{

 					boolean needsSuppressDeprecation = false;

 					if (!packageNeedsSuppressDeprecation && isJDK50) {

@@ -1494,38 +1514,38 @@
 							}

 						}

 						if (needsSuppressDeprecation) {

-							stringBuffer.append(TEXT_190);

+							stringBuffer.append(TEXT_193);

 						}

 					}

 				}

-				stringBuffer.append(TEXT_191);

+				stringBuffer.append(TEXT_194);

 				if (!genPackage.getGenClasses().isEmpty()) {

-					stringBuffer.append(TEXT_192);

+					stringBuffer.append(TEXT_195);

 					for (Iterator<GenClass> c = genPackage.getGenClasses().iterator(); c.hasNext();) {

 						GenClass genClass = c.next();

 						stringBuffer.append(TEXT_91);

 						stringBuffer.append(genClass.getClassifierInstanceName());

-						stringBuffer.append(TEXT_193);

+						stringBuffer.append(TEXT_196);

 						stringBuffer.append(genClass.getMetaType());

-						stringBuffer.append(TEXT_178);

+						stringBuffer.append(TEXT_181);

 						stringBuffer.append(genClass.getClassifierID());

-						stringBuffer.append(TEXT_172);

+						stringBuffer.append(TEXT_175);

 						for (GenFeature genFeature : genClass.getGenFeatures()) {

-							stringBuffer.append(TEXT_194);

+							stringBuffer.append(TEXT_197);

 							stringBuffer.append(genFeature.getMetaType());

-							stringBuffer.append(TEXT_178);

+							stringBuffer.append(TEXT_181);

 							stringBuffer.append(genClass.getClassifierInstanceName());

-							stringBuffer.append(TEXT_195);

+							stringBuffer.append(TEXT_198);

 							stringBuffer.append(genClass.getFeatureID(genFeature));

-							stringBuffer.append(TEXT_172);

+							stringBuffer.append(TEXT_175);

 						}

 						if (genModel.isOperationReflection()) {

 							for (GenOperation genOperation : genClass.getGenOperations()) {

-								stringBuffer.append(TEXT_196);

+								stringBuffer.append(TEXT_199);

 								stringBuffer.append(genClass.getClassifierInstanceName());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genClass.getOperationID(genOperation, false));

-								stringBuffer.append(TEXT_172);

+								stringBuffer.append(TEXT_175);

 							}

 						}

 						if (c.hasNext()) {

@@ -1534,26 +1554,26 @@
 					}

 				}

 				if (!genPackage.getGenEnums().isEmpty()) {

-					stringBuffer.append(TEXT_197);

+					stringBuffer.append(TEXT_200);

 					for (GenEnum genEnum : genPackage.getGenEnums()) {

 						stringBuffer.append(TEXT_91);

 						stringBuffer.append(genEnum.getClassifierInstanceName());

-						stringBuffer.append(TEXT_198);

+						stringBuffer.append(TEXT_201);

 						stringBuffer.append(genEnum.getClassifierID());

-						stringBuffer.append(TEXT_172);

+						stringBuffer.append(TEXT_175);

 					}

 				}

 				if (!genPackage.getGenDataTypes().isEmpty()) {

-					stringBuffer.append(TEXT_199);

+					stringBuffer.append(TEXT_202);

 					for (GenDataType genDataType : genPackage.getGenDataTypes()) {

 						stringBuffer.append(TEXT_91);

 						stringBuffer.append(genDataType.getClassifierInstanceName());

-						stringBuffer.append(TEXT_200);

+						stringBuffer.append(TEXT_203);

 						stringBuffer.append(genDataType.getClassifierID());

-						stringBuffer.append(TEXT_172);

+						stringBuffer.append(TEXT_175);

 					}

 				}

-				stringBuffer.append(TEXT_201);

+				stringBuffer.append(TEXT_204);

 

 				///////////////////////

 				class Information {

@@ -1613,7 +1633,7 @@
 				///////////////////////

 				int maxGenericTypeAssignment = 0;

 

-				stringBuffer.append(TEXT_202);

+				stringBuffer.append(TEXT_205);

 				{

 					boolean needsSuppressDeprecation = false;

 					if (!packageNeedsSuppressDeprecation && isJDK50) {

@@ -1626,13 +1646,13 @@
 							}

 						}

 						if (needsSuppressDeprecation) {

-							stringBuffer.append(TEXT_190);

+							stringBuffer.append(TEXT_193);

 						}

 					}

 				}

-				stringBuffer.append(TEXT_203);

+				stringBuffer.append(TEXT_206);

 				if (!genPackage.getPackageInitializationDependencies().isEmpty()) {

-					stringBuffer.append(TEXT_204);

+					stringBuffer.append(TEXT_207);

 					for (GenPackage dep : genPackage.getPackageInitializationDependencies()) {

 						stringBuffer.append(TEXT_91);

 						stringBuffer.append(dep.getImportedPackageInterfaceName());

@@ -1644,22 +1664,22 @@
 						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage"));

 						stringBuffer.append(TEXT_78);

 						stringBuffer.append(dep.getImportedPackageInterfaceName());

-						stringBuffer.append(TEXT_205);

+						stringBuffer.append(TEXT_208);

 					}

 				}

 				if (!genPackage.getSubGenPackages().isEmpty()) {

-					stringBuffer.append(TEXT_206);

+					stringBuffer.append(TEXT_209);

 					for (GenPackage sub : genPackage.getSubGenPackages()) {

-						stringBuffer.append(TEXT_207);

+						stringBuffer.append(TEXT_210);

 						stringBuffer.append(genPackage.getPackageInstanceVariable(sub));

-						stringBuffer.append(TEXT_172);

+						stringBuffer.append(TEXT_175);

 					}

 				}

 				if (!genPackage.getGenClasses().isEmpty()) {

 					boolean firstOperationAssignment = true;

 					int maxTypeParameterAssignment = 0;

 					if (genModel.useGenerics()) {

-						stringBuffer.append(TEXT_208);

+						stringBuffer.append(TEXT_211);

 						for (GenClassifier genClassifier : genPackage.getGenClassifiers()) {

 							for (GenTypeParameter genTypeParameter : genClassifier.getGenTypeParameters()) {

 								if (!genTypeParameter.getEcoreTypeParameter().getEBounds().isEmpty()

@@ -1669,27 +1689,27 @@
 											.append(genModel.getImportedName("org.eclipse.emf.ecore.ETypeParameter"));

 									stringBuffer.append(TEXT_67);

 									stringBuffer.append(genClassifier.getClassifierInstanceName());

-									stringBuffer.append(TEXT_209);

-									stringBuffer.append(genTypeParameter.getName());

-									stringBuffer.append(TEXT_210);

-									stringBuffer.append(genClassifier.getClassifierInstanceName());

-									stringBuffer.append(TEXT_211);

-									stringBuffer.append(genTypeParameter.getName());

 									stringBuffer.append(TEXT_212);

-									stringBuffer.append(genModel.getNonNLS());

-								} else {

+									stringBuffer.append(genTypeParameter.getName());

 									stringBuffer.append(TEXT_213);

 									stringBuffer.append(genClassifier.getClassifierInstanceName());

-									stringBuffer.append(TEXT_211);

+									stringBuffer.append(TEXT_214);

 									stringBuffer.append(genTypeParameter.getName());

-									stringBuffer.append(TEXT_212);

+									stringBuffer.append(TEXT_215);

+									stringBuffer.append(genModel.getNonNLS());

+								} else {

+									stringBuffer.append(TEXT_216);

+									stringBuffer.append(genClassifier.getClassifierInstanceName());

+									stringBuffer.append(TEXT_214);

+									stringBuffer.append(genTypeParameter.getName());

+									stringBuffer.append(TEXT_215);

 									stringBuffer.append(genModel.getNonNLS());

 								}

 							}

 						}

 					}

 					if (genModel.useGenerics()) {

-						stringBuffer.append(TEXT_214);

+						stringBuffer.append(TEXT_217);

 						for (GenClassifier genClassifier : genPackage.getGenClassifiers()) {

 							for (GenTypeParameter genTypeParameter : genClassifier.getGenTypeParameters()) {

 								for (EGenericType bound : genTypeParameter.getEcoreTypeParameter().getEBounds()) {

@@ -1703,42 +1723,42 @@
 										}

 										stringBuffer.append(TEXT_91);

 										stringBuffer.append(prefix);

-										stringBuffer.append(TEXT_215);

+										stringBuffer.append(TEXT_218);

 										stringBuffer.append(info.depth + 1);

-										stringBuffer.append(TEXT_216);

+										stringBuffer.append(TEXT_219);

 										stringBuffer.append(info.type);

-										stringBuffer.append(TEXT_172);

+										stringBuffer.append(TEXT_175);

 										if (info.depth > 0) {

-											stringBuffer.append(TEXT_217);

+											stringBuffer.append(TEXT_220);

 											stringBuffer.append(info.depth);

-											stringBuffer.append(TEXT_218);

+											stringBuffer.append(TEXT_221);

 											stringBuffer.append(info.accessor);

-											stringBuffer.append(TEXT_219);

+											stringBuffer.append(TEXT_222);

 											stringBuffer.append(info.depth + 1);

-											stringBuffer.append(TEXT_172);

+											stringBuffer.append(TEXT_175);

 										}

 									}

 									stringBuffer.append(TEXT_91);

 									stringBuffer.append(genClassifier.getClassifierInstanceName());

-									stringBuffer.append(TEXT_209);

+									stringBuffer.append(TEXT_212);

 									stringBuffer.append(genTypeParameter.getName());

-									stringBuffer.append(TEXT_220);

+									stringBuffer.append(TEXT_223);

 								}

 							}

 						}

 					}

-					stringBuffer.append(TEXT_221);

+					stringBuffer.append(TEXT_224);

 					for (GenClass genClass : genPackage.getGenClasses()) {

 						if (!genClass.hasGenericSuperTypes()) {

 							for (GenClass baseGenClass : genClass.getBaseGenClasses()) {

 								stringBuffer.append(TEXT_91);

 								stringBuffer.append(genClass.getClassifierInstanceName());

-								stringBuffer.append(TEXT_222);

+								stringBuffer.append(TEXT_225);

 								stringBuffer

 										.append(genPackage.getPackageInstanceVariable(baseGenClass.getGenPackage()));

-								stringBuffer.append(TEXT_223);

+								stringBuffer.append(TEXT_226);

 								stringBuffer.append(baseGenClass.getClassifierAccessorName());

-								stringBuffer.append(TEXT_224);

+								stringBuffer.append(TEXT_227);

 							}

 						} else {

 							for (EGenericType superType : genClass.getEcoreClass().getEGenericSuperTypes()) {

@@ -1751,61 +1771,61 @@
 									}

 									stringBuffer.append(TEXT_91);

 									stringBuffer.append(prefix);

-									stringBuffer.append(TEXT_215);

+									stringBuffer.append(TEXT_218);

 									stringBuffer.append(info.depth + 1);

-									stringBuffer.append(TEXT_216);

+									stringBuffer.append(TEXT_219);

 									stringBuffer.append(info.type);

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									if (info.depth > 0) {

-										stringBuffer.append(TEXT_217);

+										stringBuffer.append(TEXT_220);

 										stringBuffer.append(info.depth);

-										stringBuffer.append(TEXT_218);

+										stringBuffer.append(TEXT_221);

 										stringBuffer.append(info.accessor);

-										stringBuffer.append(TEXT_219);

+										stringBuffer.append(TEXT_222);

 										stringBuffer.append(info.depth + 1);

-										stringBuffer.append(TEXT_172);

+										stringBuffer.append(TEXT_175);

 									}

 								}

 								stringBuffer.append(TEXT_91);

 								stringBuffer.append(genClass.getClassifierInstanceName());

-								stringBuffer.append(TEXT_225);

+								stringBuffer.append(TEXT_228);

 							}

 						}

 					}

-					stringBuffer.append(TEXT_226);

+					stringBuffer.append(TEXT_229);

 					if (genModel.isOperationReflection()) {

-						stringBuffer.append(TEXT_227);

+						stringBuffer.append(TEXT_230);

 					} else {

-						stringBuffer.append(TEXT_228);

+						stringBuffer.append(TEXT_231);

 					}

 					for (Iterator<GenClass> c = genPackage.getGenClasses().iterator(); c.hasNext();) {

 						GenClass genClass = c.next();

 						boolean hasInstanceTypeName = genModel.useGenerics()

 								&& genClass.getEcoreClass().getInstanceTypeName() != null

 								&& genClass.getEcoreClass().getInstanceTypeName().contains("<");

-						stringBuffer.append(TEXT_229);

+						stringBuffer.append(TEXT_232);

 						stringBuffer.append(genClass.getClassifierInstanceName());

-						stringBuffer.append(TEXT_195);

+						stringBuffer.append(TEXT_198);

 						if (genClass.isDynamic()) {

-							stringBuffer.append(TEXT_230);

+							stringBuffer.append(TEXT_233);

 						} else {

 							stringBuffer.append(genClass.getRawImportedInterfaceName());

-							stringBuffer.append(TEXT_231);

+							stringBuffer.append(TEXT_234);

 						}

-						stringBuffer.append(TEXT_211);

+						stringBuffer.append(TEXT_214);

 						stringBuffer.append(genClass.getName());

-						stringBuffer.append(TEXT_232);

+						stringBuffer.append(TEXT_235);

 						stringBuffer.append(genClass.getAbstractFlag());

-						stringBuffer.append(TEXT_195);

+						stringBuffer.append(TEXT_198);

 						stringBuffer.append(genClass.getInterfaceFlag());

-						stringBuffer.append(TEXT_195);

+						stringBuffer.append(TEXT_198);

 						stringBuffer.append(genClass.getGeneratedInstanceClassFlag());

 						if (hasInstanceTypeName) {

-							stringBuffer.append(TEXT_211);

+							stringBuffer.append(TEXT_214);

 							stringBuffer.append(genClass.getEcoreClass().getInstanceTypeName());

-							stringBuffer.append(TEXT_233);

+							stringBuffer.append(TEXT_236);

 						}

-						stringBuffer.append(TEXT_172);

+						stringBuffer.append(TEXT_175);

 						stringBuffer.append(genModel.getNonNLS());

 						if (hasInstanceTypeName) {

 							stringBuffer.append(genModel.getNonNLS(2));

@@ -1822,19 +1842,19 @@
 									}

 									stringBuffer.append(TEXT_91);

 									stringBuffer.append(prefix);

-									stringBuffer.append(TEXT_215);

+									stringBuffer.append(TEXT_218);

 									stringBuffer.append(info.depth + 1);

-									stringBuffer.append(TEXT_216);

+									stringBuffer.append(TEXT_219);

 									stringBuffer.append(info.type);

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									if (info.depth > 0) {

-										stringBuffer.append(TEXT_217);

+										stringBuffer.append(TEXT_220);

 										stringBuffer.append(info.depth);

-										stringBuffer.append(TEXT_218);

+										stringBuffer.append(TEXT_221);

 										stringBuffer.append(info.accessor);

-										stringBuffer.append(TEXT_219);

+										stringBuffer.append(TEXT_222);

 										stringBuffer.append(info.depth + 1);

-										stringBuffer.append(TEXT_172);

+										stringBuffer.append(TEXT_175);

 									}

 								}

 							}

@@ -1843,101 +1863,101 @@
 								String reverse = reverseGenFeature == null ? "null"

 										: genPackage.getPackageInstanceVariable(reverseGenFeature.getGenPackage())

 												+ ".get" + reverseGenFeature.getFeatureAccessorName() + "()";

-								stringBuffer.append(TEXT_234);

+								stringBuffer.append(TEXT_237);

 								stringBuffer.append(genFeature.getFeatureAccessorName());

-								stringBuffer.append(TEXT_235);

+								stringBuffer.append(TEXT_238);

 								if (genFeature.hasGenericType()) {

-									stringBuffer.append(TEXT_236);

+									stringBuffer.append(TEXT_239);

 								} else {

 									stringBuffer.append(

 											genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage()));

-									stringBuffer.append(TEXT_223);

+									stringBuffer.append(TEXT_226);

 									stringBuffer.append(genFeature.getTypeClassifierAccessorName());

 									stringBuffer.append(TEXT_47);

 								}

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(reverse);

-								stringBuffer.append(TEXT_211);

+								stringBuffer.append(TEXT_214);

 								stringBuffer.append(genFeature.getName());

-								stringBuffer.append(TEXT_232);

+								stringBuffer.append(TEXT_235);

 								stringBuffer.append(genFeature.getDefaultValue());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getLowerBound());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getUpperBound());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getContainerClass());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getTransientFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getVolatileFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getChangeableFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getContainmentFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getResolveProxiesFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getUnsettableFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getUniqueFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getDerivedFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getOrderedFlag());

-								stringBuffer.append(TEXT_172);

+								stringBuffer.append(TEXT_175);

 								stringBuffer.append(genModel.getNonNLS());

 								stringBuffer.append(genModel.getNonNLS(genFeature.getDefaultValue(), 2));

 								for (GenFeature keyFeature : genFeature.getKeys()) {

-									stringBuffer.append(TEXT_237);

+									stringBuffer.append(TEXT_240);

 									stringBuffer.append(genFeature.getFeatureAccessorName());

-									stringBuffer.append(TEXT_238);

+									stringBuffer.append(TEXT_241);

 									stringBuffer

 											.append(genPackage.getPackageInstanceVariable(keyFeature.getGenPackage()));

-									stringBuffer.append(TEXT_223);

+									stringBuffer.append(TEXT_226);

 									stringBuffer.append(keyFeature.getFeatureAccessorName());

-									stringBuffer.append(TEXT_224);

+									stringBuffer.append(TEXT_227);

 								}

 							} else {

-								stringBuffer.append(TEXT_239);

+								stringBuffer.append(TEXT_242);

 								stringBuffer.append(genFeature.getFeatureAccessorName());

-								stringBuffer.append(TEXT_235);

+								stringBuffer.append(TEXT_238);

 								if (genFeature.hasGenericType()) {

-									stringBuffer.append(TEXT_236);

+									stringBuffer.append(TEXT_239);

 								} else {

 									stringBuffer.append(

 											genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage()));

-									stringBuffer.append(TEXT_223);

+									stringBuffer.append(TEXT_226);

 									stringBuffer.append(genFeature.getTypeClassifierAccessorName());

 									stringBuffer.append(TEXT_47);

 								}

-								stringBuffer.append(TEXT_211);

+								stringBuffer.append(TEXT_214);

 								stringBuffer.append(genFeature.getName());

-								stringBuffer.append(TEXT_232);

+								stringBuffer.append(TEXT_235);

 								stringBuffer.append(genFeature.getDefaultValue());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getLowerBound());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getUpperBound());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getContainerClass());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getTransientFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getVolatileFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getChangeableFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getUnsettableFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getIDFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getUniqueFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getDerivedFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getOrderedFlag());

-								stringBuffer.append(TEXT_172);

+								stringBuffer.append(TEXT_175);

 								stringBuffer.append(genModel.getNonNLS());

 								stringBuffer.append(genModel.getNonNLS(genFeature.getDefaultValue(), 2));

 							}

@@ -1959,34 +1979,34 @@
 								stringBuffer.append(TEXT_91);

 								stringBuffer.append(prefix);

 								if (genModel.isOperationReflection()) {

-									stringBuffer.append(TEXT_240);

+									stringBuffer.append(TEXT_243);

 									stringBuffer.append(genOperation.getOperationAccessorName());

 									stringBuffer.append(TEXT_47);

 								} else {

-									stringBuffer.append(TEXT_241);

+									stringBuffer.append(TEXT_244);

 									stringBuffer.append(genClass.getClassifierInstanceName());

 								}

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								if (genOperation.isVoid() || genOperation.hasGenericType()) {

-									stringBuffer.append(TEXT_230);

+									stringBuffer.append(TEXT_233);

 								} else {

 									stringBuffer.append(

 											genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage()));

-									stringBuffer.append(TEXT_223);

+									stringBuffer.append(TEXT_226);

 									stringBuffer.append(genOperation.getTypeClassifierAccessorName());

 									stringBuffer.append(TEXT_47);

 								}

-								stringBuffer.append(TEXT_211);

+								stringBuffer.append(TEXT_214);

 								stringBuffer.append(genOperation.getName());

-								stringBuffer.append(TEXT_232);

+								stringBuffer.append(TEXT_235);

 								stringBuffer.append(genOperation.getLowerBound());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genOperation.getUpperBound());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genOperation.getUniqueFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genOperation.getOrderedFlag());

-								stringBuffer.append(TEXT_172);

+								stringBuffer.append(TEXT_175);

 								stringBuffer.append(genModel.getNonNLS());

 							} else if (!genOperation.isVoid()) {

 								if (!genOperation.getEcoreOperation().isOrdered()

@@ -1995,69 +2015,69 @@
 									stringBuffer.append(TEXT_91);

 									stringBuffer.append(prefix);

 									if (genModel.isOperationReflection()) {

-										stringBuffer.append(TEXT_240);

+										stringBuffer.append(TEXT_243);

 										stringBuffer.append(genOperation.getOperationAccessorName());

 										stringBuffer.append(TEXT_47);

 									} else {

-										stringBuffer.append(TEXT_241);

+										stringBuffer.append(TEXT_244);

 										stringBuffer.append(genClass.getClassifierInstanceName());

 									}

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(

 											genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage()));

-									stringBuffer.append(TEXT_223);

+									stringBuffer.append(TEXT_226);

 									stringBuffer.append(genOperation.getTypeClassifierAccessorName());

-									stringBuffer.append(TEXT_242);

+									stringBuffer.append(TEXT_245);

 									stringBuffer.append(genOperation.getName());

-									stringBuffer.append(TEXT_232);

+									stringBuffer.append(TEXT_235);

 									stringBuffer.append(genOperation.getLowerBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genOperation.getUpperBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genOperation.getUniqueFlag());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genOperation.getOrderedFlag());

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									stringBuffer.append(genModel.getNonNLS());

 								} else {

 									stringBuffer.append(TEXT_91);

 									stringBuffer.append(prefix);

 									if (genModel.isOperationReflection()) {

-										stringBuffer.append(TEXT_240);

+										stringBuffer.append(TEXT_243);

 										stringBuffer.append(genOperation.getOperationAccessorName());

 										stringBuffer.append(TEXT_47);

 									} else {

-										stringBuffer.append(TEXT_241);

+										stringBuffer.append(TEXT_244);

 										stringBuffer.append(genClass.getClassifierInstanceName());

 									}

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(

 											genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage()));

-									stringBuffer.append(TEXT_223);

+									stringBuffer.append(TEXT_226);

 									stringBuffer.append(genOperation.getTypeClassifierAccessorName());

-									stringBuffer.append(TEXT_242);

+									stringBuffer.append(TEXT_245);

 									stringBuffer.append(genOperation.getName());

-									stringBuffer.append(TEXT_232);

+									stringBuffer.append(TEXT_235);

 									stringBuffer.append(genOperation.getLowerBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genOperation.getUpperBound());

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									stringBuffer.append(genModel.getNonNLS());

 								}

 							} else {

 								stringBuffer.append(TEXT_91);

 								stringBuffer.append(prefix);

 								if (genModel.isOperationReflection()) {

-									stringBuffer.append(TEXT_240);

+									stringBuffer.append(TEXT_243);

 									stringBuffer.append(genOperation.getOperationAccessorName());

 									stringBuffer.append(TEXT_47);

 								} else {

-									stringBuffer.append(TEXT_241);

+									stringBuffer.append(TEXT_244);

 									stringBuffer.append(genClass.getClassifierInstanceName());

 								}

-								stringBuffer.append(TEXT_243);

+								stringBuffer.append(TEXT_246);

 								stringBuffer.append(genOperation.getName());

-								stringBuffer.append(TEXT_212);

+								stringBuffer.append(TEXT_215);

 								stringBuffer.append(genModel.getNonNLS());

 							}

 							if (genModel.useGenerics()) {

@@ -2078,9 +2098,9 @@
 									}

 									stringBuffer.append(TEXT_91);

 									stringBuffer.append(typeParameterVariable);

-									stringBuffer.append(TEXT_244);

+									stringBuffer.append(TEXT_247);

 									stringBuffer.append(genTypeParameter.getName());

-									stringBuffer.append(TEXT_212);

+									stringBuffer.append(TEXT_215);

 									stringBuffer.append(genModel.getNonNLS());

 									for (EGenericType typeParameter : genTypeParameter.getEcoreTypeParameter()

 											.getEBounds()) {

@@ -2095,24 +2115,24 @@
 											}

 											stringBuffer.append(TEXT_91);

 											stringBuffer.append(typePrefix);

-											stringBuffer.append(TEXT_215);

+											stringBuffer.append(TEXT_218);

 											stringBuffer.append(info.depth + 1);

-											stringBuffer.append(TEXT_216);

+											stringBuffer.append(TEXT_219);

 											stringBuffer.append(info.type);

-											stringBuffer.append(TEXT_172);

+											stringBuffer.append(TEXT_175);

 											if (info.depth > 0) {

-												stringBuffer.append(TEXT_217);

+												stringBuffer.append(TEXT_220);

 												stringBuffer.append(info.depth);

-												stringBuffer.append(TEXT_218);

+												stringBuffer.append(TEXT_221);

 												stringBuffer.append(info.accessor);

-												stringBuffer.append(TEXT_219);

+												stringBuffer.append(TEXT_222);

 												stringBuffer.append(info.depth + 1);

-												stringBuffer.append(TEXT_172);

+												stringBuffer.append(TEXT_175);

 											}

 										}

-										stringBuffer.append(TEXT_245);

+										stringBuffer.append(TEXT_248);

 										stringBuffer.append(t.nextIndex());

-										stringBuffer.append(TEXT_220);

+										stringBuffer.append(TEXT_223);

 									}

 								}

 							}

@@ -2129,88 +2149,88 @@
 										}

 										stringBuffer.append(TEXT_91);

 										stringBuffer.append(typePrefix);

-										stringBuffer.append(TEXT_215);

+										stringBuffer.append(TEXT_218);

 										stringBuffer.append(info.depth + 1);

-										stringBuffer.append(TEXT_216);

+										stringBuffer.append(TEXT_219);

 										stringBuffer.append(info.type);

-										stringBuffer.append(TEXT_172);

+										stringBuffer.append(TEXT_175);

 										if (info.depth > 0) {

-											stringBuffer.append(TEXT_217);

+											stringBuffer.append(TEXT_220);

 											stringBuffer.append(info.depth);

-											stringBuffer.append(TEXT_218);

+											stringBuffer.append(TEXT_221);

 											stringBuffer.append(info.accessor);

-											stringBuffer.append(TEXT_219);

+											stringBuffer.append(TEXT_222);

 											stringBuffer.append(info.depth + 1);

-											stringBuffer.append(TEXT_172);

+											stringBuffer.append(TEXT_175);

 										}

 									}

 								}

 								if (genModel.useGenerics()) {

-									stringBuffer.append(TEXT_246);

+									stringBuffer.append(TEXT_249);

 									if (genParameter.hasGenericType()) {

-										stringBuffer.append(TEXT_236);

+										stringBuffer.append(TEXT_239);

 									} else {

 										stringBuffer.append(genPackage

 												.getPackageInstanceVariable(genParameter.getTypeGenPackage()));

-										stringBuffer.append(TEXT_223);

+										stringBuffer.append(TEXT_226);

 										stringBuffer.append(genParameter.getTypeClassifierAccessorName());

 										stringBuffer.append(TEXT_47);

 									}

-									stringBuffer.append(TEXT_211);

+									stringBuffer.append(TEXT_214);

 									stringBuffer.append(genParameter.getName());

-									stringBuffer.append(TEXT_232);

+									stringBuffer.append(TEXT_235);

 									stringBuffer.append(genParameter.getLowerBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genParameter.getUpperBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genParameter.getUniqueFlag());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genParameter.getOrderedFlag());

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									stringBuffer.append(genModel.getNonNLS());

 								} else if (!genParameter.getEcoreParameter().isOrdered()

 										|| !genParameter.getEcoreParameter().isUnique()) {

 									needsAddEParameter = true;

-									stringBuffer.append(TEXT_246);

+									stringBuffer.append(TEXT_249);

 									if (genParameter.hasGenericType()) {

-										stringBuffer.append(TEXT_236);

+										stringBuffer.append(TEXT_239);

 									} else {

 										stringBuffer.append(genPackage

 												.getPackageInstanceVariable(genParameter.getTypeGenPackage()));

-										stringBuffer.append(TEXT_223);

+										stringBuffer.append(TEXT_226);

 										stringBuffer.append(genParameter.getTypeClassifierAccessorName());

 										stringBuffer.append(TEXT_47);

 									}

-									stringBuffer.append(TEXT_211);

+									stringBuffer.append(TEXT_214);

 									stringBuffer.append(genParameter.getName());

-									stringBuffer.append(TEXT_232);

+									stringBuffer.append(TEXT_235);

 									stringBuffer.append(genParameter.getLowerBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genParameter.getUpperBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genParameter.getUniqueFlag());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genParameter.getOrderedFlag());

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									stringBuffer.append(genModel.getNonNLS());

 								} else {

-									stringBuffer.append(TEXT_246);

+									stringBuffer.append(TEXT_249);

 									if (genParameter.hasGenericType()) {

-										stringBuffer.append(TEXT_236);

+										stringBuffer.append(TEXT_239);

 									} else {

 										stringBuffer.append(genPackage

 												.getPackageInstanceVariable(genParameter.getTypeGenPackage()));

-										stringBuffer.append(TEXT_223);

+										stringBuffer.append(TEXT_226);

 										stringBuffer.append(genParameter.getTypeClassifierAccessorName());

 										stringBuffer.append(TEXT_47);

 									}

-									stringBuffer.append(TEXT_211);

+									stringBuffer.append(TEXT_214);

 									stringBuffer.append(genParameter.getName());

-									stringBuffer.append(TEXT_232);

+									stringBuffer.append(TEXT_235);

 									stringBuffer.append(genParameter.getLowerBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genParameter.getUpperBound());

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									stringBuffer.append(genModel.getNonNLS());

 								}

 							}

@@ -2228,33 +2248,33 @@
 										}

 										stringBuffer.append(TEXT_91);

 										stringBuffer.append(typePrefix);

-										stringBuffer.append(TEXT_215);

+										stringBuffer.append(TEXT_218);

 										stringBuffer.append(info.depth + 1);

-										stringBuffer.append(TEXT_216);

+										stringBuffer.append(TEXT_219);

 										stringBuffer.append(info.type);

-										stringBuffer.append(TEXT_172);

+										stringBuffer.append(TEXT_175);

 										if (info.depth > 0) {

-											stringBuffer.append(TEXT_217);

+											stringBuffer.append(TEXT_220);

 											stringBuffer.append(info.depth);

-											stringBuffer.append(TEXT_218);

+											stringBuffer.append(TEXT_221);

 											stringBuffer.append(info.accessor);

-											stringBuffer.append(TEXT_219);

+											stringBuffer.append(TEXT_222);

 											stringBuffer.append(info.depth + 1);

-											stringBuffer.append(TEXT_172);

+											stringBuffer.append(TEXT_175);

 										}

-										stringBuffer.append(TEXT_247);

+										stringBuffer.append(TEXT_250);

 										stringBuffer.append(info.depth + 1);

-										stringBuffer.append(TEXT_172);

+										stringBuffer.append(TEXT_175);

 									}

 								}

 							} else {

 								for (GenClassifier genException : genOperation.getGenExceptions()) {

-									stringBuffer.append(TEXT_248);

+									stringBuffer.append(TEXT_251);

 									stringBuffer.append(

 											genPackage.getPackageInstanceVariable(genException.getGenPackage()));

-									stringBuffer.append(TEXT_223);

+									stringBuffer.append(TEXT_226);

 									stringBuffer.append(genException.getClassifierAccessorName());

-									stringBuffer.append(TEXT_224);

+									stringBuffer.append(TEXT_227);

 								}

 							}

 							if (!genOperation.isVoid() && genOperation.hasGenericType()) {

@@ -2269,22 +2289,22 @@
 									}

 									stringBuffer.append(TEXT_91);

 									stringBuffer.append(typePrefix);

-									stringBuffer.append(TEXT_215);

+									stringBuffer.append(TEXT_218);

 									stringBuffer.append(info.depth + 1);

-									stringBuffer.append(TEXT_216);

+									stringBuffer.append(TEXT_219);

 									stringBuffer.append(info.type);

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									if (info.depth > 0) {

-										stringBuffer.append(TEXT_217);

+										stringBuffer.append(TEXT_220);

 										stringBuffer.append(info.depth);

-										stringBuffer.append(TEXT_218);

+										stringBuffer.append(TEXT_221);

 										stringBuffer.append(info.accessor);

-										stringBuffer.append(TEXT_219);

+										stringBuffer.append(TEXT_222);

 										stringBuffer.append(info.depth + 1);

-										stringBuffer.append(TEXT_172);

+										stringBuffer.append(TEXT_175);

 									}

 								}

-								stringBuffer.append(TEXT_249);

+								stringBuffer.append(TEXT_252);

 							}

 						}

 						if (c.hasNext()) {

@@ -2293,27 +2313,27 @@
 					}

 				}

 				if (!genPackage.getGenEnums().isEmpty()) {

-					stringBuffer.append(TEXT_250);

+					stringBuffer.append(TEXT_253);

 					for (Iterator<GenEnum> e = genPackage.getGenEnums().iterator(); e.hasNext();) {

 						GenEnum genEnum = e.next();

-						stringBuffer.append(TEXT_251);

+						stringBuffer.append(TEXT_254);

 						stringBuffer.append(genEnum.getClassifierInstanceName());

-						stringBuffer.append(TEXT_195);

+						stringBuffer.append(TEXT_198);

 						stringBuffer.append(genEnum.getImportedName());

-						stringBuffer.append(TEXT_252);

+						stringBuffer.append(TEXT_255);

 						stringBuffer.append(genEnum.getName());

-						stringBuffer.append(TEXT_212);

+						stringBuffer.append(TEXT_215);

 						stringBuffer.append(genModel.getNonNLS());

 						for (GenEnumLiteral genEnumLiteral : genEnum.getGenEnumLiterals()) {

-							stringBuffer.append(TEXT_253);

+							stringBuffer.append(TEXT_256);

 							stringBuffer.append(genEnum.getClassifierInstanceName());

-							stringBuffer.append(TEXT_195);

+							stringBuffer.append(TEXT_198);

 							stringBuffer.append(genEnum.getImportedName().equals(genEnum.getClassifierID())

 									? genEnum.getQualifiedName()

 									: genEnum.getImportedName());

-							stringBuffer.append(TEXT_218);

+							stringBuffer.append(TEXT_221);

 							stringBuffer.append(genEnumLiteral.getEnumLiteralInstanceConstantName());

-							stringBuffer.append(TEXT_172);

+							stringBuffer.append(TEXT_175);

 						}

 						if (e.hasNext()) {

 							stringBuffer.append(TEXT_4);

@@ -2321,27 +2341,27 @@
 					}

 				}

 				if (!genPackage.getGenDataTypes().isEmpty()) {

-					stringBuffer.append(TEXT_254);

+					stringBuffer.append(TEXT_257);

 					for (GenDataType genDataType : genPackage.getGenDataTypes()) {

 						boolean hasInstanceTypeName = genModel.useGenerics()

 								&& genDataType.getEcoreDataType().getInstanceTypeName() != null

 								&& genDataType.getEcoreDataType().getInstanceTypeName().contains("<");

-						stringBuffer.append(TEXT_255);

+						stringBuffer.append(TEXT_258);

 						stringBuffer.append(genDataType.getClassifierInstanceName());

-						stringBuffer.append(TEXT_195);

+						stringBuffer.append(TEXT_198);

 						stringBuffer.append(genDataType.getRawImportedInstanceClassName());

-						stringBuffer.append(TEXT_252);

+						stringBuffer.append(TEXT_255);

 						stringBuffer.append(genDataType.getName());

-						stringBuffer.append(TEXT_232);

+						stringBuffer.append(TEXT_235);

 						stringBuffer.append(genDataType.getSerializableFlag());

-						stringBuffer.append(TEXT_195);

+						stringBuffer.append(TEXT_198);

 						stringBuffer.append(genDataType.getGeneratedInstanceClassFlag());

 						if (hasInstanceTypeName) {

-							stringBuffer.append(TEXT_211);

+							stringBuffer.append(TEXT_214);

 							stringBuffer.append(genDataType.getEcoreDataType().getInstanceTypeName());

-							stringBuffer.append(TEXT_233);

+							stringBuffer.append(TEXT_236);

 						}

-						stringBuffer.append(TEXT_172);

+						stringBuffer.append(TEXT_175);

 						stringBuffer.append(genModel.getNonNLS());

 						if (hasInstanceTypeName) {

 							stringBuffer.append(genModel.getNonNLS(2));

@@ -2349,31 +2369,31 @@
 					}

 				}

 				if (genPackage.getSuperGenPackage() == null) {

-					stringBuffer.append(TEXT_256);

+					stringBuffer.append(TEXT_259);

 					stringBuffer.append(genPackage.getSchemaLocation());

-					stringBuffer.append(TEXT_172);

+					stringBuffer.append(TEXT_175);

 				}

 				if (!genPackage.isEcorePackage() && !genPackage.getAnnotationSources().isEmpty()) {

-					stringBuffer.append(TEXT_257);

+					stringBuffer.append(TEXT_260);

 					for (String annotationSource : genPackage.getAnnotationSources()) {

-						stringBuffer.append(TEXT_258);

+						stringBuffer.append(TEXT_261);

 						stringBuffer.append(annotationSource);

-						stringBuffer.append(TEXT_194);

+						stringBuffer.append(TEXT_197);

 						stringBuffer.append(genPackage.getAnnotationSourceIdentifier(annotationSource));

-						stringBuffer.append(TEXT_259);

+						stringBuffer.append(TEXT_262);

 					}

 				}

-				stringBuffer.append(TEXT_260);

+				stringBuffer.append(TEXT_263);

 				for (String annotationSource : genPackage.getAnnotationSources()) {

-					stringBuffer.append(TEXT_261);

+					stringBuffer.append(TEXT_264);

 					stringBuffer.append(annotationSource);

-					stringBuffer.append(TEXT_262);

+					stringBuffer.append(TEXT_265);

 					stringBuffer.append(genPackage.getAnnotationSourceIdentifier(annotationSource));

-					stringBuffer.append(TEXT_263);

+					stringBuffer.append(TEXT_266);

 					if (annotationSource == null) {

-						stringBuffer.append(TEXT_264);

+						stringBuffer.append(TEXT_267);

 					} else {

-						stringBuffer.append(TEXT_233);

+						stringBuffer.append(TEXT_236);

 						stringBuffer.append(annotationSource);

 						stringBuffer.append(TEXT_28);

 						stringBuffer.append(genModel.getNonNLS());

@@ -2383,51 +2403,51 @@
 								.getReferenceData(eAnnotation);

 						if (annotationSource == null ? eAnnotation.getSource() == null

 								: annotationSource.equals(eAnnotation.getSource())) {

-							stringBuffer.append(TEXT_265);

+							stringBuffer.append(TEXT_268);

 							stringBuffer.append(genPackage.getAnnotatedModelElementAccessor(eAnnotation));

-							stringBuffer.append(TEXT_266);

+							stringBuffer.append(TEXT_269);

 							for (Iterator<Map.Entry<String, String>> k = eAnnotation.getDetails().iterator(); k

 									.hasNext();) {

 								Map.Entry<String, String> detail = k.next();

 								String key = Literals.toStringLiteral(detail.getKey(), genModel);

 								String value = Literals.toStringLiteral(detail.getValue(), genModel);

-								stringBuffer.append(TEXT_267);

+								stringBuffer.append(TEXT_270);

 								stringBuffer.append(key);

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(value);

 								stringBuffer.append(k.hasNext() ? "," : "");

 								stringBuffer.append(genModel.getNonNLS(key + value));

 							}

-							stringBuffer.append(TEXT_268);

+							stringBuffer.append(TEXT_271);

 							if (annotationReferenceDataList.isEmpty()) {

-								stringBuffer.append(TEXT_172);

+								stringBuffer.append(TEXT_175);

 							} else {

-								stringBuffer.append(TEXT_269);

+								stringBuffer.append(TEXT_272);

 							}

 							if (!annotationReferenceDataList.isEmpty()) {

-								stringBuffer.append(TEXT_270);

+								stringBuffer.append(TEXT_273);

 								stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

-								stringBuffer.append(TEXT_271);

+								stringBuffer.append(TEXT_274);

 								for (Iterator<GenPackage.AnnotationReferenceData> k = annotationReferenceDataList

 										.iterator(); k.hasNext();) {

 									GenPackage.AnnotationReferenceData annotationReferenceData = k.next();

-									stringBuffer.append(TEXT_272);

+									stringBuffer.append(TEXT_275);

 									stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

-									stringBuffer.append(TEXT_273);

+									stringBuffer.append(TEXT_276);

 									if (annotationReferenceData.containingGenPackage != genPackage) {

 										stringBuffer.append(annotationReferenceData.containingGenPackage

 												.getImportedPackageInterfaceName());

-										stringBuffer.append(TEXT_218);

+										stringBuffer.append(TEXT_221);

 									}

-									stringBuffer.append(TEXT_274);

+									stringBuffer.append(TEXT_277);

 									stringBuffer.append(annotationReferenceData.uriFragment);

-									stringBuffer.append(TEXT_275);

+									stringBuffer.append(TEXT_278);

 									if (k.hasNext()) {

-										stringBuffer.append(TEXT_269);

+										stringBuffer.append(TEXT_272);

 									}

 									stringBuffer.append(genModel.getNonNLS());

 								}

-								stringBuffer.append(TEXT_276);

+								stringBuffer.append(TEXT_279);

 							}

 							for (EAnnotation nestedEAnnotation : genPackage.getAllNestedAnnotations(eAnnotation)) {

 								String nestedAnnotationSource = nestedEAnnotation.getSource();

@@ -2450,106 +2470,106 @@
 								}

 								List<GenPackage.AnnotationReferenceData> nestedAnnotationReferenceDataList = genPackage

 										.getReferenceData(nestedEAnnotation);

-								stringBuffer.append(TEXT_265);

+								stringBuffer.append(TEXT_268);

 								stringBuffer.append(genPackage.getAnnotatedModelElementAccessor(eAnnotation));

-								stringBuffer.append(TEXT_277);

+								stringBuffer.append(TEXT_280);

 								if (nonContentAnnotation

 										&& genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF210_VALUE) {

-									stringBuffer.append(TEXT_278);

+									stringBuffer.append(TEXT_281);

 									stringBuffer.append(path.toString());

-									stringBuffer.append(TEXT_279);

+									stringBuffer.append(TEXT_282);

 								} else {

 									stringBuffer.append(depth);

 								}

-								stringBuffer.append(TEXT_277);

+								stringBuffer.append(TEXT_280);

 								if (nestedAnnotationSource == null) {

-									stringBuffer.append(TEXT_280);

+									stringBuffer.append(TEXT_283);

 								} else {

-									stringBuffer.append(TEXT_233);

+									stringBuffer.append(TEXT_236);

 									stringBuffer.append(nestedAnnotationSource);

-									stringBuffer.append(TEXT_281);

+									stringBuffer.append(TEXT_284);

 									stringBuffer.append(genModel.getNonNLS());

 								}

-								stringBuffer.append(TEXT_282);

+								stringBuffer.append(TEXT_285);

 								for (Iterator<Map.Entry<String, String>> l = nestedEAnnotation.getDetails()

 										.iterator(); l.hasNext();) {

 									Map.Entry<String, String> detail = l.next();

 									String key = Literals.toStringLiteral(detail.getKey(), genModel);

 									String value = Literals.toStringLiteral(detail.getValue(), genModel);

-									stringBuffer.append(TEXT_267);

+									stringBuffer.append(TEXT_270);

 									stringBuffer.append(key);

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(value);

 									stringBuffer.append(l.hasNext() ? "," : "");

 									stringBuffer.append(genModel.getNonNLS(key + value));

 								}

-								stringBuffer.append(TEXT_268);

+								stringBuffer.append(TEXT_271);

 								if (nestedAnnotationReferenceDataList.isEmpty()) {

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 								} else {

-									stringBuffer.append(TEXT_269);

+									stringBuffer.append(TEXT_272);

 								}

 								if (!nestedAnnotationReferenceDataList.isEmpty()) {

-									stringBuffer.append(TEXT_270);

+									stringBuffer.append(TEXT_273);

 									stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

-									stringBuffer.append(TEXT_271);

+									stringBuffer.append(TEXT_274);

 									for (Iterator<GenPackage.AnnotationReferenceData> l = nestedAnnotationReferenceDataList

 											.iterator(); l.hasNext();) {

 										GenPackage.AnnotationReferenceData annotationReferenceData = l.next();

-										stringBuffer.append(TEXT_272);

+										stringBuffer.append(TEXT_275);

 										stringBuffer

 												.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

-										stringBuffer.append(TEXT_273);

+										stringBuffer.append(TEXT_276);

 										if (annotationReferenceData.containingGenPackage != genPackage) {

 											stringBuffer.append(annotationReferenceData.containingGenPackage

 													.getImportedPackageInterfaceName());

-											stringBuffer.append(TEXT_218);

+											stringBuffer.append(TEXT_221);

 										}

-										stringBuffer.append(TEXT_274);

+										stringBuffer.append(TEXT_277);

 										stringBuffer.append(annotationReferenceData.uriFragment);

-										stringBuffer.append(TEXT_275);

+										stringBuffer.append(TEXT_278);

 										if (l.hasNext()) {

-											stringBuffer.append(TEXT_269);

+											stringBuffer.append(TEXT_272);

 										}

 										stringBuffer.append(genModel.getNonNLS());

 									}

-									stringBuffer.append(TEXT_276);

+									stringBuffer.append(TEXT_279);

 								}

 							}

 						}

 					}

-					stringBuffer.append(TEXT_260);

+					stringBuffer.append(TEXT_263);

 				}

 			} else {

 				if (genPackage.isLoadingInitialization()) {

-					stringBuffer.append(TEXT_283);

-					stringBuffer.append(genModel.getImportedName("java.net.URL"));

-					stringBuffer.append(TEXT_284);

-					stringBuffer.append(genModel.getNonNLS());

-					stringBuffer.append(TEXT_285);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

 					stringBuffer.append(TEXT_286);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

+					stringBuffer.append(genModel.getImportedName("java.net.URL"));

 					stringBuffer.append(TEXT_287);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.resource.Resource"));

+					stringBuffer.append(genModel.getNonNLS());

 					stringBuffer.append(TEXT_288);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

+					stringBuffer.append(TEXT_289);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

+					stringBuffer.append(TEXT_290);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.resource.Resource"));

+					stringBuffer.append(TEXT_291);

 					stringBuffer.append(

 							genModel.getImportedName("org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl"));

-					stringBuffer.append(TEXT_289);

-					stringBuffer.append(genModel.getImportedName("java.io.IOException"));

-					stringBuffer.append(TEXT_290);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.WrappedException"));

-					stringBuffer.append(TEXT_291);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage"));

 					stringBuffer.append(TEXT_292);

-				}

-				stringBuffer.append(TEXT_293);

-				if (genModel.useClassOverrideAnnotation()) {

+					stringBuffer.append(genModel.getImportedName("java.io.IOException"));

+					stringBuffer.append(TEXT_293);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.WrappedException"));

 					stringBuffer.append(TEXT_294);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage"));

+					stringBuffer.append(TEXT_295);

 				}

-				stringBuffer.append(TEXT_295);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier"));

 				stringBuffer.append(TEXT_296);

+				if (genModel.useClassOverrideAnnotation()) {

+					stringBuffer.append(TEXT_156);

+				}

+				stringBuffer.append(TEXT_297);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier"));

+				stringBuffer.append(TEXT_298);

 				ArrayList<GenClass> dynamicGenClasses = new ArrayList<GenClass>();

 				for (GenClass genClass : genPackage.getGenClasses()) {

 					if (genClass.isDynamic()) {

@@ -2557,173 +2577,173 @@
 					}

 				}

 				if (dynamicGenClasses.isEmpty()) {

-					stringBuffer.append(TEXT_297);

-					stringBuffer.append(genPackage.getInterfacePackageName());

-					stringBuffer.append(TEXT_298);

-					stringBuffer.append(genModel.getNonNLS());

 					stringBuffer.append(TEXT_299);

-				} else {

+					stringBuffer.append(genPackage.getInterfacePackageName());

 					stringBuffer.append(TEXT_300);

+					stringBuffer.append(genModel.getNonNLS());

+					stringBuffer.append(TEXT_301);

+				} else {

+					stringBuffer.append(TEXT_302);

 					for (GenClass genClass : dynamicGenClasses) {

 						if (genClass.isDynamic()) {

-							stringBuffer.append(TEXT_301);

+							stringBuffer.append(TEXT_303);

 							stringBuffer.append(genPackage.getClassifierID(genClass));

-							stringBuffer.append(TEXT_302);

+							stringBuffer.append(TEXT_304);

 						}

 					}

-					stringBuffer.append(TEXT_303);

+					stringBuffer.append(TEXT_305);

 					stringBuffer.append(genPackage.getInterfacePackageName());

-					stringBuffer.append(TEXT_298);

+					stringBuffer.append(TEXT_300);

 					stringBuffer.append(genModel.getNonNLS());

-					stringBuffer.append(TEXT_304);

+					stringBuffer.append(TEXT_306);

 				}

-				stringBuffer.append(TEXT_305);

+				stringBuffer.append(TEXT_307);

 			}

 			if (needsAddEOperation) {

-				stringBuffer.append(TEXT_306);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation"));

-				stringBuffer.append(TEXT_307);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClass"));

 				stringBuffer.append(TEXT_308);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier"));

-				stringBuffer.append(TEXT_309);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation"));

+				stringBuffer.append(TEXT_309);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClass"));

 				stringBuffer.append(TEXT_310);

-			}

-			if (needsAddEParameter) {

-				stringBuffer.append(TEXT_306);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EParameter"));

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier"));

 				stringBuffer.append(TEXT_311);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation"));

-				stringBuffer.append(TEXT_308);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier"));

-				stringBuffer.append(TEXT_309);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EParameter"));

 				stringBuffer.append(TEXT_312);

 			}

+			if (needsAddEParameter) {

+				stringBuffer.append(TEXT_308);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EParameter"));

+				stringBuffer.append(TEXT_313);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation"));

+				stringBuffer.append(TEXT_310);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier"));

+				stringBuffer.append(TEXT_311);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EParameter"));

+				stringBuffer.append(TEXT_314);

+			}

 		}

 		if (isInterface && genPackage.isLiteralsInterface()) {

-			stringBuffer.append(TEXT_313);

-			if (genModel.isOperationReflection()) {

-				stringBuffer.append(TEXT_314);

-			}

 			stringBuffer.append(TEXT_315);

-			if (isImplementation) {

+			if (genModel.isOperationReflection()) {

 				stringBuffer.append(TEXT_316);

 			}

 			stringBuffer.append(TEXT_317);

-			for (GenClassifier genClassifier : genPackage.getGenClassifiers()) {

+			if (isImplementation) {

 				stringBuffer.append(TEXT_318);

+			}

+			stringBuffer.append(TEXT_319);

+			for (GenClassifier genClassifier : genPackage.getGenClassifiers()) {

+				stringBuffer.append(TEXT_320);

 				if (genClassifier instanceof GenClass) {

 					GenClass genClass = (GenClass) genClassifier;

 					if (!genClass.isInterface()) {

-						stringBuffer.append(TEXT_319);

+						stringBuffer.append(TEXT_321);

 						stringBuffer.append(genClass.getQualifiedClassName());

 						stringBuffer.append(TEXT_40);

 						stringBuffer.append(genClass.getFormattedName());

-						stringBuffer.append(TEXT_320);

+						stringBuffer.append(TEXT_322);

 						stringBuffer.append(genClass.getQualifiedClassName());

 					} else {

-						stringBuffer.append(TEXT_319);

+						stringBuffer.append(TEXT_321);

 						stringBuffer.append(genClass.getRawQualifiedInterfaceName());

 						stringBuffer.append(TEXT_40);

 						stringBuffer.append(genClass.getFormattedName());

-						stringBuffer.append(TEXT_320);

+						stringBuffer.append(TEXT_322);

 						stringBuffer.append(genClass.getRawQualifiedInterfaceName());

 					}

 				} else if (genClassifier instanceof GenEnum) {

 					GenEnum genEnum = (GenEnum) genClassifier;

-					stringBuffer.append(TEXT_319);

+					stringBuffer.append(TEXT_321);

 					stringBuffer.append(genEnum.getQualifiedName());

 					stringBuffer.append(TEXT_40);

 					stringBuffer.append(genEnum.getFormattedName());

-					stringBuffer.append(TEXT_321);

+					stringBuffer.append(TEXT_323);

 					stringBuffer.append(genEnum.getQualifiedName());

 				} else if (genClassifier instanceof GenDataType) {

 					GenDataType genDataType = (GenDataType) genClassifier;

-					stringBuffer.append(TEXT_322);

+					stringBuffer.append(TEXT_324);

 					stringBuffer.append(genDataType.getFormattedName());

-					stringBuffer.append(TEXT_323);

+					stringBuffer.append(TEXT_325);

 					if (!genDataType.isPrimitiveType() && !genDataType.isArrayType()) {

-						stringBuffer.append(TEXT_324);

+						stringBuffer.append(TEXT_326);

 						stringBuffer.append(genDataType.getRawInstanceClassName());

 					}

 				}

-				stringBuffer.append(TEXT_324);

+				stringBuffer.append(TEXT_326);

 				stringBuffer.append(genPackage.getQualifiedPackageClassName());

 				stringBuffer.append(TEXT_46);

 				stringBuffer.append(genClassifier.getClassifierAccessorName());

 				stringBuffer.append(TEXT_47);

 				if (genClassifier.hasAPITags()) {

-					stringBuffer.append(TEXT_325);

+					stringBuffer.append(TEXT_327);

 					stringBuffer.append(genClassifier.getAPITags(genModel.getIndentation(stringBuffer)));

 				}

-				stringBuffer.append(TEXT_326);

+				stringBuffer.append(TEXT_328);

 				if (isJDK50 && genClassifier.hasAPIDeprecatedTag()) {

-					stringBuffer.append(TEXT_327);

+					stringBuffer.append(TEXT_329);

 				}

 				stringBuffer.append(TEXT_91);

 				stringBuffer.append(publicStaticFinalFlag);

 				stringBuffer.append(genClassifier.getImportedMetaType());

 				stringBuffer.append(TEXT_67);

 				stringBuffer.append(genPackage.getClassifierID(genClassifier));

-				stringBuffer.append(TEXT_328);

+				stringBuffer.append(TEXT_330);

 				stringBuffer.append(genClassifier.getClassifierAccessorName());

-				stringBuffer.append(TEXT_163);

+				stringBuffer.append(TEXT_166);

 				if (genClassifier instanceof GenClass) {

 					GenClass genClass = (GenClass) genClassifier;

 					for (GenFeature genFeature : genClass.getGenFeatures()) {

-						stringBuffer.append(TEXT_329);

+						stringBuffer.append(TEXT_331);

 						stringBuffer.append(genFeature.getFormattedName());

 						stringBuffer.append(TEXT_56);

 						stringBuffer.append(genFeature.getFeatureKind());

-						stringBuffer.append(TEXT_330);

+						stringBuffer.append(TEXT_332);

 						if (genFeature.hasImplicitAPITags()) {

-							stringBuffer.append(TEXT_325);

+							stringBuffer.append(TEXT_327);

 							stringBuffer.append(genFeature.getImplicitAPITags(genModel.getIndentation(stringBuffer)));

 						}

-						stringBuffer.append(TEXT_326);

+						stringBuffer.append(TEXT_328);

 						if (isJDK50 && genFeature.hasImplicitAPIDeprecatedTag()) {

-							stringBuffer.append(TEXT_327);

+							stringBuffer.append(TEXT_329);

 						}

 						stringBuffer.append(TEXT_91);

 						stringBuffer.append(publicStaticFinalFlag);

 						stringBuffer.append(genFeature.getImportedMetaType());

 						stringBuffer.append(TEXT_67);

 						stringBuffer.append(genClass.getFeatureID(genFeature));

-						stringBuffer.append(TEXT_328);

+						stringBuffer.append(TEXT_330);

 						stringBuffer.append(genFeature.getFeatureAccessorName());

-						stringBuffer.append(TEXT_163);

+						stringBuffer.append(TEXT_166);

 					}

 					if (genModel.isOperationReflection()) {

 						for (GenOperation genOperation : genClass.getGenOperations()) {

-							stringBuffer.append(TEXT_329);

-							stringBuffer.append(genOperation.getFormattedName());

 							stringBuffer.append(TEXT_331);

+							stringBuffer.append(genOperation.getFormattedName());

+							stringBuffer.append(TEXT_333);

 							if (genOperation.hasImplicitAPITags()) {

-								stringBuffer.append(TEXT_325);

+								stringBuffer.append(TEXT_327);

 								stringBuffer

 										.append(genOperation.getImplicitAPITags(genModel.getIndentation(stringBuffer)));

 							}

-							stringBuffer.append(TEXT_326);

+							stringBuffer.append(TEXT_328);

 							if (isJDK50 && genOperation.hasImplicitAPIDeprecatedTag()) {

-								stringBuffer.append(TEXT_327);

+								stringBuffer.append(TEXT_329);

 							}

 							stringBuffer.append(TEXT_91);

 							stringBuffer.append(publicStaticFinalFlag);

 							stringBuffer.append(genOperation.getImportedMetaType());

 							stringBuffer.append(TEXT_67);

 							stringBuffer.append(genClass.getOperationID(genOperation, false));

-							stringBuffer.append(TEXT_328);

+							stringBuffer.append(TEXT_330);

 							stringBuffer.append(genOperation.getOperationAccessorName());

-							stringBuffer.append(TEXT_163);

+							stringBuffer.append(TEXT_166);

 						}

 					}

 				}

 			}

-			stringBuffer.append(TEXT_260);

+			stringBuffer.append(TEXT_263);

 		}

-		stringBuffer.append(TEXT_332);

+		stringBuffer.append(TEXT_334);

 		stringBuffer.append(isInterface ? genPackage.getPackageInterfaceName() : genPackage.getPackageClassName());

 		genModel.emitSortedImports();

 		stringBuffer.append(TEXT_4);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
index c9ec5f1..3f7b0b4 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PackageInterface.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -176,231 +176,234 @@
 	protected final String TEXT_110 = NL + "\t\t// Register package validator" + NL + "\t\t";

 	protected final String TEXT_111 = ".Registry.INSTANCE.put" + NL + "\t\t\t(the";

 	protected final String TEXT_112 = "," + NL + "\t\t\t new ";

-	protected final String TEXT_113 = ".Descriptor()" + NL + "\t\t\t {" + NL + "\t\t\t\t public ";

-	protected final String TEXT_114 = " getEValidator()" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return ";

-	protected final String TEXT_115 = ".INSTANCE;" + NL + "\t\t\t\t }" + NL + "\t\t\t });" + NL;

-	protected final String TEXT_116 = NL + "\t\t// Mark meta-data to indicate it can't be changed" + NL + "\t\tthe";

-	protected final String TEXT_117 = ".freeze();" + NL;

-	protected final String TEXT_118 = NL + "\t\t// Update the registry and return the package" + NL + "\t\t";

-	protected final String TEXT_119 = ".Registry.INSTANCE.put(";

-	protected final String TEXT_120 = ".eNS_URI, the";

-	protected final String TEXT_121 = ");" + NL + "\t\treturn the";

-	protected final String TEXT_122 = ";" + NL + "\t}";

-	protected final String TEXT_123 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_113 = ".Descriptor()" + NL + "\t\t\t {";

+	protected final String TEXT_114 = NL + "\t\t\t\t @Override";

+	protected final String TEXT_115 = NL + "\t\t\t\t public ";

+	protected final String TEXT_116 = " getEValidator()" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return ";

+	protected final String TEXT_117 = ".INSTANCE;" + NL + "\t\t\t\t }" + NL + "\t\t\t });" + NL;

+	protected final String TEXT_118 = NL + "\t\t// Mark meta-data to indicate it can't be changed" + NL + "\t\tthe";

+	protected final String TEXT_119 = ".freeze();" + NL;

+	protected final String TEXT_120 = NL + "\t\t// Update the registry and return the package" + NL + "\t\t";

+	protected final String TEXT_121 = ".Registry.INSTANCE.put(";

+	protected final String TEXT_122 = ".eNS_URI, the";

+	protected final String TEXT_123 = ");" + NL + "\t\treturn the";

+	protected final String TEXT_124 = ";" + NL + "\t}";

+	protected final String TEXT_125 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tpublic static void initializeRegistryHelpers()" + NL + "\t{";

-	protected final String TEXT_124 = ".register" + NL + "\t\t\t(";

-	protected final String TEXT_125 = ".class," + NL + "\t\t\t new ";

-	protected final String TEXT_126 = ".Helper()" + NL + "\t\t\t {" + NL

+	protected final String TEXT_126 = ".register" + NL + "\t\t\t(";

+	protected final String TEXT_127 = ".class," + NL + "\t\t\t new ";

+	protected final String TEXT_128 = ".Helper()" + NL + "\t\t\t {" + NL

 			+ "\t\t\t\t public boolean isInstance(Object instance)" + NL + "\t\t\t\t {" + NL

 			+ "\t\t\t\t\t return instance instanceof ";

-	protected final String TEXT_127 = ";" + NL + "\t\t\t\t }" + NL + "" + NL

-			+ "\t\t\t\t public Object newArrayInstance(int size)" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return new ";

-	protected final String TEXT_128 = "[size];" + NL + "\t\t\t\t }" + NL + "\t\t\t });";

 	protected final String TEXT_129 = ";" + NL + "\t\t\t\t }" + NL + "" + NL

+			+ "\t\t\t\t public Object newArrayInstance(int size)" + NL + "\t\t\t\t {" + NL + "\t\t\t\t\t return new ";

+	protected final String TEXT_130 = "[size];" + NL + "\t\t\t\t }" + NL + "\t\t\t });";

+	protected final String TEXT_131 = ";" + NL + "\t\t\t\t }" + NL + "" + NL

 			+ "\t\t\t\t public Object newArrayInstance(int size)" + NL + "\t\t\t\t {";

-	protected final String TEXT_130 = NL + "\t\t\t\t\t return new ";

-	protected final String TEXT_131 = "[size]";

-	protected final String TEXT_132 = "[size];";

-	protected final String TEXT_133 = NL + "\t\t\t\t }" + NL + "\t\t});";

-	protected final String TEXT_134 = NL + "\t}" + NL + "" + NL + "" + NL + "\t/**" + NL

+	protected final String TEXT_132 = NL + "\t\t\t\t\t return new ";

+	protected final String TEXT_133 = "[size]";

+	protected final String TEXT_134 = "[size];";

+	protected final String TEXT_135 = NL + "\t\t\t\t }" + NL + "\t\t});";

+	protected final String TEXT_136 = NL + "\t}" + NL + "" + NL + "" + NL + "\t/**" + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tpublic static class WhiteList implements ";

-	protected final String TEXT_135 = ", EBasicWhiteList" + NL + "\t{";

-	protected final String TEXT_136 = NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_137 = ", EBasicWhiteList" + NL + "\t{";

+	protected final String TEXT_138 = NL + "\t\t/**" + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";

-	protected final String TEXT_137 = NL + "\t}";

-	protected final String TEXT_138 = NL + "\t * Returns the meta object for class '{@link ";

-	protected final String TEXT_139 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_139 = NL + "\t}";

+	protected final String TEXT_140 = NL + "\t * Returns the meta object for class '{@link ";

+	protected final String TEXT_141 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for class '<em>";

-	protected final String TEXT_140 = "</em>'." + NL + "\t * @see ";

-	protected final String TEXT_141 = NL + "\t * @model ";

-	protected final String TEXT_142 = NL + "\t *        ";

-	protected final String TEXT_143 = NL + "\t * @model";

-	protected final String TEXT_144 = NL + "\t * Returns the meta object for enum '{@link ";

-	protected final String TEXT_145 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_142 = "</em>'." + NL + "\t * @see ";

+	protected final String TEXT_143 = NL + "\t * @model ";

+	protected final String TEXT_144 = NL + "\t *        ";

+	protected final String TEXT_145 = NL + "\t * @model";

+	protected final String TEXT_146 = NL + "\t * Returns the meta object for enum '{@link ";

+	protected final String TEXT_147 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for enum '<em>";

-	protected final String TEXT_146 = NL + "\t * Returns the meta object for data type '<em>";

-	protected final String TEXT_147 = "</em>'.";

-	protected final String TEXT_148 = NL + "\t * Returns the meta object for data type '{@link ";

-	protected final String TEXT_149 = "</em>}'.";

-	protected final String TEXT_150 = NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->";

-	protected final String TEXT_151 = NL + "     * <!-- begin-model-doc -->" + NL + "     * ";

-	protected final String TEXT_152 = NL + "     * <!-- end-model-doc -->";

-	protected final String TEXT_153 = NL + "\t * @return the meta object for data type '<em>";

-	protected final String TEXT_154 = NL + "\tpublic ";

-	protected final String TEXT_155 = " get";

-	protected final String TEXT_156 = "()" + NL + "\t{";

-	protected final String TEXT_157 = NL + "\t\tif (";

-	protected final String TEXT_158 = " == null)" + NL + "\t\t{" + NL + "\t\t\t";

-	protected final String TEXT_159 = ".eNS_URI).getEClassifiers().get(";

-	protected final String TEXT_160 = ");" + NL + "\t\t}";

-	protected final String TEXT_161 = NL + "\t\treturn ";

-	protected final String TEXT_162 = ";" + NL + "\t}" + NL;

-	protected final String TEXT_163 = "();" + NL;

-	protected final String TEXT_164 = NL + "\t/**" + NL + "\t * Returns the meta object for the ";

-	protected final String TEXT_165 = " '{@link ";

-	protected final String TEXT_166 = "#";

-	protected final String TEXT_167 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_148 = NL + "\t * Returns the meta object for data type '<em>";

+	protected final String TEXT_149 = "</em>'.";

+	protected final String TEXT_150 = NL + "\t * Returns the meta object for data type '{@link ";

+	protected final String TEXT_151 = "</em>}'.";

+	protected final String TEXT_152 = NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->";

+	protected final String TEXT_153 = NL + "     * <!-- begin-model-doc -->" + NL + "     * ";

+	protected final String TEXT_154 = NL + "     * <!-- end-model-doc -->";

+	protected final String TEXT_155 = NL + "\t * @return the meta object for data type '<em>";

+	protected final String TEXT_156 = NL + "\t@Override";

+	protected final String TEXT_157 = NL + "\tpublic ";

+	protected final String TEXT_158 = " get";

+	protected final String TEXT_159 = "()" + NL + "\t{";

+	protected final String TEXT_160 = NL + "\t\tif (";

+	protected final String TEXT_161 = " == null)" + NL + "\t\t{" + NL + "\t\t\t";

+	protected final String TEXT_162 = ".eNS_URI).getEClassifiers().get(";

+	protected final String TEXT_163 = ");" + NL + "\t\t}";

+	protected final String TEXT_164 = NL + "\t\treturn ";

+	protected final String TEXT_165 = ";" + NL + "\t}" + NL;

+	protected final String TEXT_166 = "();" + NL;

+	protected final String TEXT_167 = NL + "\t/**" + NL + "\t * Returns the meta object for the ";

+	protected final String TEXT_168 = " '{@link ";

+	protected final String TEXT_169 = "#";

+	protected final String TEXT_170 = "</em>}'." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for the ";

-	protected final String TEXT_168 = " '<em>";

-	protected final String TEXT_169 = NL + "\t * @see #get";

-	protected final String TEXT_170 = NL + "\t\treturn (";

-	protected final String TEXT_171 = ".getEStructuralFeatures().get(";

-	protected final String TEXT_172 = ");";

-	protected final String TEXT_173 = NL + "        return (";

-	protected final String TEXT_174 = ")get";

-	protected final String TEXT_175 = "().getEStructuralFeatures().get(";

-	protected final String TEXT_176 = "();";

-	protected final String TEXT_177 = NL + "\t/**" + NL + "\t * Returns the meta object for the '{@link ";

-	protected final String TEXT_178 = "(";

-	protected final String TEXT_179 = ") <em>";

-	protected final String TEXT_180 = "</em>}' operation." + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_171 = " '<em>";

+	protected final String TEXT_172 = NL + "\t * @see #get";

+	protected final String TEXT_173 = NL + "\t\treturn (";

+	protected final String TEXT_174 = ".getEStructuralFeatures().get(";

+	protected final String TEXT_175 = ");";

+	protected final String TEXT_176 = NL + "        return (";

+	protected final String TEXT_177 = ")get";

+	protected final String TEXT_178 = "().getEStructuralFeatures().get(";

+	protected final String TEXT_179 = "();";

+	protected final String TEXT_180 = NL + "\t/**" + NL + "\t * Returns the meta object for the '{@link ";

+	protected final String TEXT_181 = "(";

+	protected final String TEXT_182 = ") <em>";

+	protected final String TEXT_183 = "</em>}' operation." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @return the meta object for the '<em>";

-	protected final String TEXT_181 = "</em>' operation." + NL + "\t * @see ";

-	protected final String TEXT_182 = ".getEOperations().get(";

-	protected final String TEXT_183 = NL + "        return get";

-	protected final String TEXT_184 = "().getEOperations().get(";

-	protected final String TEXT_185 = NL + "\t/**" + NL

+	protected final String TEXT_184 = "</em>' operation." + NL + "\t * @see ";

+	protected final String TEXT_185 = ".getEOperations().get(";

+	protected final String TEXT_186 = NL + "        return get";

+	protected final String TEXT_187 = "().getEOperations().get(";

+	protected final String TEXT_188 = NL + "\t/**" + NL

 			+ "\t * Returns the factory that creates the instances of the model." + NL + "\t * <!-- begin-user-doc -->"

 			+ NL + "\t * <!-- end-user-doc -->" + NL

 			+ "\t * @return the factory that creates the instances of the model." + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_186 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

-			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

-	protected final String TEXT_187 = "()" + NL + "\t{" + NL + "\t\treturn (";

-	protected final String TEXT_188 = ")getEFactoryInstance();" + NL + "\t}";

 	protected final String TEXT_189 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

+	protected final String TEXT_190 = "()" + NL + "\t{" + NL + "\t\treturn (";

+	protected final String TEXT_191 = ")getEFactoryInstance();" + NL + "\t}";

+	protected final String TEXT_192 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprivate boolean isCreated = false;" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Creates the meta-model objects for the package.  This method is" + NL

 			+ "\t * guarded to have no affect on any invocation but its first." + NL + "\t * <!-- begin-user-doc -->"

 			+ NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

-	protected final String TEXT_190 = NL + "\t@SuppressWarnings(\"deprecation\")";

-	protected final String TEXT_191 = NL + "\tpublic void createPackageContents()" + NL + "\t{" + NL

+	protected final String TEXT_193 = NL + "\t@SuppressWarnings(\"deprecation\")";

+	protected final String TEXT_194 = NL + "\tpublic void createPackageContents()" + NL + "\t{" + NL

 			+ "\t\tif (isCreated) return;" + NL + "\t\tisCreated = true;";

-	protected final String TEXT_192 = NL + NL + "\t\t// Create classes and their features";

-	protected final String TEXT_193 = " = create";

-	protected final String TEXT_194 = NL + "\t\tcreate";

-	protected final String TEXT_195 = ", ";

-	protected final String TEXT_196 = NL + "\t\tcreateEOperation(";

-	protected final String TEXT_197 = NL + NL + "\t\t// Create enums";

-	protected final String TEXT_198 = " = createEEnum(";

-	protected final String TEXT_199 = NL + NL + "\t\t// Create data types";

-	protected final String TEXT_200 = " = createEDataType(";

-	protected final String TEXT_201 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_195 = NL + NL + "\t\t// Create classes and their features";

+	protected final String TEXT_196 = " = create";

+	protected final String TEXT_197 = NL + "\t\tcreate";

+	protected final String TEXT_198 = ", ";

+	protected final String TEXT_199 = NL + "\t\tcreateEOperation(";

+	protected final String TEXT_200 = NL + NL + "\t\t// Create enums";

+	protected final String TEXT_201 = " = createEEnum(";

+	protected final String TEXT_202 = NL + NL + "\t\t// Create data types";

+	protected final String TEXT_203 = " = createEDataType(";

+	protected final String TEXT_204 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprivate boolean isInitialized = false;" + NL;

-	protected final String TEXT_202 = NL + "\t/**" + NL

+	protected final String TEXT_205 = NL + "\t/**" + NL

 			+ "\t * Complete the initialization of the package and its meta-model.  This" + NL

 			+ "\t * method is guarded to have no affect on any invocation but its first." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL

 			+ "\t */";

-	protected final String TEXT_203 = NL + "\tpublic void initializePackageContents()" + NL + "\t{" + NL

+	protected final String TEXT_206 = NL + "\tpublic void initializePackageContents()" + NL + "\t{" + NL

 			+ "\t\tif (isInitialized) return;" + NL + "\t\tisInitialized = true;" + NL + "" + NL

 			+ "\t\t// Initialize package" + NL + "\t\tsetName(eNAME);" + NL + "\t\tsetNsPrefix(eNS_PREFIX);" + NL

 			+ "\t\tsetNsURI(eNS_URI);";

-	protected final String TEXT_204 = NL + NL + "\t\t// Obtain other dependent packages";

-	protected final String TEXT_205 = ".eNS_URI);";

-	protected final String TEXT_206 = NL + NL + "\t\t// Add subpackages";

-	protected final String TEXT_207 = NL + "\t\tgetESubpackages().add(";

-	protected final String TEXT_208 = NL + NL + "\t\t// Create type parameters";

-	protected final String TEXT_209 = "_";

-	protected final String TEXT_210 = " = addETypeParameter(";

-	protected final String TEXT_211 = ", \"";

-	protected final String TEXT_212 = "\");";

-	protected final String TEXT_213 = NL + "\t\taddETypeParameter(";

-	protected final String TEXT_214 = NL + NL + "\t\t// Set bounds for type parameters";

-	protected final String TEXT_215 = "g";

-	protected final String TEXT_216 = " = createEGenericType(";

-	protected final String TEXT_217 = NL + "\t\tg";

-	protected final String TEXT_218 = ".";

-	protected final String TEXT_219 = "(g";

-	protected final String TEXT_220 = ".getEBounds().add(g1);";

-	protected final String TEXT_221 = NL + NL + "\t\t// Add supertypes to classes";

-	protected final String TEXT_222 = ".getESuperTypes().add(";

-	protected final String TEXT_223 = ".get";

-	protected final String TEXT_224 = "());";

-	protected final String TEXT_225 = ".getEGenericSuperTypes().add(g1);";

-	protected final String TEXT_226 = NL + NL + "\t\t// Initialize classes";

-	protected final String TEXT_227 = ", features, and operations; add parameters";

-	protected final String TEXT_228 = " and features; add operations and parameters";

-	protected final String TEXT_229 = NL + "\t\tinitEClass(";

-	protected final String TEXT_230 = "null";

-	protected final String TEXT_231 = ".class";

-	protected final String TEXT_232 = "\", ";

-	protected final String TEXT_233 = "\"";

-	protected final String TEXT_234 = NL + "\t\tinitEReference(get";

-	protected final String TEXT_235 = "(), ";

-	protected final String TEXT_236 = "g1";

-	protected final String TEXT_237 = NL + "\t\tget";

-	protected final String TEXT_238 = "().getEKeys().add(";

-	protected final String TEXT_239 = NL + "\t\tinitEAttribute(get";

-	protected final String TEXT_240 = "initEOperation(get";

-	protected final String TEXT_241 = "addEOperation(";

-	protected final String TEXT_242 = "(), \"";

-	protected final String TEXT_243 = ", null, \"";

-	protected final String TEXT_244 = "addETypeParameter(op, \"";

-	protected final String TEXT_245 = NL + "\t\tt";

-	protected final String TEXT_246 = NL + "\t\taddEParameter(op, ";

-	protected final String TEXT_247 = NL + "\t\taddEException(op, g";

-	protected final String TEXT_248 = NL + "\t\taddEException(op, ";

-	protected final String TEXT_249 = NL + "\t\tinitEOperation(op, g1);";

-	protected final String TEXT_250 = NL + NL + "\t\t// Initialize enums and add enum literals";

-	protected final String TEXT_251 = NL + "\t\tinitEEnum(";

-	protected final String TEXT_252 = ".class, \"";

-	protected final String TEXT_253 = NL + "\t\taddEEnumLiteral(";

-	protected final String TEXT_254 = NL + NL + "\t\t// Initialize data types";

-	protected final String TEXT_255 = NL + "\t\tinitEDataType(";

-	protected final String TEXT_256 = NL + NL + "\t\t// Create resource" + NL + "\t\tcreateResource(";

-	protected final String TEXT_257 = NL + NL + "\t\t// Create annotations";

-	protected final String TEXT_258 = NL + "\t\t// ";

-	protected final String TEXT_259 = "Annotations();";

-	protected final String TEXT_260 = NL + "\t}" + NL;

-	protected final String TEXT_261 = NL + "\t/**" + NL + "\t * Initializes the annotations for <b>";

-	protected final String TEXT_262 = "</b>." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"

+	protected final String TEXT_207 = NL + NL + "\t\t// Obtain other dependent packages";

+	protected final String TEXT_208 = ".eNS_URI);";

+	protected final String TEXT_209 = NL + NL + "\t\t// Add subpackages";

+	protected final String TEXT_210 = NL + "\t\tgetESubpackages().add(";

+	protected final String TEXT_211 = NL + NL + "\t\t// Create type parameters";

+	protected final String TEXT_212 = "_";

+	protected final String TEXT_213 = " = addETypeParameter(";

+	protected final String TEXT_214 = ", \"";

+	protected final String TEXT_215 = "\");";

+	protected final String TEXT_216 = NL + "\t\taddETypeParameter(";

+	protected final String TEXT_217 = NL + NL + "\t\t// Set bounds for type parameters";

+	protected final String TEXT_218 = "g";

+	protected final String TEXT_219 = " = createEGenericType(";

+	protected final String TEXT_220 = NL + "\t\tg";

+	protected final String TEXT_221 = ".";

+	protected final String TEXT_222 = "(g";

+	protected final String TEXT_223 = ".getEBounds().add(g1);";

+	protected final String TEXT_224 = NL + NL + "\t\t// Add supertypes to classes";

+	protected final String TEXT_225 = ".getESuperTypes().add(";

+	protected final String TEXT_226 = ".get";

+	protected final String TEXT_227 = "());";

+	protected final String TEXT_228 = ".getEGenericSuperTypes().add(g1);";

+	protected final String TEXT_229 = NL + NL + "\t\t// Initialize classes";

+	protected final String TEXT_230 = ", features, and operations; add parameters";

+	protected final String TEXT_231 = " and features; add operations and parameters";

+	protected final String TEXT_232 = NL + "\t\tinitEClass(";

+	protected final String TEXT_233 = "null";

+	protected final String TEXT_234 = ".class";

+	protected final String TEXT_235 = "\", ";

+	protected final String TEXT_236 = "\"";

+	protected final String TEXT_237 = NL + "\t\tinitEReference(get";

+	protected final String TEXT_238 = "(), ";

+	protected final String TEXT_239 = "g1";

+	protected final String TEXT_240 = NL + "\t\tget";

+	protected final String TEXT_241 = "().getEKeys().add(";

+	protected final String TEXT_242 = NL + "\t\tinitEAttribute(get";

+	protected final String TEXT_243 = "initEOperation(get";

+	protected final String TEXT_244 = "addEOperation(";

+	protected final String TEXT_245 = "(), \"";

+	protected final String TEXT_246 = ", null, \"";

+	protected final String TEXT_247 = "addETypeParameter(op, \"";

+	protected final String TEXT_248 = NL + "\t\tt";

+	protected final String TEXT_249 = NL + "\t\taddEParameter(op, ";

+	protected final String TEXT_250 = NL + "\t\taddEException(op, g";

+	protected final String TEXT_251 = NL + "\t\taddEException(op, ";

+	protected final String TEXT_252 = NL + "\t\tinitEOperation(op, g1);";

+	protected final String TEXT_253 = NL + NL + "\t\t// Initialize enums and add enum literals";

+	protected final String TEXT_254 = NL + "\t\tinitEEnum(";

+	protected final String TEXT_255 = ".class, \"";

+	protected final String TEXT_256 = NL + "\t\taddEEnumLiteral(";

+	protected final String TEXT_257 = NL + NL + "\t\t// Initialize data types";

+	protected final String TEXT_258 = NL + "\t\tinitEDataType(";

+	protected final String TEXT_259 = NL + NL + "\t\t// Create resource" + NL + "\t\tcreateResource(";

+	protected final String TEXT_260 = NL + NL + "\t\t// Create annotations";

+	protected final String TEXT_261 = NL + "\t\t// ";

+	protected final String TEXT_262 = "Annotations();";

+	protected final String TEXT_263 = NL + "\t}" + NL;

+	protected final String TEXT_264 = NL + "\t/**" + NL + "\t * Initializes the annotations for <b>";

+	protected final String TEXT_265 = "</b>." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->"

 			+ NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void create";

-	protected final String TEXT_263 = "Annotations()" + NL + "\t{" + NL + "\t\tString source = ";

-	protected final String TEXT_264 = "null;";

-	protected final String TEXT_265 = NL + "\t\taddAnnotation" + NL + "\t\t  (";

-	protected final String TEXT_266 = "," + NL + "\t\t   source," + NL + "\t\t   new String[]" + NL + "\t\t   {";

-	protected final String TEXT_267 = NL + "\t\t\t   ";

-	protected final String TEXT_268 = NL + "\t\t   }";

-	protected final String TEXT_269 = ",";

-	protected final String TEXT_270 = NL + "\t\t   new ";

-	protected final String TEXT_271 = "[]" + NL + "\t\t   {";

-	protected final String TEXT_272 = NL + "\t\t\t ";

-	protected final String TEXT_273 = ".createURI(";

-	protected final String TEXT_274 = "eNS_URI).appendFragment(\"";

-	protected final String TEXT_275 = "\")";

-	protected final String TEXT_276 = NL + "\t\t   });";

-	protected final String TEXT_277 = "," + NL + "\t\t   ";

-	protected final String TEXT_278 = "new boolean[] { ";

-	protected final String TEXT_279 = " }";

-	protected final String TEXT_280 = "null,";

-	protected final String TEXT_281 = "\",";

-	protected final String TEXT_282 = NL + "\t\t   new String[]" + NL + "\t\t   {";

-	protected final String TEXT_283 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_266 = "Annotations()" + NL + "\t{" + NL + "\t\tString source = ";

+	protected final String TEXT_267 = "null;";

+	protected final String TEXT_268 = NL + "\t\taddAnnotation" + NL + "\t\t  (";

+	protected final String TEXT_269 = "," + NL + "\t\t   source," + NL + "\t\t   new String[]" + NL + "\t\t   {";

+	protected final String TEXT_270 = NL + "\t\t\t   ";

+	protected final String TEXT_271 = NL + "\t\t   }";

+	protected final String TEXT_272 = ",";

+	protected final String TEXT_273 = NL + "\t\t   new ";

+	protected final String TEXT_274 = "[]" + NL + "\t\t   {";

+	protected final String TEXT_275 = NL + "\t\t\t ";

+	protected final String TEXT_276 = ".createURI(";

+	protected final String TEXT_277 = "eNS_URI).appendFragment(\"";

+	protected final String TEXT_278 = "\")";

+	protected final String TEXT_279 = NL + "\t\t   });";

+	protected final String TEXT_280 = "," + NL + "\t\t   ";

+	protected final String TEXT_281 = "new boolean[] { ";

+	protected final String TEXT_282 = " }";

+	protected final String TEXT_283 = "null,";

+	protected final String TEXT_284 = "\",";

+	protected final String TEXT_285 = NL + "\t\t   new String[]" + NL + "\t\t   {";

+	protected final String TEXT_286 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprivate boolean isLoaded = false;" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Laods the package and any sub-packages from their serialized form." + NL

 			+ "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */"

 			+ NL + "\tpublic void loadPackage()" + NL + "\t{" + NL + "\t\tif (isLoaded) return;" + NL

 			+ "\t\tisLoaded = true;" + NL + "" + NL + "\t\t";

-	protected final String TEXT_284 = " url = getClass().getResource(packageFilename);" + NL + "\t\tif (url == null)"

+	protected final String TEXT_287 = " url = getClass().getResource(packageFilename);" + NL + "\t\tif (url == null)"

 			+ NL + "\t\t{" + NL

 			+ "\t\t\tthrow new RuntimeException(\"Missing serialized package: \" + packageFilename);";

-	protected final String TEXT_285 = NL + "\t\t}" + NL + "\t\t";

-	protected final String TEXT_286 = " uri = ";

-	protected final String TEXT_287 = ".createURI(url.toString());" + NL + "\t\t";

-	protected final String TEXT_288 = " resource = new ";

-	protected final String TEXT_289 = "().createResource(uri);" + NL + "\t\ttry" + NL + "\t\t{" + NL

+	protected final String TEXT_288 = NL + "\t\t}" + NL + "\t\t";

+	protected final String TEXT_289 = " uri = ";

+	protected final String TEXT_290 = ".createURI(url.toString());" + NL + "\t\t";

+	protected final String TEXT_291 = " resource = new ";

+	protected final String TEXT_292 = "().createResource(uri);" + NL + "\t\ttry" + NL + "\t\t{" + NL

 			+ "\t\t\tresource.load(null);" + NL + "\t\t}" + NL + "\t\tcatch (";

-	protected final String TEXT_290 = " exception)" + NL + "\t\t{" + NL + "\t\t\tthrow new ";

-	protected final String TEXT_291 = "(exception);" + NL + "\t\t}" + NL + "\t\tinitializeFromLoadedEPackage(this, (";

-	protected final String TEXT_292 = ")resource.getContents().get(0));" + NL + "\t\tcreateResource(eNS_URI);" + NL

+	protected final String TEXT_293 = " exception)" + NL + "\t\t{" + NL + "\t\t\tthrow new ";

+	protected final String TEXT_294 = "(exception);" + NL + "\t\t}" + NL + "\t\tinitializeFromLoadedEPackage(this, (";

+	protected final String TEXT_295 = ")resource.getContents().get(0));" + NL + "\t\tcreateResource(eNS_URI);" + NL

 			+ "\t}" + NL;

-	protected final String TEXT_293 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_296 = NL + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL

 			+ "\tprivate boolean isFixed = false;" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Fixes up the loaded package, to make it appear as if it had been programmatically built." + NL

@@ -409,64 +412,63 @@
 			+ "\t\tisFixed = true;" + NL + "\t\tfixEClassifiers();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL

 			+ "\t * Sets the instance class on the given classifier." + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";

-	protected final String TEXT_294 = NL + "\t@Override";

-	protected final String TEXT_295 = NL + "\tprotected void fixInstanceClass(";

-	protected final String TEXT_296 = " eClassifier)" + NL + "\t{" + NL

+	protected final String TEXT_297 = NL + "\tprotected void fixInstanceClass(";

+	protected final String TEXT_298 = " eClassifier)" + NL + "\t{" + NL

 			+ "\t\tif (eClassifier.getInstanceClassName() == null)" + NL + "\t\t{";

-	protected final String TEXT_297 = NL + "\t\t\teClassifier.setInstanceClassName(\"";

-	protected final String TEXT_298 = ".\" + eClassifier.getName());";

-	protected final String TEXT_299 = NL + "\t\t\tsetGeneratedClassName(eClassifier);";

-	protected final String TEXT_300 = NL + "\t\t\tswitch (eClassifier.getClassifierID())" + NL + "\t\t\t{";

-	protected final String TEXT_301 = NL + "\t\t\t\tcase ";

-	protected final String TEXT_302 = ":";

-	protected final String TEXT_303 = NL + "\t\t\t\t{" + NL + "\t\t\t\t\tbreak;" + NL + "\t\t\t\t}" + NL

+	protected final String TEXT_299 = NL + "\t\t\teClassifier.setInstanceClassName(\"";

+	protected final String TEXT_300 = ".\" + eClassifier.getName());";

+	protected final String TEXT_301 = NL + "\t\t\tsetGeneratedClassName(eClassifier);";

+	protected final String TEXT_302 = NL + "\t\t\tswitch (eClassifier.getClassifierID())" + NL + "\t\t\t{";

+	protected final String TEXT_303 = NL + "\t\t\t\tcase ";

+	protected final String TEXT_304 = ":";

+	protected final String TEXT_305 = NL + "\t\t\t\t{" + NL + "\t\t\t\t\tbreak;" + NL + "\t\t\t\t}" + NL

 			+ "\t\t\t\tdefault:" + NL + "\t\t\t\t{" + NL + "\t\t\t\t\teClassifier.setInstanceClassName(\"";

-	protected final String TEXT_304 = NL + "\t\t\t\t\tsetGeneratedClassName(eClassifier);" + NL + "\t\t\t\t\tbreak;"

+	protected final String TEXT_306 = NL + "\t\t\t\t\tsetGeneratedClassName(eClassifier);" + NL + "\t\t\t\t\tbreak;"

 			+ NL + "\t\t\t\t}" + NL + "\t\t\t}";

-	protected final String TEXT_305 = NL + "\t\t}" + NL + "\t}" + NL;

-	protected final String TEXT_306 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_307 = NL + "\t\t}" + NL + "\t}" + NL;

+	protected final String TEXT_308 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";

-	protected final String TEXT_307 = " addEOperation(";

-	protected final String TEXT_308 = " owner, ";

-	protected final String TEXT_309 = " type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered)"

+	protected final String TEXT_309 = " addEOperation(";

+	protected final String TEXT_310 = " owner, ";

+	protected final String TEXT_311 = " type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered)"

 			+ NL + "\t{" + NL + "\t\t";

-	protected final String TEXT_310 = " o = addEOperation(owner, type, name, lowerBound, upperBound);" + NL

+	protected final String TEXT_312 = " o = addEOperation(owner, type, name, lowerBound, upperBound);" + NL

 			+ "\t\to.setUnique(isUnique);" + NL + "\t\to.setOrdered(isOrdered);" + NL + "\t\treturn o;" + NL + "\t}"

 			+ NL;

-	protected final String TEXT_311 = " addEParameter(";

-	protected final String TEXT_312 = " p = ecoreFactory.createEParameter();" + NL + "\t\tp.setEType(type);" + NL

+	protected final String TEXT_313 = " addEParameter(";

+	protected final String TEXT_314 = " p = ecoreFactory.createEParameter();" + NL + "\t\tp.setEType(type);" + NL

 			+ "\t\tp.setName(name);" + NL + "\t\tp.setLowerBound(lowerBound);" + NL + "\t\tp.setUpperBound(upperBound);"

 			+ NL + "\t\tp.setUnique(isUnique);" + NL + "\t\tp.setOrdered(isOrdered);" + NL

 			+ "\t\towner.getEParameters().add(p);" + NL + "\t\treturn p;" + NL + "\t}" + NL;

-	protected final String TEXT_313 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_315 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL

 			+ "\t * Defines literals for the meta objects that represent" + NL + "\t * <ul>" + NL

 			+ "\t *   <li>each class,</li>" + NL + "\t *   <li>each feature of each class,</li>";

-	protected final String TEXT_314 = NL + "\t *   <li>each operation of each class,</li>";

-	protected final String TEXT_315 = NL + "\t *   <li>each enum,</li>" + NL + "\t *   <li>and each data type</li>" + NL

+	protected final String TEXT_316 = NL + "\t *   <li>each operation of each class,</li>";

+	protected final String TEXT_317 = NL + "\t *   <li>each enum,</li>" + NL + "\t *   <li>and each data type</li>" + NL

 			+ "\t * </ul>" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\t";

-	protected final String TEXT_316 = "public ";

-	protected final String TEXT_317 = "interface Literals" + NL + "\t{";

-	protected final String TEXT_318 = NL + "\t\t/**";

-	protected final String TEXT_319 = NL + "\t\t * The meta object literal for the '{@link ";

-	protected final String TEXT_320 = "</em>}' class." + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_318 = "public ";

+	protected final String TEXT_319 = "interface Literals" + NL + "\t{";

+	protected final String TEXT_320 = NL + "\t\t/**";

+	protected final String TEXT_321 = NL + "\t\t * The meta object literal for the '{@link ";

+	protected final String TEXT_322 = "</em>}' class." + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see ";

-	protected final String TEXT_321 = "</em>}' enum." + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_323 = "</em>}' enum." + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->" + NL + "\t\t * @see ";

-	protected final String TEXT_322 = NL + "\t\t * The meta object literal for the '<em>";

-	protected final String TEXT_323 = "</em>' data type." + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_324 = NL + "\t\t * The meta object literal for the '<em>";

+	protected final String TEXT_325 = "</em>' data type." + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->";

-	protected final String TEXT_324 = NL + "\t\t * @see ";

-	protected final String TEXT_325 = NL + "\t\t * ";

-	protected final String TEXT_326 = NL + "\t\t * @generated" + NL + "\t\t */";

-	protected final String TEXT_327 = NL + "\t\t@Deprecated";

-	protected final String TEXT_328 = " = eINSTANCE.get";

-	protected final String TEXT_329 = NL + "\t\t/**" + NL + "\t\t * The meta object literal for the '<em><b>";

-	protected final String TEXT_330 = " feature." + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_326 = NL + "\t\t * @see ";

+	protected final String TEXT_327 = NL + "\t\t * ";

+	protected final String TEXT_328 = NL + "\t\t * @generated" + NL + "\t\t */";

+	protected final String TEXT_329 = NL + "\t\t@Deprecated";

+	protected final String TEXT_330 = " = eINSTANCE.get";

+	protected final String TEXT_331 = NL + "\t\t/**" + NL + "\t\t * The meta object literal for the '<em><b>";

+	protected final String TEXT_332 = " feature." + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->";

-	protected final String TEXT_331 = "</b></em>' operation." + NL + "\t\t * <!-- begin-user-doc -->" + NL

+	protected final String TEXT_333 = "</b></em>' operation." + NL + "\t\t * <!-- begin-user-doc -->" + NL

 			+ "\t\t * <!-- end-user-doc -->";

-	protected final String TEXT_332 = NL + "} //";

-	protected final String TEXT_333 = NL;

+	protected final String TEXT_334 = NL + "} //";

+	protected final String TEXT_335 = NL;

 

 	public PackageInterface() {

 		//Here is the constructor

@@ -502,8 +504,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_333);

-		stringBuffer.append(TEXT_333);

+		stringBuffer.append(TEXT_335);

+		stringBuffer.append(TEXT_335);

 		return stringBuffer.toString();

 	}

 

@@ -575,9 +577,9 @@
 		/**

 		 * Copyright (c) 2002-2010 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

@@ -588,6 +590,8 @@
 		final boolean isJDK50 = genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50;

 		boolean isInterface = Boolean.TRUE.equals(((Object[]) argument)[1]);

 		boolean isImplementation = Boolean.TRUE.equals(((Object[]) argument)[2]);

+		boolean useInterfaceOverrideAnnotation = genModel.useInterfaceOverrideAnnotation()

+				&& !(isInterface && isImplementation);

 		boolean packageNeedsSuppressDeprecation = isJDK50

 				&& GenModelUtil.hasAPIDeprecatedTag(genPackage.getOrderedGenClassifiers())

 				&& !genPackage.hasAPIDeprecatedTag();

@@ -1054,27 +1058,31 @@
 				stringBuffer.append(TEXT_112);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator"));

 				stringBuffer.append(TEXT_113);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator"));

-				stringBuffer.append(TEXT_114);

-				stringBuffer.append(genPackage.getImportedValidatorClassName());

+				if (genModel.useInterfaceOverrideAnnotation()) {

+					stringBuffer.append(TEXT_114);

+				}

 				stringBuffer.append(TEXT_115);

-			}

-			if (!genPackage.isEcorePackage()) {

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EValidator"));

 				stringBuffer.append(TEXT_116);

-				stringBuffer.append(genPackage.getBasicPackageName());

+				stringBuffer.append(genPackage.getImportedValidatorClassName());

 				stringBuffer.append(TEXT_117);

 			}

-			stringBuffer.append(TEXT_118);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage"));

-			stringBuffer.append(TEXT_119);

-			stringBuffer.append(genPackage.getImportedPackageInterfaceName());

+			if (!genPackage.isEcorePackage()) {

+				stringBuffer.append(TEXT_118);

+				stringBuffer.append(genPackage.getBasicPackageName());

+				stringBuffer.append(TEXT_119);

+			}

 			stringBuffer.append(TEXT_120);

-			stringBuffer.append(genPackage.getBasicPackageName());

+			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage"));

 			stringBuffer.append(TEXT_121);

-			stringBuffer.append(genPackage.getBasicPackageName());

+			stringBuffer.append(genPackage.getImportedPackageInterfaceName());

 			stringBuffer.append(TEXT_122);

+			stringBuffer.append(genPackage.getBasicPackageName());

+			stringBuffer.append(TEXT_123);

+			stringBuffer.append(genPackage.getBasicPackageName());

+			stringBuffer.append(TEXT_124);

 			if (genModel.getRuntimePlatform() == GenRuntimePlatform.GWT) {

-				stringBuffer.append(TEXT_123);

+				stringBuffer.append(TEXT_125);

 				Set<String> helpers = new HashSet<String>();

 				for (GenClassifier genClassifier : genPackage.getGenClassifiers()) {

 					if (genClassifier instanceof GenClass) {

@@ -1085,17 +1093,17 @@
 							if (helpers.add(theClass)) {

 								stringBuffer.append(TEXT_91);

 								stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect"));

-								stringBuffer.append(TEXT_124);

-								stringBuffer.append(theClass);

-								stringBuffer.append(TEXT_125);

-								stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect"));

 								stringBuffer.append(TEXT_126);

+								stringBuffer.append(theClass);

+								stringBuffer.append(TEXT_127);

+								stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect"));

+								stringBuffer.append(TEXT_128);

 								stringBuffer.append(genClass.isMapEntry() ? genClass.getImportedClassName()

 										: genClass.getRawImportedInterfaceName()

 												+ genClass.getInterfaceWildTypeArguments());

-								stringBuffer.append(TEXT_127);

+								stringBuffer.append(TEXT_129);

 								stringBuffer.append(theClass);

-								stringBuffer.append(TEXT_128);

+								stringBuffer.append(TEXT_130);

 							}

 						}

 					} else if (genClassifier instanceof GenDataType) {

@@ -1105,13 +1113,13 @@
 							if (helpers.add(theClass)) {

 								stringBuffer.append(TEXT_91);

 								stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect"));

-								stringBuffer.append(TEXT_124);

-								stringBuffer.append(theClass);

-								stringBuffer.append(TEXT_125);

-								stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect"));

 								stringBuffer.append(TEXT_126);

 								stringBuffer.append(theClass);

-								stringBuffer.append(TEXT_129);

+								stringBuffer.append(TEXT_127);

+								stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Reflect"));

+								stringBuffer.append(TEXT_128);

+								stringBuffer.append(theClass);

+								stringBuffer.append(TEXT_131);

 								if (genDataType.isArrayType()) {

 									String componentType = theClass;

 									String indices = "";

@@ -1119,29 +1127,29 @@
 										componentType = componentType.substring(0, componentType.length() - 2);

 										indices += "[]";

 									}

-									stringBuffer.append(TEXT_130);

+									stringBuffer.append(TEXT_132);

 									stringBuffer.append(componentType);

-									stringBuffer.append(TEXT_131);

+									stringBuffer.append(TEXT_133);

 									stringBuffer.append(indices);

 									stringBuffer.append(TEXT_3);

 								} else {

-									stringBuffer.append(TEXT_130);

-									stringBuffer.append(theClass);

 									stringBuffer.append(TEXT_132);

+									stringBuffer.append(theClass);

+									stringBuffer.append(TEXT_134);

 								}

-								stringBuffer.append(TEXT_133);

+								stringBuffer.append(TEXT_135);

 							}

 						}

 					}

 				}

-				stringBuffer.append(TEXT_134);

+				stringBuffer.append(TEXT_136);

 				stringBuffer.append(genModel.getImportedName("com.google.gwt.user.client.rpc.IsSerializable"));

-				stringBuffer.append(TEXT_135);

+				stringBuffer.append(TEXT_137);

 				for (GenClassifier genClassifier : genPackage.getGenClassifiers()) {

 					if (genClassifier instanceof GenClass) {

 						GenClass genClass = (GenClass) genClassifier;

 						if (!genClass.isDynamic()) {

-							stringBuffer.append(TEXT_136);

+							stringBuffer.append(TEXT_138);

 							stringBuffer.append(genClass.isMapEntry() ? genClass.getImportedClassName()

 									: genClass.getImportedWildcardInstanceClassName());

 							stringBuffer.append(TEXT_67);

@@ -1151,7 +1159,7 @@
 					} else if (genClassifier instanceof GenDataType) {

 						GenDataType genDataType = (GenDataType) genClassifier;

 						if (!genDataType.isObjectType() && genDataType.isSerializable()) {

-							stringBuffer.append(TEXT_136);

+							stringBuffer.append(TEXT_138);

 							stringBuffer.append(genDataType.getImportedWildcardInstanceClassName());

 							stringBuffer.append(TEXT_67);

 							stringBuffer.append(genDataType.getSafeUncapName());

@@ -1159,7 +1167,7 @@
 						}

 					}

 				}

-				stringBuffer.append(TEXT_137);

+				stringBuffer.append(TEXT_139);

 			}

 			stringBuffer.append(TEXT_4);

 		}

@@ -1171,13 +1179,13 @@
 				stringBuffer.append(TEXT_38);

 				if (genClassifier instanceof GenClass) {

 					GenClass genClass = (GenClass) genClassifier;

-					stringBuffer.append(TEXT_138);

+					stringBuffer.append(TEXT_140);

 					stringBuffer.append(genClass.getRawQualifiedInterfaceName());

 					stringBuffer.append(TEXT_40);

 					stringBuffer.append(genClass.getFormattedName());

-					stringBuffer.append(TEXT_139);

+					stringBuffer.append(TEXT_141);

 					stringBuffer.append(genClass.getFormattedName());

-					stringBuffer.append(TEXT_140);

+					stringBuffer.append(TEXT_142);

 					stringBuffer.append(genClass.getRawQualifiedInterfaceName());

 					if (!genModel.isSuppressEMFModelTags()

 							&& (genClass.isExternalInterface() || genClass.isDynamic())) {

@@ -1187,49 +1195,49 @@
 							String modelInfo = stringTokenizer.nextToken();

 							if (first) {

 								first = false;

-								stringBuffer.append(TEXT_141);

+								stringBuffer.append(TEXT_143);

 								stringBuffer.append(modelInfo);

 							} else {

-								stringBuffer.append(TEXT_142);

+								stringBuffer.append(TEXT_144);

 								stringBuffer.append(modelInfo);

 							}

 						}

 						if (first) {

-							stringBuffer.append(TEXT_143);

+							stringBuffer.append(TEXT_145);

 						}

 					}

 				} else if (genClassifier instanceof GenEnum) {

 					GenEnum genEnum = (GenEnum) genClassifier;

-					stringBuffer.append(TEXT_144);

+					stringBuffer.append(TEXT_146);

 					stringBuffer.append(genEnum.getQualifiedName());

 					stringBuffer.append(TEXT_40);

 					stringBuffer.append(genEnum.getFormattedName());

-					stringBuffer.append(TEXT_145);

+					stringBuffer.append(TEXT_147);

 					stringBuffer.append(genEnum.getFormattedName());

-					stringBuffer.append(TEXT_140);

+					stringBuffer.append(TEXT_142);

 					stringBuffer.append(genEnum.getQualifiedName());

 				} else if (genClassifier instanceof GenDataType) {

 					GenDataType genDataType = (GenDataType) genClassifier;

 					if (genDataType.isPrimitiveType() || genDataType.isArrayType()) {

-						stringBuffer.append(TEXT_146);

-						stringBuffer.append(genDataType.getFormattedName());

-						stringBuffer.append(TEXT_147);

-					} else {

 						stringBuffer.append(TEXT_148);

+						stringBuffer.append(genDataType.getFormattedName());

+						stringBuffer.append(TEXT_149);

+					} else {

+						stringBuffer.append(TEXT_150);

 						stringBuffer.append(genDataType.getRawInstanceClassName());

 						stringBuffer.append(TEXT_40);

 						stringBuffer.append(genDataType.getFormattedName());

-						stringBuffer.append(TEXT_149);

-					}

-					stringBuffer.append(TEXT_150);

-					if (genDataType.hasDocumentation()) {

 						stringBuffer.append(TEXT_151);

-						stringBuffer.append(genDataType.getDocumentation(genModel.getIndentation(stringBuffer)));

-						stringBuffer.append(TEXT_152);

 					}

-					stringBuffer.append(TEXT_153);

+					stringBuffer.append(TEXT_152);

+					if (genDataType.hasDocumentation()) {

+						stringBuffer.append(TEXT_153);

+						stringBuffer.append(genDataType.getDocumentation(genModel.getIndentation(stringBuffer)));

+						stringBuffer.append(TEXT_154);

+					}

+					stringBuffer.append(TEXT_155);

 					stringBuffer.append(genDataType.getFormattedName());

-					stringBuffer.append(TEXT_147);

+					stringBuffer.append(TEXT_149);

 					if (!genDataType.isPrimitiveType() && !genDataType.isArrayType()) {

 						stringBuffer.append(TEXT_45);

 						stringBuffer.append(genDataType.getRawInstanceClassName());

@@ -1241,15 +1249,15 @@
 							String modelInfo = stringTokenizer.nextToken();

 							if (first) {

 								first = false;

-								stringBuffer.append(TEXT_141);

+								stringBuffer.append(TEXT_143);

 								stringBuffer.append(modelInfo);

 							} else {

-								stringBuffer.append(TEXT_142);

+								stringBuffer.append(TEXT_144);

 								stringBuffer.append(modelInfo);

 							}

 						}

 						if (first) {

-							stringBuffer.append(TEXT_143);

+							stringBuffer.append(TEXT_145);

 						}

 					}

 				}

@@ -1271,15 +1279,18 @@
 				stringBuffer.append(TEXT_50);

 			}

 			if (isImplementation) {

-				stringBuffer.append(TEXT_154);

+				if (useInterfaceOverrideAnnotation) {

+					stringBuffer.append(TEXT_156);

+				}

+				stringBuffer.append(TEXT_157);

 				stringBuffer.append(genClassifier.getImportedMetaType());

-				stringBuffer.append(TEXT_155);

+				stringBuffer.append(TEXT_158);

 				stringBuffer.append(genClassifier.getClassifierAccessorName());

-				stringBuffer.append(TEXT_156);

+				stringBuffer.append(TEXT_159);

 				if (genPackage.isLoadedInitialization()) {

-					stringBuffer.append(TEXT_157);

+					stringBuffer.append(TEXT_160);

 					stringBuffer.append(genClassifier.getClassifierInstanceName());

-					stringBuffer.append(TEXT_158);

+					stringBuffer.append(TEXT_161);

 					stringBuffer.append(genClassifier.getClassifierInstanceName());

 					stringBuffer.append(TEXT_97);

 					stringBuffer.append(genClassifier.getImportedMetaType());

@@ -1287,46 +1298,46 @@
 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage"));

 					stringBuffer.append(TEXT_78);

 					stringBuffer.append(genPackage.getImportedPackageInterfaceName());

-					stringBuffer.append(TEXT_159);

+					stringBuffer.append(TEXT_162);

 					stringBuffer.append(genPackage.getLocalClassifierIndex(genClassifier));

-					stringBuffer.append(TEXT_160);

+					stringBuffer.append(TEXT_163);

 				}

-				stringBuffer.append(TEXT_161);

+				stringBuffer.append(TEXT_164);

 				stringBuffer.append(genClassifier.getClassifierInstanceName());

-				stringBuffer.append(TEXT_162);

+				stringBuffer.append(TEXT_165);

 			} else {

 				stringBuffer.append(TEXT_51);

 				stringBuffer.append(genClassifier.getImportedMetaType());

-				stringBuffer.append(TEXT_155);

+				stringBuffer.append(TEXT_158);

 				stringBuffer.append(genClassifier.getClassifierAccessorName());

-				stringBuffer.append(TEXT_163);

+				stringBuffer.append(TEXT_166);

 			}

 			if (genClassifier instanceof GenClass) {

 				GenClass genClass = (GenClass) genClassifier;

 				for (GenFeature genFeature : genClass.getGenFeatures()) {

 					if (isInterface) {

-						stringBuffer.append(TEXT_164);

+						stringBuffer.append(TEXT_167);

 						stringBuffer.append(genFeature.getFeatureKind());

-						stringBuffer.append(TEXT_165);

+						stringBuffer.append(TEXT_168);

 						stringBuffer.append(genClass.getRawQualifiedInterfaceName());

 						if (!genClass.isMapEntry() && !genFeature.isSuppressedGetVisibility()) {

-							stringBuffer.append(TEXT_166);

+							stringBuffer.append(TEXT_169);

 							stringBuffer.append(genFeature.getGetAccessor());

 						}

 						stringBuffer.append(TEXT_40);

 						stringBuffer.append(genFeature.getFormattedName());

-						stringBuffer.append(TEXT_167);

+						stringBuffer.append(TEXT_170);

 						stringBuffer.append(genFeature.getFeatureKind());

-						stringBuffer.append(TEXT_168);

+						stringBuffer.append(TEXT_171);

 						stringBuffer.append(genFeature.getFormattedName());

-						stringBuffer.append(TEXT_140);

+						stringBuffer.append(TEXT_142);

 						stringBuffer.append(genClass.getRawQualifiedInterfaceName());

 						if (!genClass.isMapEntry() && !genFeature.isSuppressedGetVisibility()) {

-							stringBuffer.append(TEXT_166);

+							stringBuffer.append(TEXT_169);

 							stringBuffer.append(genFeature.getGetAccessor());

 							stringBuffer.append(TEXT_47);

 						}

-						stringBuffer.append(TEXT_169);

+						stringBuffer.append(TEXT_172);

 						stringBuffer.append(genClass.getClassifierAccessorName());

 						stringBuffer.append(TEXT_47);

 						if (genFeature.hasImplicitAPITags()) {

@@ -1346,56 +1357,59 @@
 						stringBuffer.append(TEXT_50);

 					}

 					if (isImplementation) {

-						stringBuffer.append(TEXT_154);

+						if (useInterfaceOverrideAnnotation) {

+							stringBuffer.append(TEXT_156);

+						}

+						stringBuffer.append(TEXT_157);

 						stringBuffer.append(genFeature.getImportedMetaType());

-						stringBuffer.append(TEXT_155);

+						stringBuffer.append(TEXT_158);

 						stringBuffer.append(genFeature.getFeatureAccessorName());

-						stringBuffer.append(TEXT_156);

+						stringBuffer.append(TEXT_159);

 						if (!genPackage.isLoadedInitialization()) {

-							stringBuffer.append(TEXT_170);

+							stringBuffer.append(TEXT_173);

 							stringBuffer.append(genFeature.getImportedMetaType());

 							stringBuffer.append(TEXT_77);

 							stringBuffer.append(genClass.getClassifierInstanceName());

-							stringBuffer.append(TEXT_171);

-							stringBuffer.append(genClass.getLocalFeatureIndex(genFeature));

-							stringBuffer.append(TEXT_172);

-						} else {

-							stringBuffer.append(TEXT_173);

-							stringBuffer.append(genFeature.getImportedMetaType());

 							stringBuffer.append(TEXT_174);

-							stringBuffer.append(genClassifier.getClassifierAccessorName());

-							stringBuffer.append(TEXT_175);

 							stringBuffer.append(genClass.getLocalFeatureIndex(genFeature));

-							stringBuffer.append(TEXT_172);

+							stringBuffer.append(TEXT_175);

+						} else {

+							stringBuffer.append(TEXT_176);

+							stringBuffer.append(genFeature.getImportedMetaType());

+							stringBuffer.append(TEXT_177);

+							stringBuffer.append(genClassifier.getClassifierAccessorName());

+							stringBuffer.append(TEXT_178);

+							stringBuffer.append(genClass.getLocalFeatureIndex(genFeature));

+							stringBuffer.append(TEXT_175);

 						}

-						stringBuffer.append(TEXT_137);

+						stringBuffer.append(TEXT_139);

 					} else {

 						stringBuffer.append(TEXT_51);

 						stringBuffer.append(genFeature.getImportedMetaType());

-						stringBuffer.append(TEXT_155);

+						stringBuffer.append(TEXT_158);

 						stringBuffer.append(genFeature.getFeatureAccessorName());

-						stringBuffer.append(TEXT_176);

+						stringBuffer.append(TEXT_179);

 					}

 					stringBuffer.append(TEXT_4);

 				}

 				if (genModel.isOperationReflection()) {

 					for (GenOperation genOperation : genClass.getGenOperations()) {

 						if (isInterface) {

-							stringBuffer.append(TEXT_177);

-							stringBuffer.append(genClass.getRawQualifiedInterfaceName());

-							stringBuffer.append(TEXT_166);

-							stringBuffer.append(genOperation.getName());

-							stringBuffer.append(TEXT_178);

-							stringBuffer.append(genOperation.getParameterTypes(", "));

-							stringBuffer.append(TEXT_179);

-							stringBuffer.append(genOperation.getFormattedName());

 							stringBuffer.append(TEXT_180);

-							stringBuffer.append(genOperation.getFormattedName());

-							stringBuffer.append(TEXT_181);

 							stringBuffer.append(genClass.getRawQualifiedInterfaceName());

-							stringBuffer.append(TEXT_166);

+							stringBuffer.append(TEXT_169);

 							stringBuffer.append(genOperation.getName());

-							stringBuffer.append(TEXT_178);

+							stringBuffer.append(TEXT_181);

+							stringBuffer.append(genOperation.getParameterTypes(", "));

+							stringBuffer.append(TEXT_182);

+							stringBuffer.append(genOperation.getFormattedName());

+							stringBuffer.append(TEXT_183);

+							stringBuffer.append(genOperation.getFormattedName());

+							stringBuffer.append(TEXT_184);

+							stringBuffer.append(genClass.getRawQualifiedInterfaceName());

+							stringBuffer.append(TEXT_169);

+							stringBuffer.append(genOperation.getName());

+							stringBuffer.append(TEXT_181);

 							stringBuffer.append(genOperation.getParameterTypes(", "));

 							stringBuffer.append(TEXT_77);

 							if (genOperation.hasImplicitAPITags()) {

@@ -1417,31 +1431,34 @@
 							stringBuffer.append(TEXT_50);

 						}

 						if (isImplementation) {

-							stringBuffer.append(TEXT_154);

-							stringBuffer.append(genOperation.getImportedMetaType());

-							stringBuffer.append(TEXT_155);

-							stringBuffer.append(genOperation.getOperationAccessorName());

-							stringBuffer.append(TEXT_156);

-							if (!genPackage.isLoadedInitialization()) {

-								stringBuffer.append(TEXT_161);

-								stringBuffer.append(genClass.getClassifierInstanceName());

-								stringBuffer.append(TEXT_182);

-								stringBuffer.append(genClass.getLocalOperationIndex(genOperation));

-								stringBuffer.append(TEXT_172);

-							} else {

-								stringBuffer.append(TEXT_183);

-								stringBuffer.append(genClassifier.getClassifierAccessorName());

-								stringBuffer.append(TEXT_184);

-								stringBuffer.append(genClass.getLocalOperationIndex(genOperation));

-								stringBuffer.append(TEXT_172);

+							if (useInterfaceOverrideAnnotation) {

+								stringBuffer.append(TEXT_156);

 							}

-							stringBuffer.append(TEXT_137);

+							stringBuffer.append(TEXT_157);

+							stringBuffer.append(genOperation.getImportedMetaType());

+							stringBuffer.append(TEXT_158);

+							stringBuffer.append(genOperation.getOperationAccessorName());

+							stringBuffer.append(TEXT_159);

+							if (!genPackage.isLoadedInitialization()) {

+								stringBuffer.append(TEXT_164);

+								stringBuffer.append(genClass.getClassifierInstanceName());

+								stringBuffer.append(TEXT_185);

+								stringBuffer.append(genClass.getLocalOperationIndex(genOperation));

+								stringBuffer.append(TEXT_175);

+							} else {

+								stringBuffer.append(TEXT_186);

+								stringBuffer.append(genClassifier.getClassifierAccessorName());

+								stringBuffer.append(TEXT_187);

+								stringBuffer.append(genClass.getLocalOperationIndex(genOperation));

+								stringBuffer.append(TEXT_175);

+							}

+							stringBuffer.append(TEXT_139);

 						} else {

 							stringBuffer.append(TEXT_51);

 							stringBuffer.append(genOperation.getImportedMetaType());

-							stringBuffer.append(TEXT_155);

+							stringBuffer.append(TEXT_158);

 							stringBuffer.append(genOperation.getOperationAccessorName());

-							stringBuffer.append(TEXT_176);

+							stringBuffer.append(TEXT_179);

 						}

 						stringBuffer.append(TEXT_4);

 					}

@@ -1449,29 +1466,32 @@
 			}

 		}

 		if (isInterface) {

-			stringBuffer.append(TEXT_185);

+			stringBuffer.append(TEXT_188);

 		} else {

-			stringBuffer.append(TEXT_186);

+			stringBuffer.append(TEXT_189);

 		}

 		if (isImplementation) {

-			stringBuffer.append(TEXT_154);

+			if (useInterfaceOverrideAnnotation) {

+				stringBuffer.append(TEXT_156);

+			}

+			stringBuffer.append(TEXT_157);

 			stringBuffer.append(genPackage.getImportedFactoryInterfaceName());

-			stringBuffer.append(TEXT_155);

+			stringBuffer.append(TEXT_158);

 			stringBuffer.append(genPackage.getFactoryName());

-			stringBuffer.append(TEXT_187);

+			stringBuffer.append(TEXT_190);

 			stringBuffer.append(genPackage.getImportedFactoryInterfaceName());

-			stringBuffer.append(TEXT_188);

+			stringBuffer.append(TEXT_191);

 		} else {

 			stringBuffer.append(TEXT_51);

 			stringBuffer.append(genPackage.getFactoryInterfaceName());

-			stringBuffer.append(TEXT_155);

+			stringBuffer.append(TEXT_158);

 			stringBuffer.append(genPackage.getFactoryName());

-			stringBuffer.append(TEXT_176);

+			stringBuffer.append(TEXT_179);

 		}

 		stringBuffer.append(TEXT_4);

 		if (isImplementation) {

 			if (!genPackage.isLoadedInitialization()) {

-				stringBuffer.append(TEXT_189);

+				stringBuffer.append(TEXT_192);

 				{

 					boolean needsSuppressDeprecation = false;

 					if (!packageNeedsSuppressDeprecation && isJDK50) {

@@ -1490,38 +1510,38 @@
 							}

 						}

 						if (needsSuppressDeprecation) {

-							stringBuffer.append(TEXT_190);

+							stringBuffer.append(TEXT_193);

 						}

 					}

 				}

-				stringBuffer.append(TEXT_191);

+				stringBuffer.append(TEXT_194);

 				if (!genPackage.getGenClasses().isEmpty()) {

-					stringBuffer.append(TEXT_192);

+					stringBuffer.append(TEXT_195);

 					for (Iterator<GenClass> c = genPackage.getGenClasses().iterator(); c.hasNext();) {

 						GenClass genClass = c.next();

 						stringBuffer.append(TEXT_91);

 						stringBuffer.append(genClass.getClassifierInstanceName());

-						stringBuffer.append(TEXT_193);

+						stringBuffer.append(TEXT_196);

 						stringBuffer.append(genClass.getMetaType());

-						stringBuffer.append(TEXT_178);

+						stringBuffer.append(TEXT_181);

 						stringBuffer.append(genClass.getClassifierID());

-						stringBuffer.append(TEXT_172);

+						stringBuffer.append(TEXT_175);

 						for (GenFeature genFeature : genClass.getGenFeatures()) {

-							stringBuffer.append(TEXT_194);

+							stringBuffer.append(TEXT_197);

 							stringBuffer.append(genFeature.getMetaType());

-							stringBuffer.append(TEXT_178);

+							stringBuffer.append(TEXT_181);

 							stringBuffer.append(genClass.getClassifierInstanceName());

-							stringBuffer.append(TEXT_195);

+							stringBuffer.append(TEXT_198);

 							stringBuffer.append(genClass.getFeatureID(genFeature));

-							stringBuffer.append(TEXT_172);

+							stringBuffer.append(TEXT_175);

 						}

 						if (genModel.isOperationReflection()) {

 							for (GenOperation genOperation : genClass.getGenOperations()) {

-								stringBuffer.append(TEXT_196);

+								stringBuffer.append(TEXT_199);

 								stringBuffer.append(genClass.getClassifierInstanceName());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genClass.getOperationID(genOperation, false));

-								stringBuffer.append(TEXT_172);

+								stringBuffer.append(TEXT_175);

 							}

 						}

 						if (c.hasNext()) {

@@ -1530,26 +1550,26 @@
 					}

 				}

 				if (!genPackage.getGenEnums().isEmpty()) {

-					stringBuffer.append(TEXT_197);

+					stringBuffer.append(TEXT_200);

 					for (GenEnum genEnum : genPackage.getGenEnums()) {

 						stringBuffer.append(TEXT_91);

 						stringBuffer.append(genEnum.getClassifierInstanceName());

-						stringBuffer.append(TEXT_198);

+						stringBuffer.append(TEXT_201);

 						stringBuffer.append(genEnum.getClassifierID());

-						stringBuffer.append(TEXT_172);

+						stringBuffer.append(TEXT_175);

 					}

 				}

 				if (!genPackage.getGenDataTypes().isEmpty()) {

-					stringBuffer.append(TEXT_199);

+					stringBuffer.append(TEXT_202);

 					for (GenDataType genDataType : genPackage.getGenDataTypes()) {

 						stringBuffer.append(TEXT_91);

 						stringBuffer.append(genDataType.getClassifierInstanceName());

-						stringBuffer.append(TEXT_200);

+						stringBuffer.append(TEXT_203);

 						stringBuffer.append(genDataType.getClassifierID());

-						stringBuffer.append(TEXT_172);

+						stringBuffer.append(TEXT_175);

 					}

 				}

-				stringBuffer.append(TEXT_201);

+				stringBuffer.append(TEXT_204);

 

 				///////////////////////

 				class Information {

@@ -1609,7 +1629,7 @@
 				///////////////////////

 				int maxGenericTypeAssignment = 0;

 

-				stringBuffer.append(TEXT_202);

+				stringBuffer.append(TEXT_205);

 				{

 					boolean needsSuppressDeprecation = false;

 					if (!packageNeedsSuppressDeprecation && isJDK50) {

@@ -1622,13 +1642,13 @@
 							}

 						}

 						if (needsSuppressDeprecation) {

-							stringBuffer.append(TEXT_190);

+							stringBuffer.append(TEXT_193);

 						}

 					}

 				}

-				stringBuffer.append(TEXT_203);

+				stringBuffer.append(TEXT_206);

 				if (!genPackage.getPackageInitializationDependencies().isEmpty()) {

-					stringBuffer.append(TEXT_204);

+					stringBuffer.append(TEXT_207);

 					for (GenPackage dep : genPackage.getPackageInitializationDependencies()) {

 						stringBuffer.append(TEXT_91);

 						stringBuffer.append(dep.getImportedPackageInterfaceName());

@@ -1640,22 +1660,22 @@
 						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage"));

 						stringBuffer.append(TEXT_78);

 						stringBuffer.append(dep.getImportedPackageInterfaceName());

-						stringBuffer.append(TEXT_205);

+						stringBuffer.append(TEXT_208);

 					}

 				}

 				if (!genPackage.getSubGenPackages().isEmpty()) {

-					stringBuffer.append(TEXT_206);

+					stringBuffer.append(TEXT_209);

 					for (GenPackage sub : genPackage.getSubGenPackages()) {

-						stringBuffer.append(TEXT_207);

+						stringBuffer.append(TEXT_210);

 						stringBuffer.append(genPackage.getPackageInstanceVariable(sub));

-						stringBuffer.append(TEXT_172);

+						stringBuffer.append(TEXT_175);

 					}

 				}

 				if (!genPackage.getGenClasses().isEmpty()) {

 					boolean firstOperationAssignment = true;

 					int maxTypeParameterAssignment = 0;

 					if (genModel.useGenerics()) {

-						stringBuffer.append(TEXT_208);

+						stringBuffer.append(TEXT_211);

 						for (GenClassifier genClassifier : genPackage.getGenClassifiers()) {

 							for (GenTypeParameter genTypeParameter : genClassifier.getGenTypeParameters()) {

 								if (!genTypeParameter.getEcoreTypeParameter().getEBounds().isEmpty()

@@ -1665,27 +1685,27 @@
 											.append(genModel.getImportedName("org.eclipse.emf.ecore.ETypeParameter"));

 									stringBuffer.append(TEXT_67);

 									stringBuffer.append(genClassifier.getClassifierInstanceName());

-									stringBuffer.append(TEXT_209);

-									stringBuffer.append(genTypeParameter.getName());

-									stringBuffer.append(TEXT_210);

-									stringBuffer.append(genClassifier.getClassifierInstanceName());

-									stringBuffer.append(TEXT_211);

-									stringBuffer.append(genTypeParameter.getName());

 									stringBuffer.append(TEXT_212);

-									stringBuffer.append(genModel.getNonNLS());

-								} else {

+									stringBuffer.append(genTypeParameter.getName());

 									stringBuffer.append(TEXT_213);

 									stringBuffer.append(genClassifier.getClassifierInstanceName());

-									stringBuffer.append(TEXT_211);

+									stringBuffer.append(TEXT_214);

 									stringBuffer.append(genTypeParameter.getName());

-									stringBuffer.append(TEXT_212);

+									stringBuffer.append(TEXT_215);

+									stringBuffer.append(genModel.getNonNLS());

+								} else {

+									stringBuffer.append(TEXT_216);

+									stringBuffer.append(genClassifier.getClassifierInstanceName());

+									stringBuffer.append(TEXT_214);

+									stringBuffer.append(genTypeParameter.getName());

+									stringBuffer.append(TEXT_215);

 									stringBuffer.append(genModel.getNonNLS());

 								}

 							}

 						}

 					}

 					if (genModel.useGenerics()) {

-						stringBuffer.append(TEXT_214);

+						stringBuffer.append(TEXT_217);

 						for (GenClassifier genClassifier : genPackage.getGenClassifiers()) {

 							for (GenTypeParameter genTypeParameter : genClassifier.getGenTypeParameters()) {

 								for (EGenericType bound : genTypeParameter.getEcoreTypeParameter().getEBounds()) {

@@ -1699,42 +1719,42 @@
 										}

 										stringBuffer.append(TEXT_91);

 										stringBuffer.append(prefix);

-										stringBuffer.append(TEXT_215);

+										stringBuffer.append(TEXT_218);

 										stringBuffer.append(info.depth + 1);

-										stringBuffer.append(TEXT_216);

+										stringBuffer.append(TEXT_219);

 										stringBuffer.append(info.type);

-										stringBuffer.append(TEXT_172);

+										stringBuffer.append(TEXT_175);

 										if (info.depth > 0) {

-											stringBuffer.append(TEXT_217);

+											stringBuffer.append(TEXT_220);

 											stringBuffer.append(info.depth);

-											stringBuffer.append(TEXT_218);

+											stringBuffer.append(TEXT_221);

 											stringBuffer.append(info.accessor);

-											stringBuffer.append(TEXT_219);

+											stringBuffer.append(TEXT_222);

 											stringBuffer.append(info.depth + 1);

-											stringBuffer.append(TEXT_172);

+											stringBuffer.append(TEXT_175);

 										}

 									}

 									stringBuffer.append(TEXT_91);

 									stringBuffer.append(genClassifier.getClassifierInstanceName());

-									stringBuffer.append(TEXT_209);

+									stringBuffer.append(TEXT_212);

 									stringBuffer.append(genTypeParameter.getName());

-									stringBuffer.append(TEXT_220);

+									stringBuffer.append(TEXT_223);

 								}

 							}

 						}

 					}

-					stringBuffer.append(TEXT_221);

+					stringBuffer.append(TEXT_224);

 					for (GenClass genClass : genPackage.getGenClasses()) {

 						if (!genClass.hasGenericSuperTypes()) {

 							for (GenClass baseGenClass : genClass.getBaseGenClasses()) {

 								stringBuffer.append(TEXT_91);

 								stringBuffer.append(genClass.getClassifierInstanceName());

-								stringBuffer.append(TEXT_222);

+								stringBuffer.append(TEXT_225);

 								stringBuffer

 										.append(genPackage.getPackageInstanceVariable(baseGenClass.getGenPackage()));

-								stringBuffer.append(TEXT_223);

+								stringBuffer.append(TEXT_226);

 								stringBuffer.append(baseGenClass.getClassifierAccessorName());

-								stringBuffer.append(TEXT_224);

+								stringBuffer.append(TEXT_227);

 							}

 						} else {

 							for (EGenericType superType : genClass.getEcoreClass().getEGenericSuperTypes()) {

@@ -1747,61 +1767,61 @@
 									}

 									stringBuffer.append(TEXT_91);

 									stringBuffer.append(prefix);

-									stringBuffer.append(TEXT_215);

+									stringBuffer.append(TEXT_218);

 									stringBuffer.append(info.depth + 1);

-									stringBuffer.append(TEXT_216);

+									stringBuffer.append(TEXT_219);

 									stringBuffer.append(info.type);

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									if (info.depth > 0) {

-										stringBuffer.append(TEXT_217);

+										stringBuffer.append(TEXT_220);

 										stringBuffer.append(info.depth);

-										stringBuffer.append(TEXT_218);

+										stringBuffer.append(TEXT_221);

 										stringBuffer.append(info.accessor);

-										stringBuffer.append(TEXT_219);

+										stringBuffer.append(TEXT_222);

 										stringBuffer.append(info.depth + 1);

-										stringBuffer.append(TEXT_172);

+										stringBuffer.append(TEXT_175);

 									}

 								}

 								stringBuffer.append(TEXT_91);

 								stringBuffer.append(genClass.getClassifierInstanceName());

-								stringBuffer.append(TEXT_225);

+								stringBuffer.append(TEXT_228);

 							}

 						}

 					}

-					stringBuffer.append(TEXT_226);

+					stringBuffer.append(TEXT_229);

 					if (genModel.isOperationReflection()) {

-						stringBuffer.append(TEXT_227);

+						stringBuffer.append(TEXT_230);

 					} else {

-						stringBuffer.append(TEXT_228);

+						stringBuffer.append(TEXT_231);

 					}

 					for (Iterator<GenClass> c = genPackage.getGenClasses().iterator(); c.hasNext();) {

 						GenClass genClass = c.next();

 						boolean hasInstanceTypeName = genModel.useGenerics()

 								&& genClass.getEcoreClass().getInstanceTypeName() != null

 								&& genClass.getEcoreClass().getInstanceTypeName().contains("<");

-						stringBuffer.append(TEXT_229);

+						stringBuffer.append(TEXT_232);

 						stringBuffer.append(genClass.getClassifierInstanceName());

-						stringBuffer.append(TEXT_195);

+						stringBuffer.append(TEXT_198);

 						if (genClass.isDynamic()) {

-							stringBuffer.append(TEXT_230);

+							stringBuffer.append(TEXT_233);

 						} else {

 							stringBuffer.append(genClass.getRawImportedInterfaceName());

-							stringBuffer.append(TEXT_231);

+							stringBuffer.append(TEXT_234);

 						}

-						stringBuffer.append(TEXT_211);

+						stringBuffer.append(TEXT_214);

 						stringBuffer.append(genClass.getName());

-						stringBuffer.append(TEXT_232);

+						stringBuffer.append(TEXT_235);

 						stringBuffer.append(genClass.getAbstractFlag());

-						stringBuffer.append(TEXT_195);

+						stringBuffer.append(TEXT_198);

 						stringBuffer.append(genClass.getInterfaceFlag());

-						stringBuffer.append(TEXT_195);

+						stringBuffer.append(TEXT_198);

 						stringBuffer.append(genClass.getGeneratedInstanceClassFlag());

 						if (hasInstanceTypeName) {

-							stringBuffer.append(TEXT_211);

+							stringBuffer.append(TEXT_214);

 							stringBuffer.append(genClass.getEcoreClass().getInstanceTypeName());

-							stringBuffer.append(TEXT_233);

+							stringBuffer.append(TEXT_236);

 						}

-						stringBuffer.append(TEXT_172);

+						stringBuffer.append(TEXT_175);

 						stringBuffer.append(genModel.getNonNLS());

 						if (hasInstanceTypeName) {

 							stringBuffer.append(genModel.getNonNLS(2));

@@ -1818,19 +1838,19 @@
 									}

 									stringBuffer.append(TEXT_91);

 									stringBuffer.append(prefix);

-									stringBuffer.append(TEXT_215);

+									stringBuffer.append(TEXT_218);

 									stringBuffer.append(info.depth + 1);

-									stringBuffer.append(TEXT_216);

+									stringBuffer.append(TEXT_219);

 									stringBuffer.append(info.type);

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									if (info.depth > 0) {

-										stringBuffer.append(TEXT_217);

+										stringBuffer.append(TEXT_220);

 										stringBuffer.append(info.depth);

-										stringBuffer.append(TEXT_218);

+										stringBuffer.append(TEXT_221);

 										stringBuffer.append(info.accessor);

-										stringBuffer.append(TEXT_219);

+										stringBuffer.append(TEXT_222);

 										stringBuffer.append(info.depth + 1);

-										stringBuffer.append(TEXT_172);

+										stringBuffer.append(TEXT_175);

 									}

 								}

 							}

@@ -1839,101 +1859,101 @@
 								String reverse = reverseGenFeature == null ? "null"

 										: genPackage.getPackageInstanceVariable(reverseGenFeature.getGenPackage())

 												+ ".get" + reverseGenFeature.getFeatureAccessorName() + "()";

-								stringBuffer.append(TEXT_234);

+								stringBuffer.append(TEXT_237);

 								stringBuffer.append(genFeature.getFeatureAccessorName());

-								stringBuffer.append(TEXT_235);

+								stringBuffer.append(TEXT_238);

 								if (genFeature.hasGenericType()) {

-									stringBuffer.append(TEXT_236);

+									stringBuffer.append(TEXT_239);

 								} else {

 									stringBuffer.append(

 											genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage()));

-									stringBuffer.append(TEXT_223);

+									stringBuffer.append(TEXT_226);

 									stringBuffer.append(genFeature.getTypeClassifierAccessorName());

 									stringBuffer.append(TEXT_47);

 								}

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(reverse);

-								stringBuffer.append(TEXT_211);

+								stringBuffer.append(TEXT_214);

 								stringBuffer.append(genFeature.getName());

-								stringBuffer.append(TEXT_232);

+								stringBuffer.append(TEXT_235);

 								stringBuffer.append(genFeature.getDefaultValue());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getLowerBound());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getUpperBound());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getContainerClass());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getTransientFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getVolatileFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getChangeableFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getContainmentFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getResolveProxiesFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getUnsettableFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getUniqueFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getDerivedFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getOrderedFlag());

-								stringBuffer.append(TEXT_172);

+								stringBuffer.append(TEXT_175);

 								stringBuffer.append(genModel.getNonNLS());

 								stringBuffer.append(genModel.getNonNLS(genFeature.getDefaultValue(), 2));

 								for (GenFeature keyFeature : genFeature.getKeys()) {

-									stringBuffer.append(TEXT_237);

+									stringBuffer.append(TEXT_240);

 									stringBuffer.append(genFeature.getFeatureAccessorName());

-									stringBuffer.append(TEXT_238);

+									stringBuffer.append(TEXT_241);

 									stringBuffer

 											.append(genPackage.getPackageInstanceVariable(keyFeature.getGenPackage()));

-									stringBuffer.append(TEXT_223);

+									stringBuffer.append(TEXT_226);

 									stringBuffer.append(keyFeature.getFeatureAccessorName());

-									stringBuffer.append(TEXT_224);

+									stringBuffer.append(TEXT_227);

 								}

 							} else {

-								stringBuffer.append(TEXT_239);

+								stringBuffer.append(TEXT_242);

 								stringBuffer.append(genFeature.getFeatureAccessorName());

-								stringBuffer.append(TEXT_235);

+								stringBuffer.append(TEXT_238);

 								if (genFeature.hasGenericType()) {

-									stringBuffer.append(TEXT_236);

+									stringBuffer.append(TEXT_239);

 								} else {

 									stringBuffer.append(

 											genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage()));

-									stringBuffer.append(TEXT_223);

+									stringBuffer.append(TEXT_226);

 									stringBuffer.append(genFeature.getTypeClassifierAccessorName());

 									stringBuffer.append(TEXT_47);

 								}

-								stringBuffer.append(TEXT_211);

+								stringBuffer.append(TEXT_214);

 								stringBuffer.append(genFeature.getName());

-								stringBuffer.append(TEXT_232);

+								stringBuffer.append(TEXT_235);

 								stringBuffer.append(genFeature.getDefaultValue());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getLowerBound());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getUpperBound());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getContainerClass());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getTransientFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getVolatileFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getChangeableFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getUnsettableFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getIDFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getUniqueFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getDerivedFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genFeature.getOrderedFlag());

-								stringBuffer.append(TEXT_172);

+								stringBuffer.append(TEXT_175);

 								stringBuffer.append(genModel.getNonNLS());

 								stringBuffer.append(genModel.getNonNLS(genFeature.getDefaultValue(), 2));

 							}

@@ -1955,34 +1975,34 @@
 								stringBuffer.append(TEXT_91);

 								stringBuffer.append(prefix);

 								if (genModel.isOperationReflection()) {

-									stringBuffer.append(TEXT_240);

+									stringBuffer.append(TEXT_243);

 									stringBuffer.append(genOperation.getOperationAccessorName());

 									stringBuffer.append(TEXT_47);

 								} else {

-									stringBuffer.append(TEXT_241);

+									stringBuffer.append(TEXT_244);

 									stringBuffer.append(genClass.getClassifierInstanceName());

 								}

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								if (genOperation.isVoid() || genOperation.hasGenericType()) {

-									stringBuffer.append(TEXT_230);

+									stringBuffer.append(TEXT_233);

 								} else {

 									stringBuffer.append(

 											genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage()));

-									stringBuffer.append(TEXT_223);

+									stringBuffer.append(TEXT_226);

 									stringBuffer.append(genOperation.getTypeClassifierAccessorName());

 									stringBuffer.append(TEXT_47);

 								}

-								stringBuffer.append(TEXT_211);

+								stringBuffer.append(TEXT_214);

 								stringBuffer.append(genOperation.getName());

-								stringBuffer.append(TEXT_232);

+								stringBuffer.append(TEXT_235);

 								stringBuffer.append(genOperation.getLowerBound());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genOperation.getUpperBound());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genOperation.getUniqueFlag());

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(genOperation.getOrderedFlag());

-								stringBuffer.append(TEXT_172);

+								stringBuffer.append(TEXT_175);

 								stringBuffer.append(genModel.getNonNLS());

 							} else if (!genOperation.isVoid()) {

 								if (!genOperation.getEcoreOperation().isOrdered()

@@ -1991,69 +2011,69 @@
 									stringBuffer.append(TEXT_91);

 									stringBuffer.append(prefix);

 									if (genModel.isOperationReflection()) {

-										stringBuffer.append(TEXT_240);

+										stringBuffer.append(TEXT_243);

 										stringBuffer.append(genOperation.getOperationAccessorName());

 										stringBuffer.append(TEXT_47);

 									} else {

-										stringBuffer.append(TEXT_241);

+										stringBuffer.append(TEXT_244);

 										stringBuffer.append(genClass.getClassifierInstanceName());

 									}

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(

 											genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage()));

-									stringBuffer.append(TEXT_223);

+									stringBuffer.append(TEXT_226);

 									stringBuffer.append(genOperation.getTypeClassifierAccessorName());

-									stringBuffer.append(TEXT_242);

+									stringBuffer.append(TEXT_245);

 									stringBuffer.append(genOperation.getName());

-									stringBuffer.append(TEXT_232);

+									stringBuffer.append(TEXT_235);

 									stringBuffer.append(genOperation.getLowerBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genOperation.getUpperBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genOperation.getUniqueFlag());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genOperation.getOrderedFlag());

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									stringBuffer.append(genModel.getNonNLS());

 								} else {

 									stringBuffer.append(TEXT_91);

 									stringBuffer.append(prefix);

 									if (genModel.isOperationReflection()) {

-										stringBuffer.append(TEXT_240);

+										stringBuffer.append(TEXT_243);

 										stringBuffer.append(genOperation.getOperationAccessorName());

 										stringBuffer.append(TEXT_47);

 									} else {

-										stringBuffer.append(TEXT_241);

+										stringBuffer.append(TEXT_244);

 										stringBuffer.append(genClass.getClassifierInstanceName());

 									}

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(

 											genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage()));

-									stringBuffer.append(TEXT_223);

+									stringBuffer.append(TEXT_226);

 									stringBuffer.append(genOperation.getTypeClassifierAccessorName());

-									stringBuffer.append(TEXT_242);

+									stringBuffer.append(TEXT_245);

 									stringBuffer.append(genOperation.getName());

-									stringBuffer.append(TEXT_232);

+									stringBuffer.append(TEXT_235);

 									stringBuffer.append(genOperation.getLowerBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genOperation.getUpperBound());

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									stringBuffer.append(genModel.getNonNLS());

 								}

 							} else {

 								stringBuffer.append(TEXT_91);

 								stringBuffer.append(prefix);

 								if (genModel.isOperationReflection()) {

-									stringBuffer.append(TEXT_240);

+									stringBuffer.append(TEXT_243);

 									stringBuffer.append(genOperation.getOperationAccessorName());

 									stringBuffer.append(TEXT_47);

 								} else {

-									stringBuffer.append(TEXT_241);

+									stringBuffer.append(TEXT_244);

 									stringBuffer.append(genClass.getClassifierInstanceName());

 								}

-								stringBuffer.append(TEXT_243);

+								stringBuffer.append(TEXT_246);

 								stringBuffer.append(genOperation.getName());

-								stringBuffer.append(TEXT_212);

+								stringBuffer.append(TEXT_215);

 								stringBuffer.append(genModel.getNonNLS());

 							}

 							if (genModel.useGenerics()) {

@@ -2074,9 +2094,9 @@
 									}

 									stringBuffer.append(TEXT_91);

 									stringBuffer.append(typeParameterVariable);

-									stringBuffer.append(TEXT_244);

+									stringBuffer.append(TEXT_247);

 									stringBuffer.append(genTypeParameter.getName());

-									stringBuffer.append(TEXT_212);

+									stringBuffer.append(TEXT_215);

 									stringBuffer.append(genModel.getNonNLS());

 									for (EGenericType typeParameter : genTypeParameter.getEcoreTypeParameter()

 											.getEBounds()) {

@@ -2091,24 +2111,24 @@
 											}

 											stringBuffer.append(TEXT_91);

 											stringBuffer.append(typePrefix);

-											stringBuffer.append(TEXT_215);

+											stringBuffer.append(TEXT_218);

 											stringBuffer.append(info.depth + 1);

-											stringBuffer.append(TEXT_216);

+											stringBuffer.append(TEXT_219);

 											stringBuffer.append(info.type);

-											stringBuffer.append(TEXT_172);

+											stringBuffer.append(TEXT_175);

 											if (info.depth > 0) {

-												stringBuffer.append(TEXT_217);

+												stringBuffer.append(TEXT_220);

 												stringBuffer.append(info.depth);

-												stringBuffer.append(TEXT_218);

+												stringBuffer.append(TEXT_221);

 												stringBuffer.append(info.accessor);

-												stringBuffer.append(TEXT_219);

+												stringBuffer.append(TEXT_222);

 												stringBuffer.append(info.depth + 1);

-												stringBuffer.append(TEXT_172);

+												stringBuffer.append(TEXT_175);

 											}

 										}

-										stringBuffer.append(TEXT_245);

+										stringBuffer.append(TEXT_248);

 										stringBuffer.append(t.nextIndex());

-										stringBuffer.append(TEXT_220);

+										stringBuffer.append(TEXT_223);

 									}

 								}

 							}

@@ -2125,88 +2145,88 @@
 										}

 										stringBuffer.append(TEXT_91);

 										stringBuffer.append(typePrefix);

-										stringBuffer.append(TEXT_215);

+										stringBuffer.append(TEXT_218);

 										stringBuffer.append(info.depth + 1);

-										stringBuffer.append(TEXT_216);

+										stringBuffer.append(TEXT_219);

 										stringBuffer.append(info.type);

-										stringBuffer.append(TEXT_172);

+										stringBuffer.append(TEXT_175);

 										if (info.depth > 0) {

-											stringBuffer.append(TEXT_217);

+											stringBuffer.append(TEXT_220);

 											stringBuffer.append(info.depth);

-											stringBuffer.append(TEXT_218);

+											stringBuffer.append(TEXT_221);

 											stringBuffer.append(info.accessor);

-											stringBuffer.append(TEXT_219);

+											stringBuffer.append(TEXT_222);

 											stringBuffer.append(info.depth + 1);

-											stringBuffer.append(TEXT_172);

+											stringBuffer.append(TEXT_175);

 										}

 									}

 								}

 								if (genModel.useGenerics()) {

-									stringBuffer.append(TEXT_246);

+									stringBuffer.append(TEXT_249);

 									if (genParameter.hasGenericType()) {

-										stringBuffer.append(TEXT_236);

+										stringBuffer.append(TEXT_239);

 									} else {

 										stringBuffer.append(genPackage

 												.getPackageInstanceVariable(genParameter.getTypeGenPackage()));

-										stringBuffer.append(TEXT_223);

+										stringBuffer.append(TEXT_226);

 										stringBuffer.append(genParameter.getTypeClassifierAccessorName());

 										stringBuffer.append(TEXT_47);

 									}

-									stringBuffer.append(TEXT_211);

+									stringBuffer.append(TEXT_214);

 									stringBuffer.append(genParameter.getName());

-									stringBuffer.append(TEXT_232);

+									stringBuffer.append(TEXT_235);

 									stringBuffer.append(genParameter.getLowerBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genParameter.getUpperBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genParameter.getUniqueFlag());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genParameter.getOrderedFlag());

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									stringBuffer.append(genModel.getNonNLS());

 								} else if (!genParameter.getEcoreParameter().isOrdered()

 										|| !genParameter.getEcoreParameter().isUnique()) {

 									needsAddEParameter = true;

-									stringBuffer.append(TEXT_246);

+									stringBuffer.append(TEXT_249);

 									if (genParameter.hasGenericType()) {

-										stringBuffer.append(TEXT_236);

+										stringBuffer.append(TEXT_239);

 									} else {

 										stringBuffer.append(genPackage

 												.getPackageInstanceVariable(genParameter.getTypeGenPackage()));

-										stringBuffer.append(TEXT_223);

+										stringBuffer.append(TEXT_226);

 										stringBuffer.append(genParameter.getTypeClassifierAccessorName());

 										stringBuffer.append(TEXT_47);

 									}

-									stringBuffer.append(TEXT_211);

+									stringBuffer.append(TEXT_214);

 									stringBuffer.append(genParameter.getName());

-									stringBuffer.append(TEXT_232);

+									stringBuffer.append(TEXT_235);

 									stringBuffer.append(genParameter.getLowerBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genParameter.getUpperBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genParameter.getUniqueFlag());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genParameter.getOrderedFlag());

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									stringBuffer.append(genModel.getNonNLS());

 								} else {

-									stringBuffer.append(TEXT_246);

+									stringBuffer.append(TEXT_249);

 									if (genParameter.hasGenericType()) {

-										stringBuffer.append(TEXT_236);

+										stringBuffer.append(TEXT_239);

 									} else {

 										stringBuffer.append(genPackage

 												.getPackageInstanceVariable(genParameter.getTypeGenPackage()));

-										stringBuffer.append(TEXT_223);

+										stringBuffer.append(TEXT_226);

 										stringBuffer.append(genParameter.getTypeClassifierAccessorName());

 										stringBuffer.append(TEXT_47);

 									}

-									stringBuffer.append(TEXT_211);

+									stringBuffer.append(TEXT_214);

 									stringBuffer.append(genParameter.getName());

-									stringBuffer.append(TEXT_232);

+									stringBuffer.append(TEXT_235);

 									stringBuffer.append(genParameter.getLowerBound());

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(genParameter.getUpperBound());

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									stringBuffer.append(genModel.getNonNLS());

 								}

 							}

@@ -2224,33 +2244,33 @@
 										}

 										stringBuffer.append(TEXT_91);

 										stringBuffer.append(typePrefix);

-										stringBuffer.append(TEXT_215);

+										stringBuffer.append(TEXT_218);

 										stringBuffer.append(info.depth + 1);

-										stringBuffer.append(TEXT_216);

+										stringBuffer.append(TEXT_219);

 										stringBuffer.append(info.type);

-										stringBuffer.append(TEXT_172);

+										stringBuffer.append(TEXT_175);

 										if (info.depth > 0) {

-											stringBuffer.append(TEXT_217);

+											stringBuffer.append(TEXT_220);

 											stringBuffer.append(info.depth);

-											stringBuffer.append(TEXT_218);

+											stringBuffer.append(TEXT_221);

 											stringBuffer.append(info.accessor);

-											stringBuffer.append(TEXT_219);

+											stringBuffer.append(TEXT_222);

 											stringBuffer.append(info.depth + 1);

-											stringBuffer.append(TEXT_172);

+											stringBuffer.append(TEXT_175);

 										}

-										stringBuffer.append(TEXT_247);

+										stringBuffer.append(TEXT_250);

 										stringBuffer.append(info.depth + 1);

-										stringBuffer.append(TEXT_172);

+										stringBuffer.append(TEXT_175);

 									}

 								}

 							} else {

 								for (GenClassifier genException : genOperation.getGenExceptions()) {

-									stringBuffer.append(TEXT_248);

+									stringBuffer.append(TEXT_251);

 									stringBuffer.append(

 											genPackage.getPackageInstanceVariable(genException.getGenPackage()));

-									stringBuffer.append(TEXT_223);

+									stringBuffer.append(TEXT_226);

 									stringBuffer.append(genException.getClassifierAccessorName());

-									stringBuffer.append(TEXT_224);

+									stringBuffer.append(TEXT_227);

 								}

 							}

 							if (!genOperation.isVoid() && genOperation.hasGenericType()) {

@@ -2265,22 +2285,22 @@
 									}

 									stringBuffer.append(TEXT_91);

 									stringBuffer.append(typePrefix);

-									stringBuffer.append(TEXT_215);

+									stringBuffer.append(TEXT_218);

 									stringBuffer.append(info.depth + 1);

-									stringBuffer.append(TEXT_216);

+									stringBuffer.append(TEXT_219);

 									stringBuffer.append(info.type);

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 									if (info.depth > 0) {

-										stringBuffer.append(TEXT_217);

+										stringBuffer.append(TEXT_220);

 										stringBuffer.append(info.depth);

-										stringBuffer.append(TEXT_218);

+										stringBuffer.append(TEXT_221);

 										stringBuffer.append(info.accessor);

-										stringBuffer.append(TEXT_219);

+										stringBuffer.append(TEXT_222);

 										stringBuffer.append(info.depth + 1);

-										stringBuffer.append(TEXT_172);

+										stringBuffer.append(TEXT_175);

 									}

 								}

-								stringBuffer.append(TEXT_249);

+								stringBuffer.append(TEXT_252);

 							}

 						}

 						if (c.hasNext()) {

@@ -2289,27 +2309,27 @@
 					}

 				}

 				if (!genPackage.getGenEnums().isEmpty()) {

-					stringBuffer.append(TEXT_250);

+					stringBuffer.append(TEXT_253);

 					for (Iterator<GenEnum> e = genPackage.getGenEnums().iterator(); e.hasNext();) {

 						GenEnum genEnum = e.next();

-						stringBuffer.append(TEXT_251);

+						stringBuffer.append(TEXT_254);

 						stringBuffer.append(genEnum.getClassifierInstanceName());

-						stringBuffer.append(TEXT_195);

+						stringBuffer.append(TEXT_198);

 						stringBuffer.append(genEnum.getImportedName());

-						stringBuffer.append(TEXT_252);

+						stringBuffer.append(TEXT_255);

 						stringBuffer.append(genEnum.getName());

-						stringBuffer.append(TEXT_212);

+						stringBuffer.append(TEXT_215);

 						stringBuffer.append(genModel.getNonNLS());

 						for (GenEnumLiteral genEnumLiteral : genEnum.getGenEnumLiterals()) {

-							stringBuffer.append(TEXT_253);

+							stringBuffer.append(TEXT_256);

 							stringBuffer.append(genEnum.getClassifierInstanceName());

-							stringBuffer.append(TEXT_195);

+							stringBuffer.append(TEXT_198);

 							stringBuffer.append(genEnum.getImportedName().equals(genEnum.getClassifierID())

 									? genEnum.getQualifiedName()

 									: genEnum.getImportedName());

-							stringBuffer.append(TEXT_218);

+							stringBuffer.append(TEXT_221);

 							stringBuffer.append(genEnumLiteral.getEnumLiteralInstanceConstantName());

-							stringBuffer.append(TEXT_172);

+							stringBuffer.append(TEXT_175);

 						}

 						if (e.hasNext()) {

 							stringBuffer.append(TEXT_4);

@@ -2317,27 +2337,27 @@
 					}

 				}

 				if (!genPackage.getGenDataTypes().isEmpty()) {

-					stringBuffer.append(TEXT_254);

+					stringBuffer.append(TEXT_257);

 					for (GenDataType genDataType : genPackage.getGenDataTypes()) {

 						boolean hasInstanceTypeName = genModel.useGenerics()

 								&& genDataType.getEcoreDataType().getInstanceTypeName() != null

 								&& genDataType.getEcoreDataType().getInstanceTypeName().contains("<");

-						stringBuffer.append(TEXT_255);

+						stringBuffer.append(TEXT_258);

 						stringBuffer.append(genDataType.getClassifierInstanceName());

-						stringBuffer.append(TEXT_195);

+						stringBuffer.append(TEXT_198);

 						stringBuffer.append(genDataType.getRawImportedInstanceClassName());

-						stringBuffer.append(TEXT_252);

+						stringBuffer.append(TEXT_255);

 						stringBuffer.append(genDataType.getName());

-						stringBuffer.append(TEXT_232);

+						stringBuffer.append(TEXT_235);

 						stringBuffer.append(genDataType.getSerializableFlag());

-						stringBuffer.append(TEXT_195);

+						stringBuffer.append(TEXT_198);

 						stringBuffer.append(genDataType.getGeneratedInstanceClassFlag());

 						if (hasInstanceTypeName) {

-							stringBuffer.append(TEXT_211);

+							stringBuffer.append(TEXT_214);

 							stringBuffer.append(genDataType.getEcoreDataType().getInstanceTypeName());

-							stringBuffer.append(TEXT_233);

+							stringBuffer.append(TEXT_236);

 						}

-						stringBuffer.append(TEXT_172);

+						stringBuffer.append(TEXT_175);

 						stringBuffer.append(genModel.getNonNLS());

 						if (hasInstanceTypeName) {

 							stringBuffer.append(genModel.getNonNLS(2));

@@ -2345,31 +2365,31 @@
 					}

 				}

 				if (genPackage.getSuperGenPackage() == null) {

-					stringBuffer.append(TEXT_256);

+					stringBuffer.append(TEXT_259);

 					stringBuffer.append(genPackage.getSchemaLocation());

-					stringBuffer.append(TEXT_172);

+					stringBuffer.append(TEXT_175);

 				}

 				if (!genPackage.isEcorePackage() && !genPackage.getAnnotationSources().isEmpty()) {

-					stringBuffer.append(TEXT_257);

+					stringBuffer.append(TEXT_260);

 					for (String annotationSource : genPackage.getAnnotationSources()) {

-						stringBuffer.append(TEXT_258);

+						stringBuffer.append(TEXT_261);

 						stringBuffer.append(annotationSource);

-						stringBuffer.append(TEXT_194);

+						stringBuffer.append(TEXT_197);

 						stringBuffer.append(genPackage.getAnnotationSourceIdentifier(annotationSource));

-						stringBuffer.append(TEXT_259);

+						stringBuffer.append(TEXT_262);

 					}

 				}

-				stringBuffer.append(TEXT_260);

+				stringBuffer.append(TEXT_263);

 				for (String annotationSource : genPackage.getAnnotationSources()) {

-					stringBuffer.append(TEXT_261);

+					stringBuffer.append(TEXT_264);

 					stringBuffer.append(annotationSource);

-					stringBuffer.append(TEXT_262);

+					stringBuffer.append(TEXT_265);

 					stringBuffer.append(genPackage.getAnnotationSourceIdentifier(annotationSource));

-					stringBuffer.append(TEXT_263);

+					stringBuffer.append(TEXT_266);

 					if (annotationSource == null) {

-						stringBuffer.append(TEXT_264);

+						stringBuffer.append(TEXT_267);

 					} else {

-						stringBuffer.append(TEXT_233);

+						stringBuffer.append(TEXT_236);

 						stringBuffer.append(annotationSource);

 						stringBuffer.append(TEXT_28);

 						stringBuffer.append(genModel.getNonNLS());

@@ -2379,51 +2399,51 @@
 								.getReferenceData(eAnnotation);

 						if (annotationSource == null ? eAnnotation.getSource() == null

 								: annotationSource.equals(eAnnotation.getSource())) {

-							stringBuffer.append(TEXT_265);

+							stringBuffer.append(TEXT_268);

 							stringBuffer.append(genPackage.getAnnotatedModelElementAccessor(eAnnotation));

-							stringBuffer.append(TEXT_266);

+							stringBuffer.append(TEXT_269);

 							for (Iterator<Map.Entry<String, String>> k = eAnnotation.getDetails().iterator(); k

 									.hasNext();) {

 								Map.Entry<String, String> detail = k.next();

 								String key = Literals.toStringLiteral(detail.getKey(), genModel);

 								String value = Literals.toStringLiteral(detail.getValue(), genModel);

-								stringBuffer.append(TEXT_267);

+								stringBuffer.append(TEXT_270);

 								stringBuffer.append(key);

-								stringBuffer.append(TEXT_195);

+								stringBuffer.append(TEXT_198);

 								stringBuffer.append(value);

 								stringBuffer.append(k.hasNext() ? "," : "");

 								stringBuffer.append(genModel.getNonNLS(key + value));

 							}

-							stringBuffer.append(TEXT_268);

+							stringBuffer.append(TEXT_271);

 							if (annotationReferenceDataList.isEmpty()) {

-								stringBuffer.append(TEXT_172);

+								stringBuffer.append(TEXT_175);

 							} else {

-								stringBuffer.append(TEXT_269);

+								stringBuffer.append(TEXT_272);

 							}

 							if (!annotationReferenceDataList.isEmpty()) {

-								stringBuffer.append(TEXT_270);

+								stringBuffer.append(TEXT_273);

 								stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

-								stringBuffer.append(TEXT_271);

+								stringBuffer.append(TEXT_274);

 								for (Iterator<GenPackage.AnnotationReferenceData> k = annotationReferenceDataList

 										.iterator(); k.hasNext();) {

 									GenPackage.AnnotationReferenceData annotationReferenceData = k.next();

-									stringBuffer.append(TEXT_272);

+									stringBuffer.append(TEXT_275);

 									stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

-									stringBuffer.append(TEXT_273);

+									stringBuffer.append(TEXT_276);

 									if (annotationReferenceData.containingGenPackage != genPackage) {

 										stringBuffer.append(annotationReferenceData.containingGenPackage

 												.getImportedPackageInterfaceName());

-										stringBuffer.append(TEXT_218);

+										stringBuffer.append(TEXT_221);

 									}

-									stringBuffer.append(TEXT_274);

+									stringBuffer.append(TEXT_277);

 									stringBuffer.append(annotationReferenceData.uriFragment);

-									stringBuffer.append(TEXT_275);

+									stringBuffer.append(TEXT_278);

 									if (k.hasNext()) {

-										stringBuffer.append(TEXT_269);

+										stringBuffer.append(TEXT_272);

 									}

 									stringBuffer.append(genModel.getNonNLS());

 								}

-								stringBuffer.append(TEXT_276);

+								stringBuffer.append(TEXT_279);

 							}

 							for (EAnnotation nestedEAnnotation : genPackage.getAllNestedAnnotations(eAnnotation)) {

 								String nestedAnnotationSource = nestedEAnnotation.getSource();

@@ -2446,106 +2466,106 @@
 								}

 								List<GenPackage.AnnotationReferenceData> nestedAnnotationReferenceDataList = genPackage

 										.getReferenceData(nestedEAnnotation);

-								stringBuffer.append(TEXT_265);

+								stringBuffer.append(TEXT_268);

 								stringBuffer.append(genPackage.getAnnotatedModelElementAccessor(eAnnotation));

-								stringBuffer.append(TEXT_277);

+								stringBuffer.append(TEXT_280);

 								if (nonContentAnnotation

 										&& genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF210_VALUE) {

-									stringBuffer.append(TEXT_278);

+									stringBuffer.append(TEXT_281);

 									stringBuffer.append(path.toString());

-									stringBuffer.append(TEXT_279);

+									stringBuffer.append(TEXT_282);

 								} else {

 									stringBuffer.append(depth);

 								}

-								stringBuffer.append(TEXT_277);

+								stringBuffer.append(TEXT_280);

 								if (nestedAnnotationSource == null) {

-									stringBuffer.append(TEXT_280);

+									stringBuffer.append(TEXT_283);

 								} else {

-									stringBuffer.append(TEXT_233);

+									stringBuffer.append(TEXT_236);

 									stringBuffer.append(nestedAnnotationSource);

-									stringBuffer.append(TEXT_281);

+									stringBuffer.append(TEXT_284);

 									stringBuffer.append(genModel.getNonNLS());

 								}

-								stringBuffer.append(TEXT_282);

+								stringBuffer.append(TEXT_285);

 								for (Iterator<Map.Entry<String, String>> l = nestedEAnnotation.getDetails()

 										.iterator(); l.hasNext();) {

 									Map.Entry<String, String> detail = l.next();

 									String key = Literals.toStringLiteral(detail.getKey(), genModel);

 									String value = Literals.toStringLiteral(detail.getValue(), genModel);

-									stringBuffer.append(TEXT_267);

+									stringBuffer.append(TEXT_270);

 									stringBuffer.append(key);

-									stringBuffer.append(TEXT_195);

+									stringBuffer.append(TEXT_198);

 									stringBuffer.append(value);

 									stringBuffer.append(l.hasNext() ? "," : "");

 									stringBuffer.append(genModel.getNonNLS(key + value));

 								}

-								stringBuffer.append(TEXT_268);

+								stringBuffer.append(TEXT_271);

 								if (nestedAnnotationReferenceDataList.isEmpty()) {

-									stringBuffer.append(TEXT_172);

+									stringBuffer.append(TEXT_175);

 								} else {

-									stringBuffer.append(TEXT_269);

+									stringBuffer.append(TEXT_272);

 								}

 								if (!nestedAnnotationReferenceDataList.isEmpty()) {

-									stringBuffer.append(TEXT_270);

+									stringBuffer.append(TEXT_273);

 									stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

-									stringBuffer.append(TEXT_271);

+									stringBuffer.append(TEXT_274);

 									for (Iterator<GenPackage.AnnotationReferenceData> l = nestedAnnotationReferenceDataList

 											.iterator(); l.hasNext();) {

 										GenPackage.AnnotationReferenceData annotationReferenceData = l.next();

-										stringBuffer.append(TEXT_272);

+										stringBuffer.append(TEXT_275);

 										stringBuffer

 												.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

-										stringBuffer.append(TEXT_273);

+										stringBuffer.append(TEXT_276);

 										if (annotationReferenceData.containingGenPackage != genPackage) {

 											stringBuffer.append(annotationReferenceData.containingGenPackage

 													.getImportedPackageInterfaceName());

-											stringBuffer.append(TEXT_218);

+											stringBuffer.append(TEXT_221);

 										}

-										stringBuffer.append(TEXT_274);

+										stringBuffer.append(TEXT_277);

 										stringBuffer.append(annotationReferenceData.uriFragment);

-										stringBuffer.append(TEXT_275);

+										stringBuffer.append(TEXT_278);

 										if (l.hasNext()) {

-											stringBuffer.append(TEXT_269);

+											stringBuffer.append(TEXT_272);

 										}

 										stringBuffer.append(genModel.getNonNLS());

 									}

-									stringBuffer.append(TEXT_276);

+									stringBuffer.append(TEXT_279);

 								}

 							}

 						}

 					}

-					stringBuffer.append(TEXT_260);

+					stringBuffer.append(TEXT_263);

 				}

 			} else {

 				if (genPackage.isLoadingInitialization()) {

-					stringBuffer.append(TEXT_283);

-					stringBuffer.append(genModel.getImportedName("java.net.URL"));

-					stringBuffer.append(TEXT_284);

-					stringBuffer.append(genModel.getNonNLS());

-					stringBuffer.append(TEXT_285);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

 					stringBuffer.append(TEXT_286);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

+					stringBuffer.append(genModel.getImportedName("java.net.URL"));

 					stringBuffer.append(TEXT_287);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.resource.Resource"));

+					stringBuffer.append(genModel.getNonNLS());

 					stringBuffer.append(TEXT_288);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

+					stringBuffer.append(TEXT_289);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.URI"));

+					stringBuffer.append(TEXT_290);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.resource.Resource"));

+					stringBuffer.append(TEXT_291);

 					stringBuffer.append(

 							genModel.getImportedName("org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl"));

-					stringBuffer.append(TEXT_289);

-					stringBuffer.append(genModel.getImportedName("java.io.IOException"));

-					stringBuffer.append(TEXT_290);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.WrappedException"));

-					stringBuffer.append(TEXT_291);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage"));

 					stringBuffer.append(TEXT_292);

-				}

-				stringBuffer.append(TEXT_293);

-				if (genModel.useClassOverrideAnnotation()) {

+					stringBuffer.append(genModel.getImportedName("java.io.IOException"));

+					stringBuffer.append(TEXT_293);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.WrappedException"));

 					stringBuffer.append(TEXT_294);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EPackage"));

+					stringBuffer.append(TEXT_295);

 				}

-				stringBuffer.append(TEXT_295);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier"));

 				stringBuffer.append(TEXT_296);

+				if (genModel.useClassOverrideAnnotation()) {

+					stringBuffer.append(TEXT_156);

+				}

+				stringBuffer.append(TEXT_297);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier"));

+				stringBuffer.append(TEXT_298);

 				ArrayList<GenClass> dynamicGenClasses = new ArrayList<GenClass>();

 				for (GenClass genClass : genPackage.getGenClasses()) {

 					if (genClass.isDynamic()) {

@@ -2553,173 +2573,173 @@
 					}

 				}

 				if (dynamicGenClasses.isEmpty()) {

-					stringBuffer.append(TEXT_297);

-					stringBuffer.append(genPackage.getInterfacePackageName());

-					stringBuffer.append(TEXT_298);

-					stringBuffer.append(genModel.getNonNLS());

 					stringBuffer.append(TEXT_299);

-				} else {

+					stringBuffer.append(genPackage.getInterfacePackageName());

 					stringBuffer.append(TEXT_300);

+					stringBuffer.append(genModel.getNonNLS());

+					stringBuffer.append(TEXT_301);

+				} else {

+					stringBuffer.append(TEXT_302);

 					for (GenClass genClass : dynamicGenClasses) {

 						if (genClass.isDynamic()) {

-							stringBuffer.append(TEXT_301);

+							stringBuffer.append(TEXT_303);

 							stringBuffer.append(genPackage.getClassifierID(genClass));

-							stringBuffer.append(TEXT_302);

+							stringBuffer.append(TEXT_304);

 						}

 					}

-					stringBuffer.append(TEXT_303);

+					stringBuffer.append(TEXT_305);

 					stringBuffer.append(genPackage.getInterfacePackageName());

-					stringBuffer.append(TEXT_298);

+					stringBuffer.append(TEXT_300);

 					stringBuffer.append(genModel.getNonNLS());

-					stringBuffer.append(TEXT_304);

+					stringBuffer.append(TEXT_306);

 				}

-				stringBuffer.append(TEXT_305);

+				stringBuffer.append(TEXT_307);

 			}

 			if (needsAddEOperation) {

-				stringBuffer.append(TEXT_306);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation"));

-				stringBuffer.append(TEXT_307);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClass"));

 				stringBuffer.append(TEXT_308);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier"));

-				stringBuffer.append(TEXT_309);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation"));

+				stringBuffer.append(TEXT_309);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClass"));

 				stringBuffer.append(TEXT_310);

-			}

-			if (needsAddEParameter) {

-				stringBuffer.append(TEXT_306);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EParameter"));

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier"));

 				stringBuffer.append(TEXT_311);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation"));

-				stringBuffer.append(TEXT_308);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier"));

-				stringBuffer.append(TEXT_309);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EParameter"));

 				stringBuffer.append(TEXT_312);

 			}

+			if (needsAddEParameter) {

+				stringBuffer.append(TEXT_308);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EParameter"));

+				stringBuffer.append(TEXT_313);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EOperation"));

+				stringBuffer.append(TEXT_310);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EClassifier"));

+				stringBuffer.append(TEXT_311);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.EParameter"));

+				stringBuffer.append(TEXT_314);

+			}

 		}

 		if (isInterface && genPackage.isLiteralsInterface()) {

-			stringBuffer.append(TEXT_313);

-			if (genModel.isOperationReflection()) {

-				stringBuffer.append(TEXT_314);

-			}

 			stringBuffer.append(TEXT_315);

-			if (isImplementation) {

+			if (genModel.isOperationReflection()) {

 				stringBuffer.append(TEXT_316);

 			}

 			stringBuffer.append(TEXT_317);

-			for (GenClassifier genClassifier : genPackage.getGenClassifiers()) {

+			if (isImplementation) {

 				stringBuffer.append(TEXT_318);

+			}

+			stringBuffer.append(TEXT_319);

+			for (GenClassifier genClassifier : genPackage.getGenClassifiers()) {

+				stringBuffer.append(TEXT_320);

 				if (genClassifier instanceof GenClass) {

 					GenClass genClass = (GenClass) genClassifier;

 					if (!genClass.isInterface()) {

-						stringBuffer.append(TEXT_319);

+						stringBuffer.append(TEXT_321);

 						stringBuffer.append(genClass.getQualifiedClassName());

 						stringBuffer.append(TEXT_40);

 						stringBuffer.append(genClass.getFormattedName());

-						stringBuffer.append(TEXT_320);

+						stringBuffer.append(TEXT_322);

 						stringBuffer.append(genClass.getQualifiedClassName());

 					} else {

-						stringBuffer.append(TEXT_319);

+						stringBuffer.append(TEXT_321);

 						stringBuffer.append(genClass.getRawQualifiedInterfaceName());

 						stringBuffer.append(TEXT_40);

 						stringBuffer.append(genClass.getFormattedName());

-						stringBuffer.append(TEXT_320);

+						stringBuffer.append(TEXT_322);

 						stringBuffer.append(genClass.getRawQualifiedInterfaceName());

 					}

 				} else if (genClassifier instanceof GenEnum) {

 					GenEnum genEnum = (GenEnum) genClassifier;

-					stringBuffer.append(TEXT_319);

+					stringBuffer.append(TEXT_321);

 					stringBuffer.append(genEnum.getQualifiedName());

 					stringBuffer.append(TEXT_40);

 					stringBuffer.append(genEnum.getFormattedName());

-					stringBuffer.append(TEXT_321);

+					stringBuffer.append(TEXT_323);

 					stringBuffer.append(genEnum.getQualifiedName());

 				} else if (genClassifier instanceof GenDataType) {

 					GenDataType genDataType = (GenDataType) genClassifier;

-					stringBuffer.append(TEXT_322);

+					stringBuffer.append(TEXT_324);

 					stringBuffer.append(genDataType.getFormattedName());

-					stringBuffer.append(TEXT_323);

+					stringBuffer.append(TEXT_325);

 					if (!genDataType.isPrimitiveType() && !genDataType.isArrayType()) {

-						stringBuffer.append(TEXT_324);

+						stringBuffer.append(TEXT_326);

 						stringBuffer.append(genDataType.getRawInstanceClassName());

 					}

 				}

-				stringBuffer.append(TEXT_324);

+				stringBuffer.append(TEXT_326);

 				stringBuffer.append(genPackage.getQualifiedPackageClassName());

 				stringBuffer.append(TEXT_46);

 				stringBuffer.append(genClassifier.getClassifierAccessorName());

 				stringBuffer.append(TEXT_47);

 				if (genClassifier.hasAPITags()) {

-					stringBuffer.append(TEXT_325);

+					stringBuffer.append(TEXT_327);

 					stringBuffer.append(genClassifier.getAPITags(genModel.getIndentation(stringBuffer)));

 				}

-				stringBuffer.append(TEXT_326);

+				stringBuffer.append(TEXT_328);

 				if (isJDK50 && genClassifier.hasAPIDeprecatedTag()) {

-					stringBuffer.append(TEXT_327);

+					stringBuffer.append(TEXT_329);

 				}

 				stringBuffer.append(TEXT_91);

 				stringBuffer.append(publicStaticFinalFlag);

 				stringBuffer.append(genClassifier.getImportedMetaType());

 				stringBuffer.append(TEXT_67);

 				stringBuffer.append(genPackage.getClassifierID(genClassifier));

-				stringBuffer.append(TEXT_328);

+				stringBuffer.append(TEXT_330);

 				stringBuffer.append(genClassifier.getClassifierAccessorName());

-				stringBuffer.append(TEXT_163);

+				stringBuffer.append(TEXT_166);

 				if (genClassifier instanceof GenClass) {

 					GenClass genClass = (GenClass) genClassifier;

 					for (GenFeature genFeature : genClass.getGenFeatures()) {

-						stringBuffer.append(TEXT_329);

+						stringBuffer.append(TEXT_331);

 						stringBuffer.append(genFeature.getFormattedName());

 						stringBuffer.append(TEXT_56);

 						stringBuffer.append(genFeature.getFeatureKind());

-						stringBuffer.append(TEXT_330);

+						stringBuffer.append(TEXT_332);

 						if (genFeature.hasImplicitAPITags()) {

-							stringBuffer.append(TEXT_325);

+							stringBuffer.append(TEXT_327);

 							stringBuffer.append(genFeature.getImplicitAPITags(genModel.getIndentation(stringBuffer)));

 						}

-						stringBuffer.append(TEXT_326);

+						stringBuffer.append(TEXT_328);

 						if (isJDK50 && genFeature.hasImplicitAPIDeprecatedTag()) {

-							stringBuffer.append(TEXT_327);

+							stringBuffer.append(TEXT_329);

 						}

 						stringBuffer.append(TEXT_91);

 						stringBuffer.append(publicStaticFinalFlag);

 						stringBuffer.append(genFeature.getImportedMetaType());

 						stringBuffer.append(TEXT_67);

 						stringBuffer.append(genClass.getFeatureID(genFeature));

-						stringBuffer.append(TEXT_328);

+						stringBuffer.append(TEXT_330);

 						stringBuffer.append(genFeature.getFeatureAccessorName());

-						stringBuffer.append(TEXT_163);

+						stringBuffer.append(TEXT_166);

 					}

 					if (genModel.isOperationReflection()) {

 						for (GenOperation genOperation : genClass.getGenOperations()) {

-							stringBuffer.append(TEXT_329);

-							stringBuffer.append(genOperation.getFormattedName());

 							stringBuffer.append(TEXT_331);

+							stringBuffer.append(genOperation.getFormattedName());

+							stringBuffer.append(TEXT_333);

 							if (genOperation.hasImplicitAPITags()) {

-								stringBuffer.append(TEXT_325);

+								stringBuffer.append(TEXT_327);

 								stringBuffer

 										.append(genOperation.getImplicitAPITags(genModel.getIndentation(stringBuffer)));

 							}

-							stringBuffer.append(TEXT_326);

+							stringBuffer.append(TEXT_328);

 							if (isJDK50 && genOperation.hasImplicitAPIDeprecatedTag()) {

-								stringBuffer.append(TEXT_327);

+								stringBuffer.append(TEXT_329);

 							}

 							stringBuffer.append(TEXT_91);

 							stringBuffer.append(publicStaticFinalFlag);

 							stringBuffer.append(genOperation.getImportedMetaType());

 							stringBuffer.append(TEXT_67);

 							stringBuffer.append(genClass.getOperationID(genOperation, false));

-							stringBuffer.append(TEXT_328);

+							stringBuffer.append(TEXT_330);

 							stringBuffer.append(genOperation.getOperationAccessorName());

-							stringBuffer.append(TEXT_163);

+							stringBuffer.append(TEXT_166);

 						}

 					}

 				}

 			}

-			stringBuffer.append(TEXT_260);

+			stringBuffer.append(TEXT_263);

 		}

-		stringBuffer.append(TEXT_332);

+		stringBuffer.append(TEXT_334);

 		stringBuffer.append(isInterface ? genPackage.getPackageInterfaceName() : genPackage.getPackageClassName());

 		genModel.emitSortedImports();

 		stringBuffer.append(TEXT_4);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
index 9534939..9e8b2ad 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/Plugin.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -198,9 +198,9 @@
 		/**

 		 * Copyright (c) 2002-2004 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
index 288fcf8..d6e771b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginProperties.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -29,7 +29,7 @@
 	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

 	protected final String TEXT_1 = "";

 	protected final String TEXT_2 = NL + NL + "pluginName = ";

-	protected final String TEXT_3 = " Model" + NL + "providerName = www.example.org";

+	protected final String TEXT_3 = NL + "providerName = ";

 	protected final String TEXT_4 = NL;

 	protected final String TEXT_5 = NL + "_UI_";

 	protected final String TEXT_6 = "_content_type = ";

@@ -111,7 +111,8 @@
 			throws Exception {

 

 		GenModel genModel = parameter;

-		targetPathName = genModel.getModelProjectDirectory() + "/plugin.properties";

+		targetPathName = genModel.getModelProjectDirectory() + "/" + genModel.getModelBundleLocalization()

+				+ ".properties";

 

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "setReporterVariables", stringBuffer.toString());

@@ -141,9 +142,9 @@
 		/**

 		 * Copyright (c) 2002-2004 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

@@ -167,8 +168,9 @@
 		}

 

 		stringBuffer.append(TEXT_2);

-		stringBuffer.append(genModel.getModelName());

+		stringBuffer.append(genModel.getModelBundleName());

 		stringBuffer.append(TEXT_3);

+		stringBuffer.append(genModel.getModelBundleVendorName());

 		boolean first = true;

 		for (GenPackage genPackage : genModel.getAllGenPackagesWithClassifiers()) {

 			if (genPackage.isContentType()) {

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
index 3d82c48..eb67248 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/PluginXML.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -182,9 +182,9 @@
 		/**

 		 * Copyright (c) 2002-2005 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
index 2cf9e96..3051d16 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceClass.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -337,9 +337,9 @@
 		/**

 		 * Copyright (c) 2002-2006 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
index 5c3fdf5..e961ff2 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ResourceFactoryClass.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -174,9 +174,9 @@
 		/**

 		 * Copyright (c) 2002-2006 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
index 8ac431f..26681cc 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/SwitchClass.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -251,9 +251,9 @@
 		/**

 		 * Copyright (c) 2002-2006 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
index cbf9c04..07b5308 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/ValidatorClass.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -422,9 +422,9 @@
 		/**

 		 * Copyright (c) 2002-2013 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
index 79a421b..c6aebad 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/XMLProcessorClass.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -178,9 +178,9 @@
 		/**

 		 * Copyright (c) 2005-2006 IBM Corporation and others. 

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeatureTODOoverride.java
index c0dc32b..db94baf 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -64,6 +64,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -86,35 +88,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -153,6 +158,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -209,6 +215,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -260,6 +272,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeatureannotationsinsert.java
index 9de1448..e16244c 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeatureoverride.java
index aaa9d10..d896933 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -93,6 +93,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -115,35 +117,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -182,6 +187,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -238,6 +244,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -289,6 +301,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -310,7 +323,7 @@
 		if (isJDK50) { //Class/basicGetGenFeature.annotations.insert.javajetinc

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -324,6 +337,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -348,7 +362,7 @@
 		stringBuffer.append(TEXT_8);

 		stringBuffer.append(TEXT_4);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -362,6 +376,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

@@ -451,7 +466,7 @@
 		} else {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -465,6 +480,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeaturepreinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeaturepreinsert.java
index a301ced..0306020 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeaturepreinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicGetGenFeaturepreinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeatureTODOoverride.java
index 2ed0f12..08bcd80 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -67,6 +67,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -89,35 +91,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -156,6 +161,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -212,6 +218,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -263,6 +275,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeatureannotationsinsert.java
index 4a2f3d1..6b914e4 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeatureoverride.java
index 25f0b4a..20e9125 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -39,53 +39,52 @@
 	protected final String TEXT_9 = " new";

 	protected final String TEXT_10 = ", ";

 	protected final String TEXT_11 = " msgs)" + NL + "\t{";

-	protected final String TEXT_12 = NL + "\t\tmsgs = eBasicSetContainer((";

-	protected final String TEXT_13 = ")new";

-	protected final String TEXT_14 = ", msgs);";

-	protected final String TEXT_15 = NL + "\t\treturn msgs;";

-	protected final String TEXT_16 = NL + "\t\tmsgs = eDynamicInverseAdd((";

-	protected final String TEXT_17 = NL + "\t\tObject old";

-	protected final String TEXT_18 = " = eVirtualSet(";

-	protected final String TEXT_19 = ", new";

-	protected final String TEXT_20 = ");";

-	protected final String TEXT_21 = NL + "\t\t";

-	protected final String TEXT_22 = " old";

-	protected final String TEXT_23 = " = ";

-	protected final String TEXT_24 = ";" + NL + "\t\t";

-	protected final String TEXT_25 = " = new";

-	protected final String TEXT_26 = ";";

-	protected final String TEXT_27 = NL + "\t\tboolean isSetChange = old";

-	protected final String TEXT_28 = " == EVIRTUAL_NO_VALUE;";

-	protected final String TEXT_29 = NL + "\t\tboolean old";

-	protected final String TEXT_30 = "ESet = (";

-	protected final String TEXT_31 = " & ";

-	protected final String TEXT_32 = "_ESETFLAG) != 0;";

-	protected final String TEXT_33 = " |= ";

-	protected final String TEXT_34 = "_ESETFLAG;";

-	protected final String TEXT_35 = "ESet = ";

-	protected final String TEXT_36 = "ESet;";

-	protected final String TEXT_37 = "ESet = true;";

-	protected final String TEXT_38 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t{";

-	protected final String TEXT_39 = NL + "\t\t\t";

-	protected final String TEXT_40 = " notification = new ";

-	protected final String TEXT_41 = "(this, ";

-	protected final String TEXT_42 = ".SET, ";

-	protected final String TEXT_43 = "isSetChange ? null : old";

-	protected final String TEXT_44 = "old";

-	protected final String TEXT_45 = "isSetChange";

-	protected final String TEXT_46 = "!old";

-	protected final String TEXT_47 = "ESet";

-	protected final String TEXT_48 = " == EVIRTUAL_NO_VALUE ? null : old";

-	protected final String TEXT_49 = NL + "\t\t\tif (msgs == null) msgs = notification; else msgs.add(notification);"

+	protected final String TEXT_12 = NL + "\t\tmsgs = eBasicSetContainer(";

+	protected final String TEXT_13 = ", msgs);";

+	protected final String TEXT_14 = NL + "\t\treturn msgs;";

+	protected final String TEXT_15 = NL + "\t\tmsgs = eDynamicInverseAdd(";

+	protected final String TEXT_16 = NL + "\t\tObject old";

+	protected final String TEXT_17 = " = eVirtualSet(";

+	protected final String TEXT_18 = ", new";

+	protected final String TEXT_19 = ");";

+	protected final String TEXT_20 = NL + "\t\t";

+	protected final String TEXT_21 = " old";

+	protected final String TEXT_22 = " = ";

+	protected final String TEXT_23 = ";" + NL + "\t\t";

+	protected final String TEXT_24 = " = new";

+	protected final String TEXT_25 = ";";

+	protected final String TEXT_26 = NL + "\t\tboolean isSetChange = old";

+	protected final String TEXT_27 = " == EVIRTUAL_NO_VALUE;";

+	protected final String TEXT_28 = NL + "\t\tboolean old";

+	protected final String TEXT_29 = "ESet = (";

+	protected final String TEXT_30 = " & ";

+	protected final String TEXT_31 = "_ESETFLAG) != 0;";

+	protected final String TEXT_32 = " |= ";

+	protected final String TEXT_33 = "_ESETFLAG;";

+	protected final String TEXT_34 = "ESet = ";

+	protected final String TEXT_35 = "ESet;";

+	protected final String TEXT_36 = "ESet = true;";

+	protected final String TEXT_37 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t{";

+	protected final String TEXT_38 = NL + "\t\t\t";

+	protected final String TEXT_39 = " notification = new ";

+	protected final String TEXT_40 = "(this, ";

+	protected final String TEXT_41 = ".SET, ";

+	protected final String TEXT_42 = "isSetChange ? null : old";

+	protected final String TEXT_43 = "old";

+	protected final String TEXT_44 = "isSetChange";

+	protected final String TEXT_45 = "!old";

+	protected final String TEXT_46 = "ESet";

+	protected final String TEXT_47 = " == EVIRTUAL_NO_VALUE ? null : old";

+	protected final String TEXT_48 = NL + "\t\t\tif (msgs == null) msgs = notification; else msgs.add(notification);"

 			+ NL + "\t\t}";

-	protected final String TEXT_50 = NL + "\t\treturn ((";

-	protected final String TEXT_51 = ".Internal)((";

-	protected final String TEXT_52 = ".Internal.Wrapper)get";

-	protected final String TEXT_53 = "()).featureMap()).basicAdd(";

-	protected final String TEXT_54 = ".Internal)get";

-	protected final String TEXT_55 = "()).basicAdd(";

-	protected final String TEXT_56 = NL + "\t}" + NL + NL;

-	protected final String TEXT_57 = NL;

+	protected final String TEXT_49 = NL + "\t\treturn ((";

+	protected final String TEXT_50 = ".Internal)((";

+	protected final String TEXT_51 = ".Internal.Wrapper)get";

+	protected final String TEXT_52 = "()).featureMap()).basicAdd(";

+	protected final String TEXT_53 = ".Internal)get";

+	protected final String TEXT_54 = "()).basicAdd(";

+	protected final String TEXT_55 = NL + "\t}" + NL + NL;

+	protected final String TEXT_56 = NL;

 

 	public ClassbasicSetGenFeatureoverride() {

 		//Here is the constructor

@@ -117,6 +116,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -139,35 +140,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -187,8 +191,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_57);

-		stringBuffer.append(TEXT_57);

+		stringBuffer.append(TEXT_56);

+		stringBuffer.append(TEXT_56);

 		return stringBuffer.toString();

 	}

 

@@ -206,6 +210,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -262,6 +267,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -313,6 +324,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -334,7 +346,7 @@
 		if (isJDK50) { //Class/basicSetGenFeature.annotations.insert.javajetinc

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -348,6 +360,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -379,7 +392,7 @@
 		if (genFeature.isContainer()) {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -393,6 +406,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -407,16 +421,14 @@
 			}

 

 			stringBuffer.append(TEXT_12);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-			stringBuffer.append(TEXT_13);

-			stringBuffer.append(genFeature.getCapName());

+			stringBuffer.append(genFeature.getAsInternalEObject("new" + genFeature.getCapName(), false));

 			stringBuffer.append(TEXT_10);

 			stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 			stringBuffer.append(positiveOffsetCorrection);

-			stringBuffer.append(TEXT_14);

+			stringBuffer.append(TEXT_13);

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -430,6 +442,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -443,11 +456,11 @@
 				stringBuffer.setLength(0);

 			}

 

-			stringBuffer.append(TEXT_15);

+			stringBuffer.append(TEXT_14);

 		} else if (genModel.isDynamicDelegation()) {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -461,6 +474,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -474,17 +488,15 @@
 				stringBuffer.setLength(0);

 			}

 

-			stringBuffer.append(TEXT_16);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-			stringBuffer.append(TEXT_13);

-			stringBuffer.append(genFeature.getCapName());

+			stringBuffer.append(TEXT_15);

+			stringBuffer.append(genFeature.getAsInternalEObject("new" + genFeature.getCapName(), false));

 			stringBuffer.append(TEXT_10);

 			stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 			stringBuffer.append(positiveOffsetCorrection);

-			stringBuffer.append(TEXT_14);

+			stringBuffer.append(TEXT_13);

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -498,6 +510,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -511,11 +524,11 @@
 				stringBuffer.setLength(0);

 			}

 

-			stringBuffer.append(TEXT_15);

+			stringBuffer.append(TEXT_14);

 		} else if (!genFeature.isVolatile()) {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -529,6 +542,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -543,122 +557,122 @@
 			}

 

 			if (genModel.isVirtualDelegation()) {

-				stringBuffer.append(TEXT_17);

+				stringBuffer.append(TEXT_16);

 				stringBuffer.append(genFeature.getCapName());

-				stringBuffer.append(TEXT_18);

+				stringBuffer.append(TEXT_17);

 				stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 				stringBuffer.append(positiveOffsetCorrection);

+				stringBuffer.append(TEXT_18);

+				stringBuffer.append(genFeature.getCapName());

 				stringBuffer.append(TEXT_19);

-				stringBuffer.append(genFeature.getCapName());

-				stringBuffer.append(TEXT_20);

 			} else {

-				stringBuffer.append(TEXT_21);

+				stringBuffer.append(TEXT_20);

 				stringBuffer.append(genFeature.getImportedType(genClass));

-				stringBuffer.append(TEXT_22);

+				stringBuffer.append(TEXT_21);

 				stringBuffer.append(genFeature.getCapName());

+				stringBuffer.append(TEXT_22);

+				stringBuffer.append(genFeature.getSafeName());

 				stringBuffer.append(TEXT_23);

 				stringBuffer.append(genFeature.getSafeName());

 				stringBuffer.append(TEXT_24);

-				stringBuffer.append(genFeature.getSafeName());

-				stringBuffer.append(TEXT_25);

 				stringBuffer.append(genFeature.getCapName());

-				stringBuffer.append(TEXT_26);

+				stringBuffer.append(TEXT_25);

 			}

 			if (genFeature.isUnsettable()) {

 				if (genModel.isVirtualDelegation()) {

 					if (!genModel.isSuppressNotification()) {

-						stringBuffer.append(TEXT_27);

+						stringBuffer.append(TEXT_26);

 						stringBuffer.append(genFeature.getCapName());

-						stringBuffer.append(TEXT_28);

+						stringBuffer.append(TEXT_27);

 					}

 				} else if (genClass.isESetFlag(genFeature)) {

-					stringBuffer.append(TEXT_29);

+					stringBuffer.append(TEXT_28);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_30);

+					stringBuffer.append(TEXT_29);

 					stringBuffer.append(genClass.getESetFlagsField(genFeature));

-					stringBuffer.append(TEXT_31);

+					stringBuffer.append(TEXT_30);

 					stringBuffer.append(genFeature.getUpperName());

-					stringBuffer.append(TEXT_32);

+					stringBuffer.append(TEXT_31);

 					if (!genModel.isSuppressNotification()) {

-						stringBuffer.append(TEXT_21);

+						stringBuffer.append(TEXT_20);

 						stringBuffer.append(genClass.getESetFlagsField(genFeature));

-						stringBuffer.append(TEXT_33);

+						stringBuffer.append(TEXT_32);

 						stringBuffer.append(genFeature.getUpperName());

-						stringBuffer.append(TEXT_34);

+						stringBuffer.append(TEXT_33);

 					}

 				} else {

 					if (!genModel.isSuppressNotification()) {

-						stringBuffer.append(TEXT_29);

+						stringBuffer.append(TEXT_28);

 						stringBuffer.append(genFeature.getCapName());

-						stringBuffer.append(TEXT_35);

+						stringBuffer.append(TEXT_34);

 						stringBuffer.append(genFeature.getUncapName());

-						stringBuffer.append(TEXT_36);

+						stringBuffer.append(TEXT_35);

 					}

-					stringBuffer.append(TEXT_21);

+					stringBuffer.append(TEXT_20);

 					stringBuffer.append(genFeature.getUncapName());

-					stringBuffer.append(TEXT_37);

+					stringBuffer.append(TEXT_36);

 				}

 			}

 			if (!genModel.isSuppressNotification()) {

-				stringBuffer.append(TEXT_38);

+				stringBuffer.append(TEXT_37);

 				if (genFeature.isUnsettable()) {

+					stringBuffer.append(TEXT_38);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

 					stringBuffer.append(TEXT_39);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

 					stringBuffer.append(TEXT_40);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

-					stringBuffer.append(TEXT_41);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

-					stringBuffer.append(TEXT_42);

+					stringBuffer.append(TEXT_41);

+					stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

+					stringBuffer.append(positiveOffsetCorrection);

+					stringBuffer.append(TEXT_10);

+					if (genModel.isVirtualDelegation()) {

+						stringBuffer.append(TEXT_42);

+						stringBuffer.append(genFeature.getCapName());

+					} else {

+						stringBuffer.append(TEXT_43);

+						stringBuffer.append(genFeature.getCapName());

+					}

+					stringBuffer.append(TEXT_18);

+					stringBuffer.append(genFeature.getCapName());

+					stringBuffer.append(TEXT_10);

+					if (genModel.isVirtualDelegation()) {

+						stringBuffer.append(TEXT_44);

+					} else {

+						stringBuffer.append(TEXT_45);

+						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(TEXT_46);

+					}

+					stringBuffer.append(TEXT_19);

+				} else {

+					stringBuffer.append(TEXT_38);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

+					stringBuffer.append(TEXT_39);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

+					stringBuffer.append(TEXT_40);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

+					stringBuffer.append(TEXT_41);

 					stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 					stringBuffer.append(positiveOffsetCorrection);

 					stringBuffer.append(TEXT_10);

 					if (genModel.isVirtualDelegation()) {

 						stringBuffer.append(TEXT_43);

 						stringBuffer.append(genFeature.getCapName());

-					} else {

-						stringBuffer.append(TEXT_44);

-						stringBuffer.append(genFeature.getCapName());

-					}

-					stringBuffer.append(TEXT_19);

-					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_10);

-					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_45);

-					} else {

-						stringBuffer.append(TEXT_46);

-						stringBuffer.append(genFeature.getCapName());

 						stringBuffer.append(TEXT_47);

-					}

-					stringBuffer.append(TEXT_20);

-				} else {

-					stringBuffer.append(TEXT_39);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

-					stringBuffer.append(TEXT_40);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

-					stringBuffer.append(TEXT_41);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

-					stringBuffer.append(TEXT_42);

-					stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

-					stringBuffer.append(positiveOffsetCorrection);

-					stringBuffer.append(TEXT_10);

-					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_44);

-						stringBuffer.append(genFeature.getCapName());

-						stringBuffer.append(TEXT_48);

 						stringBuffer.append(genFeature.getCapName());

 					} else {

-						stringBuffer.append(TEXT_44);

+						stringBuffer.append(TEXT_43);

 						stringBuffer.append(genFeature.getCapName());

 					}

-					stringBuffer.append(TEXT_19);

+					stringBuffer.append(TEXT_18);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_20);

+					stringBuffer.append(TEXT_19);

 				}

-				stringBuffer.append(TEXT_49);

+				stringBuffer.append(TEXT_48);

 			}

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -672,6 +686,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -685,36 +700,36 @@
 				stringBuffer.setLength(0);

 			}

 

-			stringBuffer.append(TEXT_15);

+			stringBuffer.append(TEXT_14);

 		} else if (genFeature.hasDelegateFeature()) {

 			GenFeature delegateFeature = genFeature.getDelegateFeature();

 			if (delegateFeature.isWrappedFeatureMapType()) {

+				stringBuffer.append(TEXT_49);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

 				stringBuffer.append(TEXT_50);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

 				stringBuffer.append(TEXT_51);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

+				stringBuffer.append(delegateFeature.getAccessorName());

 				stringBuffer.append(TEXT_52);

-				stringBuffer.append(delegateFeature.getAccessorName());

-				stringBuffer.append(TEXT_53);

 				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_18);

 				stringBuffer.append(genFeature.getCapName());

-				stringBuffer.append(TEXT_14);

+				stringBuffer.append(TEXT_13);

 			} else {

-				stringBuffer.append(TEXT_50);

+				stringBuffer.append(TEXT_49);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

-				stringBuffer.append(TEXT_54);

+				stringBuffer.append(TEXT_53);

 				stringBuffer.append(delegateFeature.getAccessorName());

-				stringBuffer.append(TEXT_55);

+				stringBuffer.append(TEXT_54);

 				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_18);

 				stringBuffer.append(genFeature.getCapName());

-				stringBuffer.append(TEXT_14);

+				stringBuffer.append(TEXT_13);

 			}

 		} else {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -728,6 +743,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -743,7 +759,7 @@
 

 			//Class/basicSetGenFeature.todo.override.javajetinc

 		}

-		stringBuffer.append(TEXT_56);

+		stringBuffer.append(TEXT_55);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeaturepostinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeaturepostinsert.java
index 50148c0..249e098 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeaturepostinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeaturepostinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeaturepreinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeaturepreinsert.java
index 4d4945d..7f5c315 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeaturepreinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicSetGenFeaturepreinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicUnsetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicUnsetGenFeatureTODOoverride.java
index 38836bd..af0f8da 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicUnsetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicUnsetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -67,6 +67,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -89,35 +91,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -156,6 +161,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -212,6 +218,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -263,6 +275,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicUnsetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicUnsetGenFeatureannotationsinsert.java
index 24cadc7..c9f47e5 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicUnsetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicUnsetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicUnsetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicUnsetGenFeatureoverride.java
index fc3f569..e4095dd 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicUnsetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassbasicUnsetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -37,46 +37,45 @@
 	protected final String TEXT_7 = " basicUnset";

 	protected final String TEXT_8 = "(";

 	protected final String TEXT_9 = " msgs)" + NL + "\t{";

-	protected final String TEXT_10 = NL + "\t\treturn eDynamicInverseRemove((";

-	protected final String TEXT_11 = ")";

-	protected final String TEXT_12 = "basicGet";

-	protected final String TEXT_13 = "(), ";

-	protected final String TEXT_14 = ", msgs);";

-	protected final String TEXT_15 = "Object old";

-	protected final String TEXT_16 = " = ";

-	protected final String TEXT_17 = "eVirtualUnset(";

-	protected final String TEXT_18 = ");";

-	protected final String TEXT_19 = NL + "\t\t";

-	protected final String TEXT_20 = " old";

-	protected final String TEXT_21 = ";";

-	protected final String TEXT_22 = " = null;";

-	protected final String TEXT_23 = NL + "\t\tboolean isSetChange = old";

-	protected final String TEXT_24 = " != EVIRTUAL_NO_VALUE;";

-	protected final String TEXT_25 = NL + "\t\tboolean old";

-	protected final String TEXT_26 = "ESet = (";

-	protected final String TEXT_27 = " & ";

-	protected final String TEXT_28 = "_ESETFLAG) != 0;";

-	protected final String TEXT_29 = " &= ~";

-	protected final String TEXT_30 = "_ESETFLAG;";

-	protected final String TEXT_31 = "ESet = ";

-	protected final String TEXT_32 = "ESet;";

-	protected final String TEXT_33 = "ESet = false;";

-	protected final String TEXT_34 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t{" + NL + "\t\t\t";

-	protected final String TEXT_35 = " notification = new ";

-	protected final String TEXT_36 = "(this, ";

-	protected final String TEXT_37 = ".UNSET, ";

-	protected final String TEXT_38 = ", ";

-	protected final String TEXT_39 = "isSetChange ? old";

-	protected final String TEXT_40 = " : null";

-	protected final String TEXT_41 = "old";

-	protected final String TEXT_42 = ", null, ";

-	protected final String TEXT_43 = "isSetChange";

-	protected final String TEXT_44 = "ESet";

-	protected final String TEXT_45 = ");" + NL

+	protected final String TEXT_10 = NL + "\t\treturn eDynamicInverseRemove(";

+	protected final String TEXT_11 = "basicGet";

+	protected final String TEXT_12 = "(), ";

+	protected final String TEXT_13 = ", msgs);";

+	protected final String TEXT_14 = "Object old";

+	protected final String TEXT_15 = " = ";

+	protected final String TEXT_16 = "eVirtualUnset(";

+	protected final String TEXT_17 = ");";

+	protected final String TEXT_18 = NL + "\t\t";

+	protected final String TEXT_19 = " old";

+	protected final String TEXT_20 = ";";

+	protected final String TEXT_21 = " = null;";

+	protected final String TEXT_22 = NL + "\t\tboolean isSetChange = old";

+	protected final String TEXT_23 = " != EVIRTUAL_NO_VALUE;";

+	protected final String TEXT_24 = NL + "\t\tboolean old";

+	protected final String TEXT_25 = "ESet = (";

+	protected final String TEXT_26 = " & ";

+	protected final String TEXT_27 = "_ESETFLAG) != 0;";

+	protected final String TEXT_28 = " &= ~";

+	protected final String TEXT_29 = "_ESETFLAG;";

+	protected final String TEXT_30 = "ESet = ";

+	protected final String TEXT_31 = "ESet;";

+	protected final String TEXT_32 = "ESet = false;";

+	protected final String TEXT_33 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t{" + NL + "\t\t\t";

+	protected final String TEXT_34 = " notification = new ";

+	protected final String TEXT_35 = "(this, ";

+	protected final String TEXT_36 = ".UNSET, ";

+	protected final String TEXT_37 = ", ";

+	protected final String TEXT_38 = "isSetChange ? old";

+	protected final String TEXT_39 = " : null";

+	protected final String TEXT_40 = "old";

+	protected final String TEXT_41 = ", null, ";

+	protected final String TEXT_42 = "isSetChange";

+	protected final String TEXT_43 = "ESet";

+	protected final String TEXT_44 = ");" + NL

 			+ "\t\t\tif (msgs == null) msgs = notification; else msgs.add(notification);" + NL + "\t\t}" + NL

 			+ "\t\treturn msgs;";

-	protected final String TEXT_46 = NL + "\t}" + NL + NL;

-	protected final String TEXT_47 = NL;

+	protected final String TEXT_45 = NL + "\t}" + NL + NL;

+	protected final String TEXT_46 = NL;

 

 	public ClassbasicUnsetGenFeatureoverride() {

 		//Here is the constructor

@@ -108,6 +107,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -130,35 +131,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -178,8 +182,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_47);

-		stringBuffer.append(TEXT_47);

+		stringBuffer.append(TEXT_46);

+		stringBuffer.append(TEXT_46);

 		return stringBuffer.toString();

 	}

 

@@ -197,6 +201,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -253,6 +258,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -304,6 +315,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -325,7 +337,7 @@
 		if (isJDK50) { //Class/basicUnsetGenFeature.annotations.insert.javajetinc

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -339,6 +351,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -365,109 +378,108 @@
 		stringBuffer.append(TEXT_9);

 		if (genModel.isDynamicDelegation()) {

 			stringBuffer.append(TEXT_10);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-			stringBuffer.append(TEXT_11);

+			stringBuffer.append(genFeature.getAsInternalEObject("", false));

 			if (genFeature.isResolveProxies()) {

-				stringBuffer.append(TEXT_12);

+				stringBuffer.append(TEXT_11);

 				stringBuffer.append(genFeature.getAccessorName());

 			} else {

 				stringBuffer.append(genFeature.getGetAccessor());

 			}

-			stringBuffer.append(TEXT_13);

+			stringBuffer.append(TEXT_12);

 			stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 			stringBuffer.append(positiveOffsetCorrection);

-			stringBuffer.append(TEXT_14);

+			stringBuffer.append(TEXT_13);

 		} else if (!genFeature.isVolatile()) {

 			if (genModel.isVirtualDelegation()) {

 				if (!genModel.isSuppressNotification()) {

-					stringBuffer.append(TEXT_15);

+					stringBuffer.append(TEXT_14);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_16);

+					stringBuffer.append(TEXT_15);

 				}

-				stringBuffer.append(TEXT_17);

+				stringBuffer.append(TEXT_16);

 				stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 				stringBuffer.append(positiveOffsetCorrection);

-				stringBuffer.append(TEXT_18);

+				stringBuffer.append(TEXT_17);

 			} else {

 				if (!genModel.isSuppressNotification()) {

-					stringBuffer.append(TEXT_19);

+					stringBuffer.append(TEXT_18);

 					stringBuffer.append(genFeature.getImportedType(genClass));

-					stringBuffer.append(TEXT_20);

+					stringBuffer.append(TEXT_19);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_16);

+					stringBuffer.append(TEXT_15);

 					stringBuffer.append(genFeature.getSafeName());

-					stringBuffer.append(TEXT_21);

+					stringBuffer.append(TEXT_20);

 				}

-				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_18);

 				stringBuffer.append(genFeature.getSafeName());

-				stringBuffer.append(TEXT_22);

+				stringBuffer.append(TEXT_21);

 			}

 			if (genModel.isVirtualDelegation()) {

 				if (!genModel.isSuppressNotification()) {

-					stringBuffer.append(TEXT_23);

+					stringBuffer.append(TEXT_22);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_24);

+					stringBuffer.append(TEXT_23);

 				}

 			} else if (genClass.isESetFlag(genFeature)) {

 				if (!genModel.isSuppressNotification()) {

-					stringBuffer.append(TEXT_25);

+					stringBuffer.append(TEXT_24);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_26);

+					stringBuffer.append(TEXT_25);

 					stringBuffer.append(genClass.getESetFlagsField(genFeature));

-					stringBuffer.append(TEXT_27);

+					stringBuffer.append(TEXT_26);

 					stringBuffer.append(genFeature.getUpperName());

-					stringBuffer.append(TEXT_28);

+					stringBuffer.append(TEXT_27);

 				}

-				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_18);

 				stringBuffer.append(genClass.getESetFlagsField(genFeature));

-				stringBuffer.append(TEXT_29);

+				stringBuffer.append(TEXT_28);

 				stringBuffer.append(genFeature.getUpperName());

-				stringBuffer.append(TEXT_30);

+				stringBuffer.append(TEXT_29);

 			} else {

 				if (!genModel.isSuppressNotification()) {

-					stringBuffer.append(TEXT_25);

+					stringBuffer.append(TEXT_24);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_31);

+					stringBuffer.append(TEXT_30);

 					stringBuffer.append(genFeature.getUncapName());

-					stringBuffer.append(TEXT_32);

+					stringBuffer.append(TEXT_31);

 				}

-				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_18);

 				stringBuffer.append(genFeature.getUncapName());

-				stringBuffer.append(TEXT_33);

+				stringBuffer.append(TEXT_32);

 			}

 			if (!genModel.isSuppressNotification()) {

+				stringBuffer.append(TEXT_33);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

 				stringBuffer.append(TEXT_34);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

 				stringBuffer.append(TEXT_35);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

-				stringBuffer.append(TEXT_36);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

-				stringBuffer.append(TEXT_37);

+				stringBuffer.append(TEXT_36);

 				stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 				stringBuffer.append(positiveOffsetCorrection);

-				stringBuffer.append(TEXT_38);

+				stringBuffer.append(TEXT_37);

 				if (genModel.isVirtualDelegation()) {

+					stringBuffer.append(TEXT_38);

+					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_39);

-					stringBuffer.append(genFeature.getCapName());

+				} else {

 					stringBuffer.append(TEXT_40);

-				} else {

-					stringBuffer.append(TEXT_41);

 					stringBuffer.append(genFeature.getCapName());

 				}

-				stringBuffer.append(TEXT_42);

+				stringBuffer.append(TEXT_41);

 				if (genModel.isVirtualDelegation()) {

-					stringBuffer.append(TEXT_43);

+					stringBuffer.append(TEXT_42);

 				} else {

-					stringBuffer.append(TEXT_41);

+					stringBuffer.append(TEXT_40);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_44);

+					stringBuffer.append(TEXT_43);

 				}

-				stringBuffer.append(TEXT_45);

+				stringBuffer.append(TEXT_44);

 			}

 		} else {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -481,6 +493,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -496,7 +509,7 @@
 

 			//Class/basicUnsetGenFeature.todo.override.javajetinc

 		}

-		stringBuffer.append(TEXT_46);

+		stringBuffer.append(TEXT_45);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdeclaredFieldGenFeatureinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdeclaredFieldGenFeatureinsert.java
index 3c6dd2e..b168458 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdeclaredFieldGenFeatureinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdeclaredFieldGenFeatureinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdeclaredFieldGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdeclaredFieldGenFeatureoverride.java
index 2de0188..bf1529f 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdeclaredFieldGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdeclaredFieldGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -133,6 +133,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -155,35 +157,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -222,6 +227,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -278,6 +284,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -329,6 +341,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -700,7 +713,7 @@
 		}

 		stringBuffer.append(TEXT_32);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.declaredFieldGenFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.declaredFieldGenFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -714,6 +727,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdynamicDelegation.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdynamicDelegation.java
new file mode 100644
index 0000000..7e3bbb0
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdynamicDelegation.java
@@ -0,0 +1,278 @@
+//Generated with EGF 1.6.0.201901231418

+package org.eclipse.egf.emf.pattern.model.call.Class;

+

+import org.eclipse.egf.emf.pattern.base.*;

+import org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil;

+import org.eclipse.emf.codegen.ecore.genmodel.*;

+import org.eclipse.emf.codegen.ecore.genmodel.impl.*;

+import org.eclipse.emf.codegen.ecore.genmodel.generator.*;

+import org.eclipse.emf.codegen.util.*;

+import org.eclipse.emf.ecore.util.*;

+import org.eclipse.emf.common.util.*;

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassdynamicDelegation {

+	protected static String nl;

+

+	public static synchronized ClassdynamicDelegation create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassdynamicDelegation result = new ClassdynamicDelegation();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "";

+	protected final String TEXT_2 = NL;

+

+	public ClassdynamicDelegation() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> genClassList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genPackageList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genModelList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isJDK50List = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isInterfaceList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isImplementationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isGWTList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> publicStaticFinalFlagList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> singleWildcardList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> negativeOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> positiveOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> negativeOperationOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> positiveOperationOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object genClassParameter : genClassList) {

+			for (Object genPackageParameter : genPackageList) {

+				for (Object genModelParameter : genModelList) {

+					for (Object isJDK50Parameter : isJDK50List) {

+						for (Object isInterfaceParameter : isInterfaceList) {

+							for (Object isImplementationParameter : isImplementationList) {

+								for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+									for (Object isGWTParameter : isGWTList) {

+										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+											for (Object singleWildcardParameter : singleWildcardList) {

+												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+

+																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																this.isGWT = (java.lang.Boolean) isGWTParameter;

+																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+

+																if (preCondition(ctx)) {

+																	ctx.setNode(new Node.Container(currentNode,

+																			getClass()));

+																	orchestration(ctx);

+																}

+

+															}

+														}

+													}

+												}

+											}

+										}

+									}

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_doGenerate(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("genClass", this.genClass);

+			parameterValues.put("genPackage", this.genPackage);

+			parameterValues.put("genModel", this.genModel);

+			parameterValues.put("isJDK50", this.isJDK50);

+			parameterValues.put("isInterface", this.isInterface);

+			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

+			parameterValues.put("isGWT", this.isGWT);

+			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

+			parameterValues.put("singleWildcard", this.singleWildcard);

+			parameterValues.put("negativeOffsetCorrection", this.negativeOffsetCorrection);

+			parameterValues.put("positiveOffsetCorrection", this.positiveOffsetCorrection);

+			parameterValues.put("negativeOperationOffsetCorrection", this.negativeOperationOffsetCorrection);

+			parameterValues.put("positiveOperationOffsetCorrection", this.positiveOperationOffsetCorrection);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenClass genClass = null;

+

+	public void set_genClass(org.eclipse.emf.codegen.ecore.genmodel.GenClass object) {

+		this.genClass = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenPackage genPackage = null;

+

+	public void set_genPackage(org.eclipse.emf.codegen.ecore.genmodel.GenPackage object) {

+		this.genPackage = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenModel genModel = null;

+

+	public void set_genModel(org.eclipse.emf.codegen.ecore.genmodel.GenModel object) {

+		this.genModel = object;

+	}

+

+	protected java.lang.Boolean isJDK50 = null;

+

+	public void set_isJDK50(java.lang.Boolean object) {

+		this.isJDK50 = object;

+	}

+

+	protected java.lang.Boolean isInterface = null;

+

+	public void set_isInterface(java.lang.Boolean object) {

+		this.isInterface = object;

+	}

+

+	protected java.lang.Boolean isImplementation = null;

+

+	public void set_isImplementation(java.lang.Boolean object) {

+		this.isImplementation = object;

+	}

+

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

+	protected java.lang.Boolean isGWT = null;

+

+	public void set_isGWT(java.lang.Boolean object) {

+		this.isGWT = object;

+	}

+

+	protected java.lang.String publicStaticFinalFlag = null;

+

+	public void set_publicStaticFinalFlag(java.lang.String object) {

+		this.publicStaticFinalFlag = object;

+	}

+

+	protected java.lang.String singleWildcard = null;

+

+	public void set_singleWildcard(java.lang.String object) {

+		this.singleWildcard = object;

+	}

+

+	protected java.lang.String negativeOffsetCorrection = null;

+

+	public void set_negativeOffsetCorrection(java.lang.String object) {

+		this.negativeOffsetCorrection = object;

+	}

+

+	protected java.lang.String positiveOffsetCorrection = null;

+

+	public void set_positiveOffsetCorrection(java.lang.String object) {

+		this.positiveOffsetCorrection = object;

+	}

+

+	protected java.lang.String negativeOperationOffsetCorrection = null;

+

+	public void set_negativeOperationOffsetCorrection(java.lang.String object) {

+		this.negativeOperationOffsetCorrection = object;

+	}

+

+	protected java.lang.String positiveOperationOffsetCorrection = null;

+

+	public void set_positiveOperationOffsetCorrection(java.lang.String object) {

+		this.positiveOperationOffsetCorrection = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("genClass", this.genClass);

+		parameters.put("genPackage", this.genPackage);

+		parameters.put("genModel", this.genModel);

+		parameters.put("isJDK50", this.isJDK50);

+		parameters.put("isInterface", this.isInterface);

+		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

+		parameters.put("isGWT", this.isGWT);

+		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

+		parameters.put("singleWildcard", this.singleWildcard);

+		parameters.put("negativeOffsetCorrection", this.negativeOffsetCorrection);

+		parameters.put("positiveOffsetCorrection", this.positiveOffsetCorrection);

+		parameters.put("negativeOperationOffsetCorrection", this.negativeOperationOffsetCorrection);

+		parameters.put("positiveOperationOffsetCorrection", this.positiveOperationOffsetCorrection);

+		return parameters;

+	}

+

+	protected void method_doGenerate(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

+}
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdynamicSetGenFeaturepostinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdynamicSetGenFeaturepostinsert.java
new file mode 100644
index 0000000..c9f0328
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdynamicSetGenFeaturepostinsert.java
@@ -0,0 +1,304 @@
+//Generated with EGF 1.6.0.201901231418

+package org.eclipse.egf.emf.pattern.model.call.Class;

+

+import org.eclipse.egf.emf.pattern.base.*;

+import org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil;

+import org.eclipse.emf.codegen.ecore.genmodel.*;

+import org.eclipse.emf.codegen.ecore.genmodel.impl.*;

+import org.eclipse.emf.codegen.ecore.genmodel.generator.*;

+import org.eclipse.emf.codegen.util.*;

+import org.eclipse.emf.ecore.util.*;

+import org.eclipse.emf.common.util.*;

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassdynamicSetGenFeaturepostinsert {

+	protected static String nl;

+

+	public static synchronized ClassdynamicSetGenFeaturepostinsert create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassdynamicSetGenFeaturepostinsert result = new ClassdynamicSetGenFeaturepostinsert();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "";

+	protected final String TEXT_2 = NL;

+

+	public ClassdynamicSetGenFeaturepostinsert() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> setAccessorOperationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genFeatureList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genClassList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genPackageList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genModelList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isJDK50List = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isInterfaceList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isImplementationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isGWTList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> publicStaticFinalFlagList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> singleWildcardList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> negativeOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> positiveOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> negativeOperationOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> positiveOperationOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object setAccessorOperationParameter : setAccessorOperationList) {

+			for (Object genFeatureParameter : genFeatureList) {

+				for (Object genClassParameter : genClassList) {

+					for (Object genPackageParameter : genPackageList) {

+						for (Object genModelParameter : genModelList) {

+							for (Object isJDK50Parameter : isJDK50List) {

+								for (Object isInterfaceParameter : isInterfaceList) {

+									for (Object isImplementationParameter : isImplementationList) {

+										for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+											for (Object isGWTParameter : isGWTList) {

+												for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+													for (Object singleWildcardParameter : singleWildcardList) {

+														for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+															for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+																for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																	for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+

+																		this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

+																		this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																		this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																		this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																		this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																		this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																		this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																		this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																		this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																		this.isGWT = (java.lang.Boolean) isGWTParameter;

+																		this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																		this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																		this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																		this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																		this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																		this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+

+																		if (preCondition(ctx)) {

+																			ctx.setNode(new Node.Container(currentNode,

+																					getClass()));

+																			orchestration(ctx);

+																		}

+

+																	}

+																}

+															}

+														}

+													}

+												}

+											}

+										}

+									}

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_doGenerate(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("setAccessorOperation", this.setAccessorOperation);

+			parameterValues.put("genFeature", this.genFeature);

+			parameterValues.put("genClass", this.genClass);

+			parameterValues.put("genPackage", this.genPackage);

+			parameterValues.put("genModel", this.genModel);

+			parameterValues.put("isJDK50", this.isJDK50);

+			parameterValues.put("isInterface", this.isInterface);

+			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

+			parameterValues.put("isGWT", this.isGWT);

+			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

+			parameterValues.put("singleWildcard", this.singleWildcard);

+			parameterValues.put("negativeOffsetCorrection", this.negativeOffsetCorrection);

+			parameterValues.put("positiveOffsetCorrection", this.positiveOffsetCorrection);

+			parameterValues.put("negativeOperationOffsetCorrection", this.negativeOperationOffsetCorrection);

+			parameterValues.put("positiveOperationOffsetCorrection", this.positiveOperationOffsetCorrection);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenOperation setAccessorOperation = null;

+

+	public void set_setAccessorOperation(org.eclipse.emf.codegen.ecore.genmodel.GenOperation object) {

+		this.setAccessorOperation = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenFeature genFeature = null;

+

+	public void set_genFeature(org.eclipse.emf.codegen.ecore.genmodel.GenFeature object) {

+		this.genFeature = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenClass genClass = null;

+

+	public void set_genClass(org.eclipse.emf.codegen.ecore.genmodel.GenClass object) {

+		this.genClass = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenPackage genPackage = null;

+

+	public void set_genPackage(org.eclipse.emf.codegen.ecore.genmodel.GenPackage object) {

+		this.genPackage = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenModel genModel = null;

+

+	public void set_genModel(org.eclipse.emf.codegen.ecore.genmodel.GenModel object) {

+		this.genModel = object;

+	}

+

+	protected java.lang.Boolean isJDK50 = null;

+

+	public void set_isJDK50(java.lang.Boolean object) {

+		this.isJDK50 = object;

+	}

+

+	protected java.lang.Boolean isInterface = null;

+

+	public void set_isInterface(java.lang.Boolean object) {

+		this.isInterface = object;

+	}

+

+	protected java.lang.Boolean isImplementation = null;

+

+	public void set_isImplementation(java.lang.Boolean object) {

+		this.isImplementation = object;

+	}

+

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

+	protected java.lang.Boolean isGWT = null;

+

+	public void set_isGWT(java.lang.Boolean object) {

+		this.isGWT = object;

+	}

+

+	protected java.lang.String publicStaticFinalFlag = null;

+

+	public void set_publicStaticFinalFlag(java.lang.String object) {

+		this.publicStaticFinalFlag = object;

+	}

+

+	protected java.lang.String singleWildcard = null;

+

+	public void set_singleWildcard(java.lang.String object) {

+		this.singleWildcard = object;

+	}

+

+	protected java.lang.String negativeOffsetCorrection = null;

+

+	public void set_negativeOffsetCorrection(java.lang.String object) {

+		this.negativeOffsetCorrection = object;

+	}

+

+	protected java.lang.String positiveOffsetCorrection = null;

+

+	public void set_positiveOffsetCorrection(java.lang.String object) {

+		this.positiveOffsetCorrection = object;

+	}

+

+	protected java.lang.String negativeOperationOffsetCorrection = null;

+

+	public void set_negativeOperationOffsetCorrection(java.lang.String object) {

+		this.negativeOperationOffsetCorrection = object;

+	}

+

+	protected java.lang.String positiveOperationOffsetCorrection = null;

+

+	public void set_positiveOperationOffsetCorrection(java.lang.String object) {

+		this.positiveOperationOffsetCorrection = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("setAccessorOperation", this.setAccessorOperation);

+		parameters.put("genFeature", this.genFeature);

+		parameters.put("genClass", this.genClass);

+		parameters.put("genPackage", this.genPackage);

+		parameters.put("genModel", this.genModel);

+		parameters.put("isJDK50", this.isJDK50);

+		parameters.put("isInterface", this.isInterface);

+		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

+		parameters.put("isGWT", this.isGWT);

+		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

+		parameters.put("singleWildcard", this.singleWildcard);

+		parameters.put("negativeOffsetCorrection", this.negativeOffsetCorrection);

+		parameters.put("positiveOffsetCorrection", this.positiveOffsetCorrection);

+		parameters.put("negativeOperationOffsetCorrection", this.negativeOperationOffsetCorrection);

+		parameters.put("positiveOperationOffsetCorrection", this.positiveOperationOffsetCorrection);

+		return parameters;

+	}

+

+	protected void method_doGenerate(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

+}
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdynamicSetGenFeaturepreinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdynamicSetGenFeaturepreinsert.java
new file mode 100644
index 0000000..e0b7083
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassdynamicSetGenFeaturepreinsert.java
@@ -0,0 +1,304 @@
+//Generated with EGF 1.6.0.201901231418

+package org.eclipse.egf.emf.pattern.model.call.Class;

+

+import org.eclipse.egf.emf.pattern.base.*;

+import org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil;

+import org.eclipse.emf.codegen.ecore.genmodel.*;

+import org.eclipse.emf.codegen.ecore.genmodel.impl.*;

+import org.eclipse.emf.codegen.ecore.genmodel.generator.*;

+import org.eclipse.emf.codegen.util.*;

+import org.eclipse.emf.ecore.util.*;

+import org.eclipse.emf.common.util.*;

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class ClassdynamicSetGenFeaturepreinsert {

+	protected static String nl;

+

+	public static synchronized ClassdynamicSetGenFeaturepreinsert create(String lineSeparator) {

+		nl = lineSeparator;

+		ClassdynamicSetGenFeaturepreinsert result = new ClassdynamicSetGenFeaturepreinsert();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "";

+	protected final String TEXT_2 = NL;

+

+	public ClassdynamicSetGenFeaturepreinsert() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> setAccessorOperationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genFeatureList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genClassList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genPackageList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genModelList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isJDK50List = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isInterfaceList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isImplementationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isGWTList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> publicStaticFinalFlagList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> singleWildcardList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> negativeOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> positiveOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> negativeOperationOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> positiveOperationOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object setAccessorOperationParameter : setAccessorOperationList) {

+			for (Object genFeatureParameter : genFeatureList) {

+				for (Object genClassParameter : genClassList) {

+					for (Object genPackageParameter : genPackageList) {

+						for (Object genModelParameter : genModelList) {

+							for (Object isJDK50Parameter : isJDK50List) {

+								for (Object isInterfaceParameter : isInterfaceList) {

+									for (Object isImplementationParameter : isImplementationList) {

+										for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+											for (Object isGWTParameter : isGWTList) {

+												for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+													for (Object singleWildcardParameter : singleWildcardList) {

+														for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+															for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+																for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																	for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+

+																		this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

+																		this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																		this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																		this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																		this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																		this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																		this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																		this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																		this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																		this.isGWT = (java.lang.Boolean) isGWTParameter;

+																		this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																		this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																		this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																		this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																		this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																		this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+

+																		if (preCondition(ctx)) {

+																			ctx.setNode(new Node.Container(currentNode,

+																					getClass()));

+																			orchestration(ctx);

+																		}

+

+																	}

+																}

+															}

+														}

+													}

+												}

+											}

+										}

+									}

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_doGenerate(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("setAccessorOperation", this.setAccessorOperation);

+			parameterValues.put("genFeature", this.genFeature);

+			parameterValues.put("genClass", this.genClass);

+			parameterValues.put("genPackage", this.genPackage);

+			parameterValues.put("genModel", this.genModel);

+			parameterValues.put("isJDK50", this.isJDK50);

+			parameterValues.put("isInterface", this.isInterface);

+			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

+			parameterValues.put("isGWT", this.isGWT);

+			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

+			parameterValues.put("singleWildcard", this.singleWildcard);

+			parameterValues.put("negativeOffsetCorrection", this.negativeOffsetCorrection);

+			parameterValues.put("positiveOffsetCorrection", this.positiveOffsetCorrection);

+			parameterValues.put("negativeOperationOffsetCorrection", this.negativeOperationOffsetCorrection);

+			parameterValues.put("positiveOperationOffsetCorrection", this.positiveOperationOffsetCorrection);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenOperation setAccessorOperation = null;

+

+	public void set_setAccessorOperation(org.eclipse.emf.codegen.ecore.genmodel.GenOperation object) {

+		this.setAccessorOperation = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenFeature genFeature = null;

+

+	public void set_genFeature(org.eclipse.emf.codegen.ecore.genmodel.GenFeature object) {

+		this.genFeature = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenClass genClass = null;

+

+	public void set_genClass(org.eclipse.emf.codegen.ecore.genmodel.GenClass object) {

+		this.genClass = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenPackage genPackage = null;

+

+	public void set_genPackage(org.eclipse.emf.codegen.ecore.genmodel.GenPackage object) {

+		this.genPackage = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenModel genModel = null;

+

+	public void set_genModel(org.eclipse.emf.codegen.ecore.genmodel.GenModel object) {

+		this.genModel = object;

+	}

+

+	protected java.lang.Boolean isJDK50 = null;

+

+	public void set_isJDK50(java.lang.Boolean object) {

+		this.isJDK50 = object;

+	}

+

+	protected java.lang.Boolean isInterface = null;

+

+	public void set_isInterface(java.lang.Boolean object) {

+		this.isInterface = object;

+	}

+

+	protected java.lang.Boolean isImplementation = null;

+

+	public void set_isImplementation(java.lang.Boolean object) {

+		this.isImplementation = object;

+	}

+

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

+	protected java.lang.Boolean isGWT = null;

+

+	public void set_isGWT(java.lang.Boolean object) {

+		this.isGWT = object;

+	}

+

+	protected java.lang.String publicStaticFinalFlag = null;

+

+	public void set_publicStaticFinalFlag(java.lang.String object) {

+		this.publicStaticFinalFlag = object;

+	}

+

+	protected java.lang.String singleWildcard = null;

+

+	public void set_singleWildcard(java.lang.String object) {

+		this.singleWildcard = object;

+	}

+

+	protected java.lang.String negativeOffsetCorrection = null;

+

+	public void set_negativeOffsetCorrection(java.lang.String object) {

+		this.negativeOffsetCorrection = object;

+	}

+

+	protected java.lang.String positiveOffsetCorrection = null;

+

+	public void set_positiveOffsetCorrection(java.lang.String object) {

+		this.positiveOffsetCorrection = object;

+	}

+

+	protected java.lang.String negativeOperationOffsetCorrection = null;

+

+	public void set_negativeOperationOffsetCorrection(java.lang.String object) {

+		this.negativeOperationOffsetCorrection = object;

+	}

+

+	protected java.lang.String positiveOperationOffsetCorrection = null;

+

+	public void set_positiveOperationOffsetCorrection(java.lang.String object) {

+		this.positiveOperationOffsetCorrection = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("setAccessorOperation", this.setAccessorOperation);

+		parameters.put("genFeature", this.genFeature);

+		parameters.put("genClass", this.genClass);

+		parameters.put("genPackage", this.genPackage);

+		parameters.put("genModel", this.genModel);

+		parameters.put("isJDK50", this.isJDK50);

+		parameters.put("isInterface", this.isInterface);

+		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

+		parameters.put("isGWT", this.isGWT);

+		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

+		parameters.put("singleWildcard", this.singleWildcard);

+		parameters.put("negativeOffsetCorrection", this.negativeOffsetCorrection);

+		parameters.put("positiveOffsetCorrection", this.positiveOffsetCorrection);

+		parameters.put("negativeOperationOffsetCorrection", this.negativeOperationOffsetCorrection);

+		parameters.put("positiveOperationOffsetCorrection", this.positiveOperationOffsetCorrection);

+		return parameters;

+	}

+

+	protected void method_doGenerate(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

+}
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasseIsSetoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasseIsSetoverride.java
index 36e4d65..b46d689 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasseIsSetoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasseIsSetoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -109,6 +109,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -130,34 +132,37 @@
 					for (Object isJDK50Parameter : isJDK50List) {

 						for (Object isInterfaceParameter : isInterfaceList) {

 							for (Object isImplementationParameter : isImplementationList) {

-								for (Object isGWTParameter : isGWTList) {

-									for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-										for (Object singleWildcardParameter : singleWildcardList) {

-											for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-												for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-													for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-														for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+								for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+									for (Object isGWTParameter : isGWTList) {

+										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+											for (Object singleWildcardParameter : singleWildcardList) {

+												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-															this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-															this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-															this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-															this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-															this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-															this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-															this.isGWT = (java.lang.Boolean) isGWTParameter;

-															this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-															this.singleWildcard = (java.lang.String) singleWildcardParameter;

-															this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-															this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-															this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-															this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																this.isGWT = (java.lang.Boolean) isGWTParameter;

+																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-															if (preCondition(ctx)) {

-																ctx.setNode(

-																		new Node.Container(currentNode, getClass()));

-																orchestration(ctx);

+																if (preCondition(ctx)) {

+																	ctx.setNode(new Node.Container(currentNode,

+																			getClass()));

+																	orchestration(ctx);

+																}

+

 															}

-

 														}

 													}

 												}

@@ -194,6 +199,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -244,6 +250,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -294,6 +306,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasseUnsetoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasseUnsetoverride.java
index 29e8c0f..e3b9912 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasseUnsetoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasseUnsetoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -83,6 +83,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -104,34 +106,37 @@
 					for (Object isJDK50Parameter : isJDK50List) {

 						for (Object isInterfaceParameter : isInterfaceList) {

 							for (Object isImplementationParameter : isImplementationList) {

-								for (Object isGWTParameter : isGWTList) {

-									for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-										for (Object singleWildcardParameter : singleWildcardList) {

-											for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-												for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-													for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-														for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+								for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+									for (Object isGWTParameter : isGWTList) {

+										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+											for (Object singleWildcardParameter : singleWildcardList) {

+												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-															this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-															this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-															this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-															this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-															this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-															this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-															this.isGWT = (java.lang.Boolean) isGWTParameter;

-															this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-															this.singleWildcard = (java.lang.String) singleWildcardParameter;

-															this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-															this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-															this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-															this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																this.isGWT = (java.lang.Boolean) isGWTParameter;

+																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-															if (preCondition(ctx)) {

-																ctx.setNode(

-																		new Node.Container(currentNode, getClass()));

-																orchestration(ctx);

+																if (preCondition(ctx)) {

+																	ctx.setNode(new Node.Container(currentNode,

+																			getClass()));

+																	orchestration(ctx);

+																}

+

 															}

-

 														}

 													}

 												}

@@ -168,6 +173,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -218,6 +224,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -268,6 +280,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassegfCustomconstructoroverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassegfCustomconstructoroverride.java
index ebd51f9..cc25910 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassegfCustomconstructoroverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassegfCustomconstructoroverride.java
@@ -1,7 +1,8 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

+import org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil;

 import org.eclipse.emf.codegen.ecore.genmodel.*;

 import org.eclipse.emf.codegen.ecore.genmodel.impl.*;

 import org.eclipse.emf.codegen.ecore.genmodel.generator.*;

@@ -28,7 +29,6 @@
 	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

 	protected final String TEXT_1 = NL + "\t\tsuper();" + NL;

 	protected final String TEXT_2 = NL;

-	protected final String TEXT_3 = NL;

 

 	public ClassegfCustomconstructoroverride() {

 		//Here is the constructor

@@ -58,6 +58,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -79,34 +81,37 @@
 					for (Object isJDK50Parameter : isJDK50List) {

 						for (Object isInterfaceParameter : isInterfaceList) {

 							for (Object isImplementationParameter : isImplementationList) {

-								for (Object isGWTParameter : isGWTList) {

-									for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-										for (Object singleWildcardParameter : singleWildcardList) {

-											for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-												for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-													for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-														for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+								for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+									for (Object isGWTParameter : isGWTList) {

+										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+											for (Object singleWildcardParameter : singleWildcardList) {

+												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-															this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-															this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-															this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-															this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-															this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-															this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-															this.isGWT = (java.lang.Boolean) isGWTParameter;

-															this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-															this.singleWildcard = (java.lang.String) singleWildcardParameter;

-															this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-															this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-															this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-															this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																this.isGWT = (java.lang.Boolean) isGWTParameter;

+																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-															if (preCondition(ctx)) {

-																ctx.setNode(

-																		new Node.Container(currentNode, getClass()));

-																orchestration(ctx);

+																if (preCondition(ctx)) {

+																	ctx.setNode(new Node.Container(currentNode,

+																			getClass()));

+																	orchestration(ctx);

+																}

+

 															}

-

 														}

 													}

 												}

@@ -126,7 +131,7 @@
 		}

 

 		stringBuffer.append(TEXT_2);

-		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_2);

 		return stringBuffer.toString();

 	}

 

@@ -143,6 +148,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -193,6 +199,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -243,6 +255,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenFeatureReifiedoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenFeatureReifiedoverride.java
index 28ed94a..6fcc849 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenFeatureReifiedoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenFeatureReifiedoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -116,6 +116,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -140,37 +142,40 @@
 								for (Object isJDK50Parameter : isJDK50List) {

 									for (Object isInterfaceParameter : isInterfaceList) {

 										for (Object isImplementationParameter : isImplementationList) {

-											for (Object isGWTParameter : isGWTList) {

-												for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-													for (Object singleWildcardParameter : singleWildcardList) {

-														for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-															for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-																for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-																	for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+											for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+												for (Object isGWTParameter : isGWTList) {

+													for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+														for (Object singleWildcardParameter : singleWildcardList) {

+															for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+																for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+																	for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																		for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																		this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																		this.classExtendsGenClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) classExtendsGenClassParameter;

-																		this.classExtendsAllGenFeatures = (java.util.List) classExtendsAllGenFeaturesParameter;

-																		this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																		this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																		this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																		this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																		this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																		this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																		this.isGWT = (java.lang.Boolean) isGWTParameter;

-																		this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																		this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																		this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																		this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																		this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																		this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																			this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																			this.classExtendsGenClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) classExtendsGenClassParameter;

+																			this.classExtendsAllGenFeatures = (java.util.List) classExtendsAllGenFeaturesParameter;

+																			this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																			this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																			this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																			this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																			this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																			this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																			this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																			this.isGWT = (java.lang.Boolean) isGWTParameter;

+																			this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																			this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																			this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																			this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																			this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																			this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																		if (preCondition(ctx)) {

-																			ctx.setNode(new Node.Container(currentNode,

-																					getClass()));

-																			orchestration(ctx);

+																			if (preCondition(ctx)) {

+																				ctx.setNode(new Node.Container(

+																						currentNode, getClass()));

+																				orchestration(ctx);

+																			}

+

 																		}

-

 																	}

 																}

 															}

@@ -213,6 +218,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -281,6 +287,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -334,6 +346,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -364,7 +377,7 @@
 			if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {

 				stringBuffer.append(TEXT_7);

 			}

-			if (classExtendsAllGenFeatures.contains(genFeature)) {

+			if (useInterfaceOverrideAnnotation || classExtendsAllGenFeatures.contains(genFeature)) {

 				stringBuffer.append(TEXT_8);

 			}

 			stringBuffer.append(TEXT_9);

@@ -415,7 +428,7 @@
 			if (isJDK50) { //Class/getGenFeature.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_25);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -429,6 +442,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -449,7 +463,7 @@
 			if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {

 				stringBuffer.append(TEXT_7);

 			}

-			if (classExtendsAllGenFeatures.contains(genFeature)) {

+			if (useInterfaceOverrideAnnotation || classExtendsAllGenFeatures.contains(genFeature)) {

 				stringBuffer.append(TEXT_8);

 			}

 			stringBuffer.append(TEXT_9);

@@ -462,7 +476,7 @@
 			stringBuffer.append(TEXT_11);

 			stringBuffer.append(TEXT_25);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -476,6 +490,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -535,7 +550,7 @@
 			if (isJDK50) { //Class/basicSetGenFeature.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_25);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -549,6 +564,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -595,7 +611,7 @@
 			if (isJDK50) { //Class/setGenFeature.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_25);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -609,6 +625,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenFeatureinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenFeatureinsert.java
index e3a5d0e..766c8ab 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenFeatureinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenFeatureinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenFeatureoverride.java
index 0c88c04..09276d7 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -37,48 +37,49 @@
 	protected final String TEXT_7 = "();" + NL;

 	protected final String TEXT_8 = NL + "\t@SuppressWarnings(\"unchecked\")";

 	protected final String TEXT_9 = NL + "\t@Deprecated";

-	protected final String TEXT_10 = NL + "\tpublic ";

-	protected final String TEXT_11 = "()" + NL + "\t{";

-	protected final String TEXT_12 = NL + "\t\t";

-	protected final String TEXT_13 = " list = (";

-	protected final String TEXT_14 = ")";

-	protected final String TEXT_15 = "();" + NL + "\t\tif (list.isEmpty()) return ";

-	protected final String TEXT_16 = "_EEMPTY_ARRAY;";

-	protected final String TEXT_17 = NL + "\t\tif (";

-	protected final String TEXT_18 = " == null || ";

-	protected final String TEXT_19 = ".isEmpty()) return ";

-	protected final String TEXT_20 = "_EEMPTY_ARRAY;" + NL + "\t\t";

-	protected final String TEXT_21 = ";";

-	protected final String TEXT_22 = NL + "\t\tlist.shrink();" + NL + "\t\treturn (";

-	protected final String TEXT_23 = "[])list.data();" + NL + "\t}" + NL;

-	protected final String TEXT_24 = " get";

-	protected final String TEXT_25 = "(int index);" + NL;

-	protected final String TEXT_26 = "(int index)" + NL + "\t{" + NL + "\t\treturn ";

-	protected final String TEXT_27 = "(";

-	protected final String TEXT_28 = "().get(index);" + NL + "\t}" + NL;

-	protected final String TEXT_29 = NL + "\tint get";

-	protected final String TEXT_30 = "Length();" + NL;

-	protected final String TEXT_31 = NL + "\tpublic int get";

-	protected final String TEXT_32 = "Length()" + NL + "\t{";

-	protected final String TEXT_33 = NL + "\t\treturn ";

-	protected final String TEXT_34 = "().size();";

-	protected final String TEXT_35 = " == null ? 0 : ";

-	protected final String TEXT_36 = ".size();";

-	protected final String TEXT_37 = NL + "\t}" + NL;

-	protected final String TEXT_38 = NL + "\tvoid set";

-	protected final String TEXT_39 = "[] new";

-	protected final String TEXT_40 = ");" + NL;

-	protected final String TEXT_41 = NL + "\tpublic void set";

-	protected final String TEXT_42 = ")" + NL + "\t{" + NL + "\t\t((";

-	protected final String TEXT_43 = "()).setData(new";

-	protected final String TEXT_44 = ".length, new";

-	protected final String TEXT_45 = ");" + NL + "\t}" + NL;

-	protected final String TEXT_46 = "(int index, ";

-	protected final String TEXT_47 = " element);" + NL;

-	protected final String TEXT_48 = " element)" + NL + "\t{" + NL + "\t\t";

-	protected final String TEXT_49 = "().set(index, element);" + NL + "\t}" + NL;

-	protected final String TEXT_50 = NL;

+	protected final String TEXT_10 = NL + "\t@Override";

+	protected final String TEXT_11 = NL + "\tpublic ";

+	protected final String TEXT_12 = "()" + NL + "\t{";

+	protected final String TEXT_13 = NL + "\t\t";

+	protected final String TEXT_14 = " list = (";

+	protected final String TEXT_15 = ")";

+	protected final String TEXT_16 = "();" + NL + "\t\tif (list.isEmpty()) return ";

+	protected final String TEXT_17 = "_EEMPTY_ARRAY;";

+	protected final String TEXT_18 = NL + "\t\tif (";

+	protected final String TEXT_19 = " == null || ";

+	protected final String TEXT_20 = ".isEmpty()) return ";

+	protected final String TEXT_21 = "_EEMPTY_ARRAY;" + NL + "\t\t";

+	protected final String TEXT_22 = ";";

+	protected final String TEXT_23 = NL + "\t\tlist.shrink();" + NL + "\t\treturn (";

+	protected final String TEXT_24 = "[])list.data();" + NL + "\t}" + NL;

+	protected final String TEXT_25 = " get";

+	protected final String TEXT_26 = "(int index);" + NL;

+	protected final String TEXT_27 = "(int index)" + NL + "\t{" + NL + "\t\treturn ";

+	protected final String TEXT_28 = "(";

+	protected final String TEXT_29 = "().get(index);" + NL + "\t}" + NL;

+	protected final String TEXT_30 = NL + "\tint get";

+	protected final String TEXT_31 = "Length();" + NL;

+	protected final String TEXT_32 = NL + "\tpublic int get";

+	protected final String TEXT_33 = "Length()" + NL + "\t{";

+	protected final String TEXT_34 = NL + "\t\treturn ";

+	protected final String TEXT_35 = "().size();";

+	protected final String TEXT_36 = " == null ? 0 : ";

+	protected final String TEXT_37 = ".size();";

+	protected final String TEXT_38 = NL + "\t}" + NL;

+	protected final String TEXT_39 = NL + "\tvoid set";

+	protected final String TEXT_40 = "[] new";

+	protected final String TEXT_41 = ");" + NL;

+	protected final String TEXT_42 = NL + "\tpublic void set";

+	protected final String TEXT_43 = ")" + NL + "\t{" + NL + "\t\t((";

+	protected final String TEXT_44 = "()).setData(new";

+	protected final String TEXT_45 = ".length, new";

+	protected final String TEXT_46 = ");" + NL + "\t}" + NL;

+	protected final String TEXT_47 = "(int index, ";

+	protected final String TEXT_48 = " element);" + NL;

+	protected final String TEXT_49 = " element)" + NL + "\t{" + NL + "\t\t";

+	protected final String TEXT_50 = "().set(index, element);" + NL + "\t}" + NL;

 	protected final String TEXT_51 = NL;

+	protected final String TEXT_52 = NL;

 

 	public ClassgenFeatureoverride() {

 		//Here is the constructor

@@ -110,6 +111,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -132,35 +135,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -180,8 +186,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_51);

-		stringBuffer.append(TEXT_51);

+		stringBuffer.append(TEXT_52);

+		stringBuffer.append(TEXT_52);

 		return stringBuffer.toString();

 	}

 

@@ -199,6 +205,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -255,6 +262,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -306,6 +319,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -341,43 +355,46 @@
 				if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {

 					stringBuffer.append(TEXT_9);

 				}

-				stringBuffer.append(TEXT_10);

+				if (useInterfaceOverrideAnnotation) {

+					stringBuffer.append(TEXT_10);

+				}

+				stringBuffer.append(TEXT_11);

 				stringBuffer.append(arrayElementType);

 				stringBuffer.append(TEXT_6);

 				stringBuffer.append(genFeature.getGetArrayAccessor());

-				stringBuffer.append(TEXT_11);

+				stringBuffer.append(TEXT_12);

 				if (genFeature.isVolatile()) {

-					stringBuffer.append(TEXT_12);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

-					stringBuffer.append(genFeature.getListTemplateArguments(genClass));

 					stringBuffer.append(TEXT_13);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

 					stringBuffer.append(genFeature.getListTemplateArguments(genClass));

 					stringBuffer.append(TEXT_14);

-					stringBuffer.append(genFeature.getGetAccessor());

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

+					stringBuffer.append(genFeature.getListTemplateArguments(genClass));

 					stringBuffer.append(TEXT_15);

-					stringBuffer.append(genFeature.getUpperName());

+					stringBuffer.append(genFeature.getGetAccessor());

 					stringBuffer.append(TEXT_16);

-				} else {

+					stringBuffer.append(genFeature.getUpperName());

 					stringBuffer.append(TEXT_17);

-					stringBuffer.append(genFeature.getSafeName());

+				} else {

 					stringBuffer.append(TEXT_18);

 					stringBuffer.append(genFeature.getSafeName());

 					stringBuffer.append(TEXT_19);

-					stringBuffer.append(genFeature.getUpperName());

+					stringBuffer.append(genFeature.getSafeName());

 					stringBuffer.append(TEXT_20);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

-					stringBuffer.append(genFeature.getListTemplateArguments(genClass));

-					stringBuffer.append(TEXT_13);

+					stringBuffer.append(genFeature.getUpperName());

+					stringBuffer.append(TEXT_21);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

 					stringBuffer.append(genFeature.getListTemplateArguments(genClass));

 					stringBuffer.append(TEXT_14);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

+					stringBuffer.append(genFeature.getListTemplateArguments(genClass));

+					stringBuffer.append(TEXT_15);

 					stringBuffer.append(genFeature.getSafeName());

-					stringBuffer.append(TEXT_21);

+					stringBuffer.append(TEXT_22);

 				}

-				stringBuffer.append(TEXT_22);

-				stringBuffer.append(arrayElementType);

 				stringBuffer.append(TEXT_23);

+				stringBuffer.append(arrayElementType);

+				stringBuffer.append(TEXT_24);

 			}

 			stringBuffer.append(TEXT_2);

 			if (genFeature.hasAPITags()) {

@@ -391,22 +408,25 @@
 			if (!isImplementation) {

 				stringBuffer.append(TEXT_5);

 				stringBuffer.append(genFeature.getListItemType(genClass));

-				stringBuffer.append(TEXT_24);

-				stringBuffer.append(genFeature.getAccessorName());

 				stringBuffer.append(TEXT_25);

-			} else {

-				stringBuffer.append(TEXT_10);

-				stringBuffer.append(genFeature.getListItemType(genClass));

-				stringBuffer.append(TEXT_24);

 				stringBuffer.append(genFeature.getAccessorName());

 				stringBuffer.append(TEXT_26);

+			} else {

+				if (useInterfaceOverrideAnnotation) {

+					stringBuffer.append(TEXT_10);

+				}

+				stringBuffer.append(TEXT_11);

+				stringBuffer.append(genFeature.getListItemType(genClass));

+				stringBuffer.append(TEXT_25);

+				stringBuffer.append(genFeature.getAccessorName());

+				stringBuffer.append(TEXT_27);

 				if (!genModel.useGenerics()) {

-					stringBuffer.append(TEXT_27);

+					stringBuffer.append(TEXT_28);

 					stringBuffer.append(genFeature.getListItemType(genClass));

-					stringBuffer.append(TEXT_14);

+					stringBuffer.append(TEXT_15);

 				}

 				stringBuffer.append(genFeature.getGetAccessor());

-				stringBuffer.append(TEXT_28);

+				stringBuffer.append(TEXT_29);

 			}

 			stringBuffer.append(TEXT_2);

 			if (genFeature.hasAPITags()) {

@@ -418,25 +438,28 @@
 				stringBuffer.append(TEXT_9);

 			}

 			if (!isImplementation) {

-				stringBuffer.append(TEXT_29);

-				stringBuffer.append(genFeature.getAccessorName());

 				stringBuffer.append(TEXT_30);

-			} else {

-				stringBuffer.append(TEXT_31);

 				stringBuffer.append(genFeature.getAccessorName());

+				stringBuffer.append(TEXT_31);

+			} else {

+				if (useInterfaceOverrideAnnotation) {

+					stringBuffer.append(TEXT_10);

+				}

 				stringBuffer.append(TEXT_32);

+				stringBuffer.append(genFeature.getAccessorName());

+				stringBuffer.append(TEXT_33);

 				if (genFeature.isVolatile()) {

-					stringBuffer.append(TEXT_33);

-					stringBuffer.append(genFeature.getGetAccessor());

 					stringBuffer.append(TEXT_34);

-				} else {

-					stringBuffer.append(TEXT_33);

-					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(genFeature.getGetAccessor());

 					stringBuffer.append(TEXT_35);

+				} else {

+					stringBuffer.append(TEXT_34);

 					stringBuffer.append(genFeature.getSafeName());

 					stringBuffer.append(TEXT_36);

+					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(TEXT_37);

 				}

-				stringBuffer.append(TEXT_37);

+				stringBuffer.append(TEXT_38);

 			}

 			stringBuffer.append(TEXT_2);

 			if (genFeature.hasAPITags()) {

@@ -448,30 +471,33 @@
 				stringBuffer.append(TEXT_9);

 			}

 			if (!isImplementation) {

-				stringBuffer.append(TEXT_38);

-				stringBuffer.append(genFeature.getAccessorName());

-				stringBuffer.append(TEXT_27);

-				stringBuffer.append(genFeature.getListItemType(genClass));

 				stringBuffer.append(TEXT_39);

-				stringBuffer.append(genFeature.getCapName());

+				stringBuffer.append(genFeature.getAccessorName());

+				stringBuffer.append(TEXT_28);

+				stringBuffer.append(genFeature.getListItemType(genClass));

 				stringBuffer.append(TEXT_40);

-			} else {

-				stringBuffer.append(TEXT_41);

-				stringBuffer.append(genFeature.getAccessorName());

-				stringBuffer.append(TEXT_27);

-				stringBuffer.append(genFeature.getListItemType(genClass));

-				stringBuffer.append(TEXT_39);

 				stringBuffer.append(genFeature.getCapName());

+				stringBuffer.append(TEXT_41);

+			} else {

+				if (useInterfaceOverrideAnnotation) {

+					stringBuffer.append(TEXT_10);

+				}

 				stringBuffer.append(TEXT_42);

+				stringBuffer.append(genFeature.getAccessorName());

+				stringBuffer.append(TEXT_28);

+				stringBuffer.append(genFeature.getListItemType(genClass));

+				stringBuffer.append(TEXT_40);

+				stringBuffer.append(genFeature.getCapName());

+				stringBuffer.append(TEXT_43);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

 				stringBuffer.append(genFeature.getListTemplateArguments(genClass));

-				stringBuffer.append(TEXT_14);

+				stringBuffer.append(TEXT_15);

 				stringBuffer.append(genFeature.getGetAccessor());

-				stringBuffer.append(TEXT_43);

-				stringBuffer.append(genFeature.getCapName());

 				stringBuffer.append(TEXT_44);

 				stringBuffer.append(genFeature.getCapName());

 				stringBuffer.append(TEXT_45);

+				stringBuffer.append(genFeature.getCapName());

+				stringBuffer.append(TEXT_46);

 			}

 			stringBuffer.append(TEXT_2);

 			if (genFeature.hasAPITags()) {

@@ -483,25 +509,28 @@
 				stringBuffer.append(TEXT_9);

 			}

 			if (!isImplementation) {

-				stringBuffer.append(TEXT_38);

+				stringBuffer.append(TEXT_39);

 				stringBuffer.append(genFeature.getAccessorName());

-				stringBuffer.append(TEXT_46);

-				stringBuffer.append(genFeature.getListItemType(genClass));

 				stringBuffer.append(TEXT_47);

-			} else {

-				stringBuffer.append(TEXT_41);

-				stringBuffer.append(genFeature.getAccessorName());

-				stringBuffer.append(TEXT_46);

 				stringBuffer.append(genFeature.getListItemType(genClass));

 				stringBuffer.append(TEXT_48);

-				stringBuffer.append(genFeature.getGetAccessor());

+			} else {

+				if (useInterfaceOverrideAnnotation) {

+					stringBuffer.append(TEXT_10);

+				}

+				stringBuffer.append(TEXT_42);

+				stringBuffer.append(genFeature.getAccessorName());

+				stringBuffer.append(TEXT_47);

+				stringBuffer.append(genFeature.getListItemType(genClass));

 				stringBuffer.append(TEXT_49);

+				stringBuffer.append(genFeature.getGetAccessor());

+				stringBuffer.append(TEXT_50);

 			}

 		}

 		if (genFeature.isGet() && (isImplementation || !genFeature.isSuppressedGetVisibility())) {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_51);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -515,6 +544,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -531,9 +561,9 @@
 			//Class/getGenFeature.override.javajetinc

 		}

 		if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicGet()) {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_51);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -547,6 +577,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -563,9 +594,9 @@
 			//Class/basicGetGenFeature.override.javajetinc

 		}

 		if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicSet()) {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_51);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -579,6 +610,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -595,9 +627,9 @@
 			//Class/basicSetGenFeature.override.javajetinc

 		}

 		if (genFeature.isSet() && (isImplementation || !genFeature.isSuppressedSetVisibility())) {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_51);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -611,6 +643,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -627,9 +660,9 @@
 			//Class/setGenFeature.override.javajetinc

 		}

 		if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicUnset()) {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_51);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -643,6 +676,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -659,9 +693,9 @@
 			//Class.basicUnsetGenFeature.override.javajetinc

 		}

 		if (genFeature.isUnset() && (isImplementation || !genFeature.isSuppressedUnsetVisibility())) {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_51);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -675,6 +709,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -691,9 +726,9 @@
 			//Class/unsetGenFeature.override.javajetinc

 		}

 		if (genFeature.isIsSet() && (isImplementation || !genFeature.isSuppressedIsSetVisibility())) {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_51);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -707,6 +742,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -722,9 +758,9 @@
 

 			//Class/isSetGenFeature.override.javajetinc

 		}

-		stringBuffer.append(TEXT_50);

+		stringBuffer.append(TEXT_51);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -738,6 +774,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

@@ -751,7 +788,7 @@
 			stringBuffer.setLength(0);

 		}

 

-		stringBuffer.append(TEXT_50);

+		stringBuffer.append(TEXT_51);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationannotationsinsert.java
index dd5a298..ac1cdc9 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationinsert.java
index 9c0c080..7d6cffb 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationjavadocinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationjavadocinsert.java
index 7df9943..eb43906 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationjavadocinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationjavadocinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationjavadocoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationjavadocoverride.java
index d87f881..33ecc7d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationjavadocoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationjavadocoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -72,6 +72,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -94,35 +96,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -161,6 +166,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -217,6 +223,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -268,6 +280,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -283,7 +296,7 @@
 		stringBuffer.append(TEXT_1);

 		stringBuffer.append(TEXT_2);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.javadoc.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.javadoc.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -297,6 +310,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationoverride.java
index e9f4849..4c1c954 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgenOperationoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -55,54 +55,55 @@
 	protected final String TEXT_23 = NL + "\t";

 	protected final String TEXT_24 = ";" + NL;

 	protected final String TEXT_25 = NL + "\t@SuppressWarnings(\"unchecked\")";

-	protected final String TEXT_26 = NL + "\tpublic ";

-	protected final String TEXT_27 = NL + "\t{";

-	protected final String TEXT_28 = NL + "\t\t";

-	protected final String TEXT_29 = NL + "\t\treturn" + NL + "\t\t\t";

-	protected final String TEXT_30 = ".validate" + NL + "\t\t\t\t(";

-	protected final String TEXT_31 = "," + NL + "\t\t\t\t this," + NL + "\t\t\t\t ";

-	protected final String TEXT_32 = "," + NL + "\t\t\t\t ";

-	protected final String TEXT_33 = "," + NL + "\t\t\t\t \"";

-	protected final String TEXT_34 = "\",";

-	protected final String TEXT_35 = NL + "\t\t\t\t ";

-	protected final String TEXT_36 = "__EEXPRESSION," + NL + "\t\t\t\t ";

-	protected final String TEXT_37 = ".ERROR," + NL + "\t\t\t\t ";

-	protected final String TEXT_38 = ".DIAGNOSTIC_SOURCE," + NL + "\t\t\t\t ";

-	protected final String TEXT_39 = ".";

-	protected final String TEXT_40 = ");";

-	protected final String TEXT_41 = NL + "\t\t// TODO: implement this method" + NL

+	protected final String TEXT_26 = NL + "\t@Override";

+	protected final String TEXT_27 = NL + "\tpublic ";

+	protected final String TEXT_28 = NL + "\t{";

+	protected final String TEXT_29 = NL + "\t\t";

+	protected final String TEXT_30 = NL + "\t\treturn" + NL + "\t\t\t";

+	protected final String TEXT_31 = ".validate" + NL + "\t\t\t\t(";

+	protected final String TEXT_32 = "," + NL + "\t\t\t\t this," + NL + "\t\t\t\t ";

+	protected final String TEXT_33 = "," + NL + "\t\t\t\t ";

+	protected final String TEXT_34 = "," + NL + "\t\t\t\t \"";

+	protected final String TEXT_35 = "\",";

+	protected final String TEXT_36 = NL + "\t\t\t\t ";

+	protected final String TEXT_37 = "__EEXPRESSION," + NL + "\t\t\t\t ";

+	protected final String TEXT_38 = ".ERROR," + NL + "\t\t\t\t ";

+	protected final String TEXT_39 = ".DIAGNOSTIC_SOURCE," + NL + "\t\t\t\t ";

+	protected final String TEXT_40 = ".";

+	protected final String TEXT_41 = ");";

+	protected final String TEXT_42 = 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_42 = " != null)" + NL + "\t\t\t{" + NL + "\t\t\t\t";

-	protected final String TEXT_43 = ".add" + NL + "\t\t\t\t\t(new ";

-	protected final String TEXT_44 = NL + "\t\t\t\t\t\t(";

-	protected final String TEXT_45 = ".ERROR," + NL + "\t\t\t\t\t\t ";

-	protected final String TEXT_46 = ".DIAGNOSTIC_SOURCE," + NL + "\t\t\t\t\t\t ";

-	protected final String TEXT_47 = "," + NL + "\t\t\t\t\t\t ";

-	protected final String TEXT_48 = ".INSTANCE.getString(\"_UI_GenericInvariant_diagnostic\", new Object[] { \"";

-	protected final String TEXT_49 = "\", ";

-	protected final String TEXT_50 = ".getObjectLabel(this, ";

-	protected final String TEXT_51 = ") }),";

-	protected final String TEXT_52 = NL + "\t\t\t\t\t\t new Object [] { this }));" + NL + "\t\t\t}" + NL

+	protected final String TEXT_43 = " != null)" + NL + "\t\t\t{" + NL + "\t\t\t\t";

+	protected final String TEXT_44 = ".add" + NL + "\t\t\t\t\t(new ";

+	protected final String TEXT_45 = NL + "\t\t\t\t\t\t(";

+	protected final String TEXT_46 = ".ERROR," + NL + "\t\t\t\t\t\t ";

+	protected final String TEXT_47 = ".DIAGNOSTIC_SOURCE," + NL + "\t\t\t\t\t\t ";

+	protected final String TEXT_48 = "," + NL + "\t\t\t\t\t\t ";

+	protected final String TEXT_49 = ".INSTANCE.getString(\"_UI_GenericInvariant_diagnostic\", new Object[] { \"";

+	protected final String TEXT_50 = "\", ";

+	protected final String TEXT_51 = ".getObjectLabel(this, ";

+	protected final String TEXT_52 = ") }),";

+	protected final String TEXT_53 = 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_53 = NL + "\t\ttry" + NL + "\t\t{";

-	protected final String TEXT_54 = NL + "\t\t\t";

-	protected final String TEXT_55 = "__EINVOCATION_DELEGATE.dynamicInvoke(this, ";

-	protected final String TEXT_56 = "new ";

-	protected final String TEXT_57 = ".UnmodifiableEList<Object>(";

-	protected final String TEXT_58 = ", ";

-	protected final String TEXT_59 = "null";

-	protected final String TEXT_60 = NL + "\t\t\treturn ";

-	protected final String TEXT_61 = ").";

-	protected final String TEXT_62 = "()";

-	protected final String TEXT_63 = ";";

-	protected final String TEXT_64 = NL + "\t\t}" + NL + "\t\tcatch (";

-	protected final String TEXT_65 = " ite)" + NL + "\t\t{" + NL + "\t\t\tthrow new ";

-	protected final String TEXT_66 = "(ite);" + NL + "\t\t}";

-	protected final String TEXT_67 = NL + "\t}" + NL;

-	protected final String TEXT_68 = NL;

+	protected final String TEXT_54 = NL + "\t\ttry" + NL + "\t\t{";

+	protected final String TEXT_55 = NL + "\t\t\t";

+	protected final String TEXT_56 = "__EINVOCATION_DELEGATE.dynamicInvoke(this, ";

+	protected final String TEXT_57 = "new ";

+	protected final String TEXT_58 = ".UnmodifiableEList<Object>(";

+	protected final String TEXT_59 = ", ";

+	protected final String TEXT_60 = "null";

+	protected final String TEXT_61 = NL + "\t\t\treturn ";

+	protected final String TEXT_62 = ").";

+	protected final String TEXT_63 = "()";

+	protected final String TEXT_64 = ";";

+	protected final String TEXT_65 = NL + "\t\t}" + NL + "\t\tcatch (";

+	protected final String TEXT_66 = " ite)" + NL + "\t\t{" + NL + "\t\t\tthrow new ";

+	protected final String TEXT_67 = "(ite);" + NL + "\t\t}";

+	protected final String TEXT_68 = NL + "\t}" + NL;

+	protected final String TEXT_69 = NL;

 

 	public ClassgenOperationoverride() {

 		//Here is the constructor

@@ -134,6 +135,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -156,35 +159,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -204,8 +210,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_68);

-		stringBuffer.append(TEXT_68);

+		stringBuffer.append(TEXT_69);

+		stringBuffer.append(TEXT_69);

 		return stringBuffer.toString();

 	}

 

@@ -223,6 +229,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -279,6 +286,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -330,6 +343,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -407,7 +421,7 @@
 		if (isInterface) {

 			stringBuffer.append(TEXT_14);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.javadoc.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.javadoc.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -421,6 +435,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -445,7 +460,7 @@
 			if (isJDK50) { //Class/genOperation.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_14);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.annotations.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.annotations.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -459,6 +474,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -493,7 +509,10 @@
 					&& genOperation.hasInvocationDelegate() && genOperation.isUncheckedCast(genClass)) {

 				stringBuffer.append(TEXT_25);

 			}

-			stringBuffer.append(TEXT_26);

+			if (useInterfaceOverrideAnnotation && !genClass.isMapEntry() && !genOperation.isSuppressedVisibility()) {

+				stringBuffer.append(TEXT_26);

+			}

+			stringBuffer.append(TEXT_27);

 			stringBuffer.append(genOperation.getTypeParameters(genClass));

 			stringBuffer.append(genOperation.getImportedType(genClass));

 			stringBuffer.append(TEXT_11);

@@ -502,91 +521,91 @@
 			stringBuffer.append(genOperation.getParameters(isImplementation, genClass));

 			stringBuffer.append(TEXT_6);

 			stringBuffer.append(genOperation.getThrows(genClass));

-			stringBuffer.append(TEXT_27);

+			stringBuffer.append(TEXT_28);

 			if (genOperation.hasBody()) {

-				stringBuffer.append(TEXT_28);

+				stringBuffer.append(TEXT_29);

 				stringBuffer.append(genOperation.getBody(genModel.getIndentation(stringBuffer)));

 			} else if (genOperation.isInvariant()) {

 				GenClass opClass = genOperation.getGenClass();

 				String diagnostics = genOperation.getGenParameters().get(0).getName();

 				String context = genOperation.getGenParameters().get(1).getName();

 				if (genOperation.hasInvariantExpression()) {

-					stringBuffer.append(TEXT_29);

-					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

 					stringBuffer.append(TEXT_30);

-					stringBuffer.append(genClass.getQualifiedClassifierAccessor());

+					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

 					stringBuffer.append(TEXT_31);

+					stringBuffer.append(genClass.getQualifiedClassifierAccessor());

+					stringBuffer.append(TEXT_32);

 					stringBuffer.append(diagnostics);

-					stringBuffer.append(TEXT_32);

-					stringBuffer.append(context);

 					stringBuffer.append(TEXT_33);

-					stringBuffer.append(genOperation.getValidationDelegate());

+					stringBuffer.append(context);

 					stringBuffer.append(TEXT_34);

-					stringBuffer.append(genModel.getNonNLS());

+					stringBuffer.append(genOperation.getValidationDelegate());

 					stringBuffer.append(TEXT_35);

+					stringBuffer.append(genModel.getNonNLS());

+					stringBuffer.append(TEXT_36);

 					stringBuffer.append(genOperation.getQualifiedOperationAccessor());

-					stringBuffer.append(TEXT_32);

+					stringBuffer.append(TEXT_33);

 					stringBuffer

 							.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));

-					stringBuffer.append(TEXT_36);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Diagnostic"));

 					stringBuffer.append(TEXT_37);

-					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Diagnostic"));

 					stringBuffer.append(TEXT_38);

 					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

 					stringBuffer.append(TEXT_39);

-					stringBuffer.append(opClass.getOperationID(genOperation));

+					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

 					stringBuffer.append(TEXT_40);

-				} else {

+					stringBuffer.append(opClass.getOperationID(genOperation));

 					stringBuffer.append(TEXT_41);

-					stringBuffer.append(diagnostics);

+				} else {

 					stringBuffer.append(TEXT_42);

 					stringBuffer.append(diagnostics);

 					stringBuffer.append(TEXT_43);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicDiagnostic"));

+					stringBuffer.append(diagnostics);

 					stringBuffer.append(TEXT_44);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Diagnostic"));

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicDiagnostic"));

 					stringBuffer.append(TEXT_45);

-					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Diagnostic"));

 					stringBuffer.append(TEXT_46);

 					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

-					stringBuffer.append(TEXT_39);

-					stringBuffer.append(opClass.getOperationID(genOperation));

 					stringBuffer.append(TEXT_47);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.plugin.EcorePlugin"));

+					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

+					stringBuffer.append(TEXT_40);

+					stringBuffer.append(opClass.getOperationID(genOperation));

 					stringBuffer.append(TEXT_48);

-					stringBuffer.append(genOperation.getName());

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.plugin.EcorePlugin"));

 					stringBuffer.append(TEXT_49);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.EObjectValidator"));

+					stringBuffer.append(genOperation.getName());

 					stringBuffer.append(TEXT_50);

-					stringBuffer.append(context);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.EObjectValidator"));

 					stringBuffer.append(TEXT_51);

+					stringBuffer.append(context);

+					stringBuffer.append(TEXT_52);

 					stringBuffer.append(genModel.getNonNLS());

 					stringBuffer.append(genModel.getNonNLS(2));

-					stringBuffer.append(TEXT_52);

+					stringBuffer.append(TEXT_53);

 				}

 			} else if (genOperation.hasInvocationDelegate()) {

 				int size = genOperation.getGenParameters().size();

-				stringBuffer.append(TEXT_53);

+				stringBuffer.append(TEXT_54);

 				if (genOperation.isVoid()) {

-					stringBuffer.append(TEXT_54);

+					stringBuffer.append(TEXT_55);

 					stringBuffer

 							.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));

-					stringBuffer.append(TEXT_55);

+					stringBuffer.append(TEXT_56);

 					if (size > 0) {

-						stringBuffer.append(TEXT_56);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

 						stringBuffer.append(TEXT_57);

-						stringBuffer.append(size);

+						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

 						stringBuffer.append(TEXT_58);

+						stringBuffer.append(size);

+						stringBuffer.append(TEXT_59);

 						stringBuffer.append(genOperation.getParametersArray(genClass));

 						stringBuffer.append(TEXT_6);

 					} else {

-						stringBuffer.append(TEXT_59);

+						stringBuffer.append(TEXT_60);

 					}

-					stringBuffer.append(TEXT_40);

+					stringBuffer.append(TEXT_41);

 				} else {

-					stringBuffer.append(TEXT_60);

+					stringBuffer.append(TEXT_61);

 					if (!isJDK50 && genOperation.isPrimitiveType()) {

 						stringBuffer.append(TEXT_3);

 					}

@@ -595,37 +614,37 @@
 					stringBuffer.append(TEXT_6);

 					stringBuffer

 							.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));

-					stringBuffer.append(TEXT_55);

+					stringBuffer.append(TEXT_56);

 					if (size > 0) {

-						stringBuffer.append(TEXT_56);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

 						stringBuffer.append(TEXT_57);

-						stringBuffer.append(size);

+						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

 						stringBuffer.append(TEXT_58);

+						stringBuffer.append(size);

+						stringBuffer.append(TEXT_59);

 						stringBuffer.append(genOperation.getParametersArray(genClass));

 						stringBuffer.append(TEXT_6);

 					} else {

-						stringBuffer.append(TEXT_59);

+						stringBuffer.append(TEXT_60);

 					}

 					stringBuffer.append(TEXT_6);

 					if (!isJDK50 && genOperation.isPrimitiveType()) {

-						stringBuffer.append(TEXT_61);

-						stringBuffer.append(genOperation.getPrimitiveValueFunction());

 						stringBuffer.append(TEXT_62);

+						stringBuffer.append(genOperation.getPrimitiveValueFunction());

+						stringBuffer.append(TEXT_63);

 					}

-					stringBuffer.append(TEXT_63);

+					stringBuffer.append(TEXT_64);

 				}

-				stringBuffer.append(TEXT_64);

+				stringBuffer.append(TEXT_65);

 				stringBuffer

 						.append(genModel.getImportedName(isGWT ? "org.eclipse.emf.common.util.InvocationTargetException"

 								: "java.lang.reflect.InvocationTargetException"));

-				stringBuffer.append(TEXT_65);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.WrappedException"));

 				stringBuffer.append(TEXT_66);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.WrappedException"));

+				stringBuffer.append(TEXT_67);

 			} else {

 				stringBuffer.append(TEXT_14);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.implementedGenOperation.TODO.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.implementedGenOperation.TODO.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -639,6 +658,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -654,11 +674,11 @@
 

 				//Class/implementedGenOperation.todo.override.javajetinc

 			}

-			stringBuffer.append(TEXT_67);

+			stringBuffer.append(TEXT_68);

 		}

 		stringBuffer.append(TEXT_14);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -672,6 +692,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeatureTODOoverride.java
index 9ca784c..cd49a53 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -70,6 +70,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -92,35 +94,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -159,6 +164,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -215,6 +221,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -266,6 +278,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeatureannotationsinsert.java
index 72465c1..9172fc2 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeaturejavadocinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeaturejavadocinsert.java
index c953ad9..68026aa 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeaturejavadocinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeaturejavadocinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeaturejavadocoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeaturejavadocoverride.java
index b05b0f1..0910933 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeaturejavadocoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeaturejavadocoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -99,6 +99,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -121,35 +123,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -188,6 +193,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -244,6 +250,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -295,6 +307,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -381,7 +394,7 @@
 		}

 		stringBuffer.append(TEXT_19);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -395,6 +408,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeatureoverride.java
index afe3873..dbb8e17 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -38,98 +38,99 @@
 	protected final String TEXT_8 = " ";

 	protected final String TEXT_9 = "();" + NL;

 	protected final String TEXT_10 = NL + "\t@SuppressWarnings(\"unchecked\")";

-	protected final String TEXT_11 = NL + "\tpublic ";

-	protected final String TEXT_12 = "_";

-	protected final String TEXT_13 = "()" + NL + "\t{";

-	protected final String TEXT_14 = NL + "\t\treturn ";

-	protected final String TEXT_15 = "(";

-	protected final String TEXT_16 = ")eDynamicGet(";

-	protected final String TEXT_17 = " - ESTATIC_FEATURE_COUNT";

-	protected final String TEXT_18 = ", ";

-	protected final String TEXT_19 = ", true, ";

-	protected final String TEXT_20 = ")";

-	protected final String TEXT_21 = ").";

-	protected final String TEXT_22 = "()";

-	protected final String TEXT_23 = ";";

-	protected final String TEXT_24 = NL + "\t\t";

-	protected final String TEXT_25 = ")eGet(";

-	protected final String TEXT_26 = ", true)";

-	protected final String TEXT_27 = "__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false)";

-	protected final String TEXT_28 = " = (";

-	protected final String TEXT_29 = ")eVirtualGet(";

-	protected final String TEXT_30 = ");";

-	protected final String TEXT_31 = NL + "\t\tif (";

-	protected final String TEXT_32 = " == null)" + NL + "\t\t{";

-	protected final String TEXT_33 = NL + "\t\t\teVirtualSet(";

-	protected final String TEXT_34 = " = new ";

-	protected final String TEXT_35 = NL + "\t\t\t";

-	protected final String TEXT_36 = NL + "\t\t}" + NL + "\t\treturn ";

-	protected final String TEXT_37 = NL + "\t\tif (eContainerFeatureID() != ";

-	protected final String TEXT_38 = ") return null;" + NL + "\t\treturn (";

-	protected final String TEXT_39 = "eContainer";

-	protected final String TEXT_40 = "eInternalContainer";

-	protected final String TEXT_41 = "();";

-	protected final String TEXT_42 = " != null && ";

-	protected final String TEXT_43 = ".eIsProxy())" + NL + "\t\t{" + NL + "\t\t\t";

-	protected final String TEXT_44 = " old";

-	protected final String TEXT_45 = ";" + NL + "\t\t\t";

+	protected final String TEXT_11 = NL + "\t@Override";

+	protected final String TEXT_12 = NL + "\tpublic ";

+	protected final String TEXT_13 = "_";

+	protected final String TEXT_14 = "()" + NL + "\t{";

+	protected final String TEXT_15 = NL + "\t\treturn ";

+	protected final String TEXT_16 = "(";

+	protected final String TEXT_17 = ")eDynamicGet(";

+	protected final String TEXT_18 = " - ESTATIC_FEATURE_COUNT";

+	protected final String TEXT_19 = ", ";

+	protected final String TEXT_20 = ", true, ";

+	protected final String TEXT_21 = ")";

+	protected final String TEXT_22 = ").";

+	protected final String TEXT_23 = "()";

+	protected final String TEXT_24 = ";";

+	protected final String TEXT_25 = NL + "\t\t";

+	protected final String TEXT_26 = ")eGet(";

+	protected final String TEXT_27 = ", true)";

+	protected final String TEXT_28 = "__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false)";

+	protected final String TEXT_29 = " = (";

+	protected final String TEXT_30 = ")eVirtualGet(";

+	protected final String TEXT_31 = ");";

+	protected final String TEXT_32 = NL + "\t\tif (";

+	protected final String TEXT_33 = " == null)" + NL + "\t\t{";

+	protected final String TEXT_34 = NL + "\t\t\teVirtualSet(";

+	protected final String TEXT_35 = " = new ";

+	protected final String TEXT_36 = NL + "\t\t\t";

+	protected final String TEXT_37 = NL + "\t\t}" + NL + "\t\treturn ";

+	protected final String TEXT_38 = NL + "\t\tif (eContainerFeatureID() != ";

+	protected final String TEXT_39 = ") return null;" + NL + "\t\treturn (";

+	protected final String TEXT_40 = "eContainer";

+	protected final String TEXT_41 = "eInternalContainer";

+	protected final String TEXT_42 = "();";

+	protected final String TEXT_43 = " != null && ";

+	protected final String TEXT_44 = ".eIsProxy())" + NL + "\t\t{" + NL + "\t\t\t";

+	protected final String TEXT_45 = " old";

 	protected final String TEXT_46 = " = ";

-	protected final String TEXT_47 = "eResolveProxy(old";

-	protected final String TEXT_48 = ");" + NL + "\t\t\tif (";

-	protected final String TEXT_49 = " != old";

-	protected final String TEXT_50 = ")" + NL + "\t\t\t{";

-	protected final String TEXT_51 = NL + "\t\t\t\t";

-	protected final String TEXT_52 = " new";

-	protected final String TEXT_53 = " msgs = old";

-	protected final String TEXT_54 = ".eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

-	protected final String TEXT_55 = ", null, null);";

-	protected final String TEXT_56 = " msgs =  old";

-	protected final String TEXT_57 = ".eInverseRemove(this, ";

-	protected final String TEXT_58 = ".class, null);";

-	protected final String TEXT_59 = NL + "\t\t\t\tif (new";

-	protected final String TEXT_60 = ".eInternalContainer() == null)" + NL + "\t\t\t\t{";

-	protected final String TEXT_61 = NL + "\t\t\t\t\tmsgs = new";

-	protected final String TEXT_62 = ".eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ";

-	protected final String TEXT_63 = ", null, msgs);";

-	protected final String TEXT_64 = NL + "\t\t\t\t\tmsgs =  new";

-	protected final String TEXT_65 = ".eInverseAdd(this, ";

-	protected final String TEXT_66 = ".class, msgs);";

-	protected final String TEXT_67 = NL + "\t\t\t\t}" + NL + "\t\t\t\tif (msgs != null) msgs.dispatch();";

-	protected final String TEXT_68 = NL + "\t\t\t\teVirtualSet(";

-	protected final String TEXT_69 = NL + "\t\t\t\tif (eNotificationRequired())" + NL + "\t\t\t\t\teNotify(new ";

-	protected final String TEXT_70 = "(this, ";

-	protected final String TEXT_71 = ".RESOLVE, ";

-	protected final String TEXT_72 = ", old";

-	protected final String TEXT_73 = "));";

-	protected final String TEXT_74 = NL + "\t\t\t}" + NL + "\t\t}";

-	protected final String TEXT_75 = NL + "\t\treturn (";

-	protected final String TEXT_76 = " & ";

-	protected final String TEXT_77 = "_EFLAG) != 0;";

-	protected final String TEXT_78 = "_EFLAG_VALUES[(";

-	protected final String TEXT_79 = "_EFLAG) >>> ";

-	protected final String TEXT_80 = "_EFLAG_OFFSET];";

-	protected final String TEXT_81 = " = basicGet";

-	protected final String TEXT_82 = "();" + NL + "\t\treturn ";

-	protected final String TEXT_83 = ".eIsProxy() ? ";

-	protected final String TEXT_84 = "eResolveProxy((";

-	protected final String TEXT_85 = ") : ";

-	protected final String TEXT_86 = NL + "\t\treturn new ";

-	protected final String TEXT_87 = "((";

-	protected final String TEXT_88 = ".Internal)((";

-	protected final String TEXT_89 = ".Internal.Wrapper)get";

-	protected final String TEXT_90 = "()).featureMap().";

-	protected final String TEXT_91 = "list(";

-	protected final String TEXT_92 = ")get";

-	protected final String TEXT_93 = "().";

-	protected final String TEXT_94 = NL + "\t\treturn ((";

-	protected final String TEXT_95 = "()).featureMap().list(";

-	protected final String TEXT_96 = NL + "\t\treturn get";

-	protected final String TEXT_97 = "().list(";

-	protected final String TEXT_98 = "()).featureMap().get(";

-	protected final String TEXT_99 = "get";

-	protected final String TEXT_100 = "().get(";

-	protected final String TEXT_101 = NL + "\t}" + NL;

-	protected final String TEXT_102 = NL;

+	protected final String TEXT_47 = ";" + NL + "\t\t\t";

+	protected final String TEXT_48 = "eResolveProxy(old";

+	protected final String TEXT_49 = ");" + NL + "\t\t\tif (";

+	protected final String TEXT_50 = " != old";

+	protected final String TEXT_51 = ")" + NL + "\t\t\t{";

+	protected final String TEXT_52 = NL + "\t\t\t\t";

+	protected final String TEXT_53 = " new";

+	protected final String TEXT_54 = " msgs = old";

+	protected final String TEXT_55 = ".eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

+	protected final String TEXT_56 = ", null, null);";

+	protected final String TEXT_57 = " msgs =  old";

+	protected final String TEXT_58 = ".eInverseRemove(this, ";

+	protected final String TEXT_59 = ".class, null);";

+	protected final String TEXT_60 = NL + "\t\t\t\tif (new";

+	protected final String TEXT_61 = ".eInternalContainer() == null)" + NL + "\t\t\t\t{";

+	protected final String TEXT_62 = NL + "\t\t\t\t\tmsgs = new";

+	protected final String TEXT_63 = ".eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ";

+	protected final String TEXT_64 = ", null, msgs);";

+	protected final String TEXT_65 = NL + "\t\t\t\t\tmsgs =  new";

+	protected final String TEXT_66 = ".eInverseAdd(this, ";

+	protected final String TEXT_67 = ".class, msgs);";

+	protected final String TEXT_68 = NL + "\t\t\t\t}" + NL + "\t\t\t\tif (msgs != null) msgs.dispatch();";

+	protected final String TEXT_69 = NL + "\t\t\t\teVirtualSet(";

+	protected final String TEXT_70 = NL + "\t\t\t\tif (eNotificationRequired())" + NL + "\t\t\t\t\teNotify(new ";

+	protected final String TEXT_71 = "(this, ";

+	protected final String TEXT_72 = ".RESOLVE, ";

+	protected final String TEXT_73 = ", old";

+	protected final String TEXT_74 = "));";

+	protected final String TEXT_75 = NL + "\t\t\t}" + NL + "\t\t}";

+	protected final String TEXT_76 = NL + "\t\treturn (";

+	protected final String TEXT_77 = " & ";

+	protected final String TEXT_78 = "_EFLAG) != 0;";

+	protected final String TEXT_79 = "_EFLAG_VALUES[(";

+	protected final String TEXT_80 = "_EFLAG) >>> ";

+	protected final String TEXT_81 = "_EFLAG_OFFSET];";

+	protected final String TEXT_82 = " = basicGet";

+	protected final String TEXT_83 = "();" + NL + "\t\treturn ";

+	protected final String TEXT_84 = ".eIsProxy() ? ";

+	protected final String TEXT_85 = "eResolveProxy(";

+	protected final String TEXT_86 = ") : ";

+	protected final String TEXT_87 = NL + "\t\treturn new ";

+	protected final String TEXT_88 = "((";

+	protected final String TEXT_89 = ".Internal)((";

+	protected final String TEXT_90 = ".Internal.Wrapper)get";

+	protected final String TEXT_91 = "()).featureMap().";

+	protected final String TEXT_92 = "list(";

+	protected final String TEXT_93 = ")get";

+	protected final String TEXT_94 = "().";

+	protected final String TEXT_95 = NL + "\t\treturn ((";

+	protected final String TEXT_96 = "()).featureMap().list(";

+	protected final String TEXT_97 = NL + "\t\treturn get";

+	protected final String TEXT_98 = "().list(";

+	protected final String TEXT_99 = "()).featureMap().get(";

+	protected final String TEXT_100 = "get";

+	protected final String TEXT_101 = "().get(";

+	protected final String TEXT_102 = NL + "\t}" + NL;

+	protected final String TEXT_103 = NL;

 

 	public ClassgetGenFeatureoverride() {

 		//Here is the constructor

@@ -161,6 +162,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -183,35 +186,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -231,8 +237,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_102);

-		stringBuffer.append(TEXT_102);

+		stringBuffer.append(TEXT_103);

+		stringBuffer.append(TEXT_103);

 		return stringBuffer.toString();

 	}

 

@@ -250,6 +256,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -306,6 +313,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -357,6 +370,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -373,7 +387,7 @@
 		if (isInterface) {

 			stringBuffer.append(TEXT_2);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -387,6 +401,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -411,7 +426,7 @@
 			if (isJDK50) { //Class/getGenFeature.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -425,6 +440,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -459,17 +475,22 @@
 					|| genFeature.isListType() && genFeature.hasSettingDelegate())) {

 				stringBuffer.append(TEXT_10);

 			}

-			stringBuffer.append(TEXT_11);

+			if (useInterfaceOverrideAnnotation && !genClass.isMapEntry()

+					&& !genClass.hasCollidingGetAccessorOperation(genFeature)

+					&& !genFeature.isSuppressedGetVisibility()) {

+				stringBuffer.append(TEXT_11);

+			}

+			stringBuffer.append(TEXT_12);

 			stringBuffer.append(genFeature.getImportedType(genClass));

 			stringBuffer.append(TEXT_8);

 			stringBuffer.append(genFeature.getGetAccessor());

 			if (genClass.hasCollidingGetAccessorOperation(genFeature)) {

-				stringBuffer.append(TEXT_12);

+				stringBuffer.append(TEXT_13);

 			}

-			stringBuffer.append(TEXT_13);

+			stringBuffer.append(TEXT_14);

 			stringBuffer.append(TEXT_2);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -483,6 +504,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -497,303 +519,297 @@
 			}

 

 			if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {

-				stringBuffer.append(TEXT_14);

-				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_15);

-				}

 				stringBuffer.append(TEXT_15);

-				stringBuffer.append(genFeature.getObjectType(genClass));

+				if (!isJDK50 && genFeature.isPrimitiveType()) {

+					stringBuffer.append(TEXT_16);

+				}

 				stringBuffer.append(TEXT_16);

+				stringBuffer.append(genFeature.getObjectType(genClass));

+				stringBuffer.append(TEXT_17);

 				stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 				if (genClass.hasStaticFeatures()) {

-					stringBuffer.append(TEXT_17);

+					stringBuffer.append(TEXT_18);

 				}

-				stringBuffer.append(TEXT_18);

-				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

 				stringBuffer.append(TEXT_19);

-				stringBuffer.append(!genFeature.isEffectiveSuppressEMFTypes());

+				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

 				stringBuffer.append(TEXT_20);

+				stringBuffer.append(!genFeature.isEffectiveSuppressEMFTypes());

+				stringBuffer.append(TEXT_21);

 				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_21);

-					stringBuffer.append(genFeature.getPrimitiveValueFunction());

 					stringBuffer.append(TEXT_22);

-				}

-				stringBuffer.append(TEXT_23);

-			} else if (genModel.isReflectiveDelegation()) {

-				if (genFeature.hasGetterBody()) {

-					stringBuffer.append(TEXT_24);

-					stringBuffer.append(genFeature.getGetterBody(genModel.getIndentation(stringBuffer)));

-				} else {

-					stringBuffer.append(TEXT_14);

-					if (!isJDK50 && genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_15);

-					}

-					stringBuffer.append(TEXT_15);

-					stringBuffer.append(genFeature.getObjectType(genClass));

-					stringBuffer.append(TEXT_25);

-					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-					stringBuffer.append(TEXT_26);

-					if (!isJDK50 && genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_21);

-						stringBuffer.append(genFeature.getPrimitiveValueFunction());

-						stringBuffer.append(TEXT_22);

-					}

+					stringBuffer.append(genFeature.getPrimitiveValueFunction());

 					stringBuffer.append(TEXT_23);

 				}

-			} else if (genFeature.hasSettingDelegate()) {

-				stringBuffer.append(TEXT_14);

-				if (!isJDK50 && genFeature.isPrimitiveType()) {

+				stringBuffer.append(TEXT_24);

+			} else if (genModel.isReflectiveDelegation()) {

+				if (genFeature.hasGetterBody()) {

+					stringBuffer.append(TEXT_25);

+					stringBuffer.append(genFeature.getGetterBody(genModel.getIndentation(stringBuffer)));

+				} else {

 					stringBuffer.append(TEXT_15);

+					if (!isJDK50 && genFeature.isPrimitiveType()) {

+						stringBuffer.append(TEXT_16);

+					}

+					stringBuffer.append(TEXT_16);

+					stringBuffer.append(genFeature.getObjectType(genClass));

+					stringBuffer.append(TEXT_26);

+					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+					stringBuffer.append(TEXT_27);

+					if (!isJDK50 && genFeature.isPrimitiveType()) {

+						stringBuffer.append(TEXT_22);

+						stringBuffer.append(genFeature.getPrimitiveValueFunction());

+						stringBuffer.append(TEXT_23);

+					}

+					stringBuffer.append(TEXT_24);

 				}

+			} else if (genFeature.hasSettingDelegate()) {

 				stringBuffer.append(TEXT_15);

-				stringBuffer.append(genFeature.getObjectType(genClass));

-				stringBuffer.append(TEXT_20);

-				stringBuffer.append(genFeature.getUpperName());

-				stringBuffer.append(TEXT_27);

 				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_21);

-					stringBuffer.append(genFeature.getPrimitiveValueFunction());

-					stringBuffer.append(TEXT_22);

+					stringBuffer.append(TEXT_16);

 				}

-				stringBuffer.append(TEXT_23);

+				stringBuffer.append(TEXT_16);

+				stringBuffer.append(genFeature.getObjectType(genClass));

+				stringBuffer.append(TEXT_21);

+				stringBuffer.append(genFeature.getUpperName());

+				stringBuffer.append(TEXT_28);

+				if (!isJDK50 && genFeature.isPrimitiveType()) {

+					stringBuffer.append(TEXT_22);

+					stringBuffer.append(genFeature.getPrimitiveValueFunction());

+					stringBuffer.append(TEXT_23);

+				}

+				stringBuffer.append(TEXT_24);

 			} else if (!genFeature.isVolatile()) {

 				if (genFeature.isListType()) {

 					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_24);

+						stringBuffer.append(TEXT_25);

 						stringBuffer.append(genFeature.getImportedType(genClass));

 						stringBuffer.append(TEXT_8);

 						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_28);

-						stringBuffer.append(genFeature.getImportedType(genClass));

 						stringBuffer.append(TEXT_29);

+						stringBuffer.append(genFeature.getImportedType(genClass));

+						stringBuffer.append(TEXT_30);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_30);

+						stringBuffer.append(TEXT_31);

 					}

-					stringBuffer.append(TEXT_31);

-					stringBuffer.append(genFeature.getSafeName());

 					stringBuffer.append(TEXT_32);

+					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(TEXT_33);

 					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_33);

+						stringBuffer.append(TEXT_34);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_18);

+						stringBuffer.append(TEXT_19);

 						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_34);

-						stringBuffer.append(genClass.getListConstructor(genFeature));

-						stringBuffer.append(TEXT_30);

-					} else {

 						stringBuffer.append(TEXT_35);

-						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_34);

 						stringBuffer.append(genClass.getListConstructor(genFeature));

-						stringBuffer.append(TEXT_23);

+						stringBuffer.append(TEXT_31);

+					} else {

+						stringBuffer.append(TEXT_36);

+						stringBuffer.append(genFeature.getSafeName());

+						stringBuffer.append(TEXT_35);

+						stringBuffer.append(genClass.getListConstructor(genFeature));

+						stringBuffer.append(TEXT_24);

 					}

-					stringBuffer.append(TEXT_36);

+					stringBuffer.append(TEXT_37);

 					stringBuffer.append(genFeature.getSafeName());

 					stringBuffer

 							.append(genFeature.isMapType() && genFeature.isEffectiveSuppressEMFTypes() ? ".map()" : "");

-					stringBuffer.append(TEXT_23);

+					stringBuffer.append(TEXT_24);

 				} else if (genFeature.isContainer()) {

-					stringBuffer.append(TEXT_37);

+					stringBuffer.append(TEXT_38);

 					stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 					stringBuffer.append(positiveOffsetCorrection);

-					stringBuffer.append(TEXT_38);

+					stringBuffer.append(TEXT_39);

 					stringBuffer.append(genFeature.getImportedType(genClass));

-					stringBuffer.append(TEXT_20);

+					stringBuffer.append(TEXT_21);

 					if (genFeature.isResolveProxies()) {

-						stringBuffer.append(TEXT_39);

-					} else {

 						stringBuffer.append(TEXT_40);

+					} else {

+						stringBuffer.append(TEXT_41);

 					}

-					stringBuffer.append(TEXT_41);

+					stringBuffer.append(TEXT_42);

 				} else {

 					if (genFeature.isResolveProxies()) {

 						if (genModel.isVirtualDelegation()) {

-							stringBuffer.append(TEXT_24);

+							stringBuffer.append(TEXT_25);

 							stringBuffer.append(genFeature.getImportedType(genClass));

 							stringBuffer.append(TEXT_8);

 							stringBuffer.append(genFeature.getSafeName());

-							stringBuffer.append(TEXT_28);

-							stringBuffer.append(genFeature.getImportedType(genClass));

 							stringBuffer.append(TEXT_29);

+							stringBuffer.append(genFeature.getImportedType(genClass));

+							stringBuffer.append(TEXT_30);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

 							if (genFeature.hasEDefault()) {

-								stringBuffer.append(TEXT_18);

+								stringBuffer.append(TEXT_19);

 								stringBuffer.append(genFeature.getEDefault());

 							}

-							stringBuffer.append(TEXT_30);

+							stringBuffer.append(TEXT_31);

 						}

-						stringBuffer.append(TEXT_31);

+						stringBuffer.append(TEXT_32);

 						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_42);

-						stringBuffer.append(genFeature.getSafeNameAsEObject());

 						stringBuffer.append(TEXT_43);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

+						stringBuffer.append(genFeature.getSafeNameAsEObject());

 						stringBuffer.append(TEXT_44);

-						stringBuffer.append(genFeature.getCapName());

-						stringBuffer.append(TEXT_28);

 						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-						stringBuffer.append(TEXT_20);

-						stringBuffer.append(genFeature.getSafeName());

 						stringBuffer.append(TEXT_45);

+						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(TEXT_46);

+						stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), false));

+						stringBuffer.append(TEXT_47);

 						stringBuffer.append(genFeature.getSafeName());

 						stringBuffer.append(TEXT_46);

 						stringBuffer.append(genFeature.getNonEObjectInternalTypeCast(genClass));

-						stringBuffer.append(TEXT_47);

-						stringBuffer.append(genFeature.getCapName());

 						stringBuffer.append(TEXT_48);

-						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_49);

 						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(TEXT_49);

+						stringBuffer.append(genFeature.getSafeName());

 						stringBuffer.append(TEXT_50);

+						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(TEXT_51);

 						if (genFeature.isEffectiveContains()) {

-							stringBuffer.append(TEXT_51);

-							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

 							stringBuffer.append(TEXT_52);

-							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_28);

 							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-							stringBuffer.append(TEXT_20);

-							stringBuffer.append(genFeature.getSafeName());

-							stringBuffer.append(TEXT_23);

-							if (!genFeature.isBidirectional()) {

-								stringBuffer.append(TEXT_51);

-								stringBuffer.append(

-										genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

-								stringBuffer.append(TEXT_53);

-								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_54);

-								stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

-								stringBuffer.append(negativeOffsetCorrection);

-								stringBuffer.append(TEXT_55);

-							} else {

-								GenFeature reverseFeature = genFeature.getReverse();

-								GenClass targetClass = reverseFeature.getGenClass();

-								String reverseOffsetCorrection = targetClass.hasOffsetCorrection()

-										? " + " + genClass.getOffsetCorrectionField(genFeature)

-										: "";

-								stringBuffer.append(TEXT_51);

-								stringBuffer.append(

-										genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

-								stringBuffer.append(TEXT_56);

-								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_57);

-								stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

-								stringBuffer.append(reverseOffsetCorrection);

-								stringBuffer.append(TEXT_18);

-								stringBuffer.append(targetClass.getRawImportedInterfaceName());

-								stringBuffer.append(TEXT_58);

-							}

-							stringBuffer.append(TEXT_59);

+							stringBuffer.append(TEXT_53);

 							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_60);

+							stringBuffer.append(TEXT_46);

+							stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), false));

+							stringBuffer.append(TEXT_24);

 							if (!genFeature.isBidirectional()) {

-								stringBuffer.append(TEXT_61);

+								stringBuffer.append(TEXT_52);

+								stringBuffer.append(

+										genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

+								stringBuffer.append(TEXT_54);

 								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_62);

+								stringBuffer.append(TEXT_55);

 								stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 								stringBuffer.append(negativeOffsetCorrection);

-								stringBuffer.append(TEXT_63);

+								stringBuffer.append(TEXT_56);

 							} else {

 								GenFeature reverseFeature = genFeature.getReverse();

 								GenClass targetClass = reverseFeature.getGenClass();

 								String reverseOffsetCorrection = targetClass.hasOffsetCorrection()

 										? " + " + genClass.getOffsetCorrectionField(genFeature)

 										: "";

-								stringBuffer.append(TEXT_64);

+								stringBuffer.append(TEXT_52);

+								stringBuffer.append(

+										genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

+								stringBuffer.append(TEXT_57);

 								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_65);

+								stringBuffer.append(TEXT_58);

 								stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

 								stringBuffer.append(reverseOffsetCorrection);

-								stringBuffer.append(TEXT_18);

+								stringBuffer.append(TEXT_19);

 								stringBuffer.append(targetClass.getRawImportedInterfaceName());

-								stringBuffer.append(TEXT_66);

+								stringBuffer.append(TEXT_59);

 							}

-							stringBuffer.append(TEXT_67);

-						} else if (genModel.isVirtualDelegation()) {

+							stringBuffer.append(TEXT_60);

+							stringBuffer.append(genFeature.getCapName());

+							stringBuffer.append(TEXT_61);

+							if (!genFeature.isBidirectional()) {

+								stringBuffer.append(TEXT_62);

+								stringBuffer.append(genFeature.getCapName());

+								stringBuffer.append(TEXT_63);

+								stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

+								stringBuffer.append(negativeOffsetCorrection);

+								stringBuffer.append(TEXT_64);

+							} else {

+								GenFeature reverseFeature = genFeature.getReverse();

+								GenClass targetClass = reverseFeature.getGenClass();

+								String reverseOffsetCorrection = targetClass.hasOffsetCorrection()

+										? " + " + genClass.getOffsetCorrectionField(genFeature)

+										: "";

+								stringBuffer.append(TEXT_65);

+								stringBuffer.append(genFeature.getCapName());

+								stringBuffer.append(TEXT_66);

+								stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

+								stringBuffer.append(reverseOffsetCorrection);

+								stringBuffer.append(TEXT_19);

+								stringBuffer.append(targetClass.getRawImportedInterfaceName());

+								stringBuffer.append(TEXT_67);

+							}

 							stringBuffer.append(TEXT_68);

+						} else if (genModel.isVirtualDelegation()) {

+							stringBuffer.append(TEXT_69);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_18);

+							stringBuffer.append(TEXT_19);

 							stringBuffer.append(genFeature.getSafeName());

-							stringBuffer.append(TEXT_30);

+							stringBuffer.append(TEXT_31);

 						}

 						if (!genModel.isSuppressNotification()) {

-							stringBuffer.append(TEXT_69);

+							stringBuffer.append(TEXT_70);

 							stringBuffer

 									.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

-							stringBuffer.append(TEXT_70);

-							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

 							stringBuffer.append(TEXT_71);

+							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

+							stringBuffer.append(TEXT_72);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_72);

-							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_18);

-							stringBuffer.append(genFeature.getSafeName());

 							stringBuffer.append(TEXT_73);

+							stringBuffer.append(genFeature.getCapName());

+							stringBuffer.append(TEXT_19);

+							stringBuffer.append(genFeature.getSafeName());

+							stringBuffer.append(TEXT_74);

 						}

-						stringBuffer.append(TEXT_74);

+						stringBuffer.append(TEXT_75);

 					}

 					if (!genFeature.isResolveProxies() && genModel.isVirtualDelegation()

 							&& !genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_75);

+						stringBuffer.append(TEXT_76);

 						stringBuffer.append(genFeature.getImportedType(genClass));

-						stringBuffer.append(TEXT_29);

+						stringBuffer.append(TEXT_30);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

 						if (genFeature.hasEDefault()) {

-							stringBuffer.append(TEXT_18);

+							stringBuffer.append(TEXT_19);

 							stringBuffer.append(genFeature.getEDefault());

 						}

-						stringBuffer.append(TEXT_30);

+						stringBuffer.append(TEXT_31);

 					} else if (genClass.isFlag(genFeature)) {

 						if (genFeature.isBooleanType()) {

-							stringBuffer.append(TEXT_75);

-							stringBuffer.append(genClass.getFlagsField(genFeature));

 							stringBuffer.append(TEXT_76);

-							stringBuffer.append(genFeature.getUpperName());

+							stringBuffer.append(genClass.getFlagsField(genFeature));

 							stringBuffer.append(TEXT_77);

-						} else {

-							stringBuffer.append(TEXT_14);

 							stringBuffer.append(genFeature.getUpperName());

 							stringBuffer.append(TEXT_78);

-							stringBuffer.append(genClass.getFlagsField(genFeature));

-							stringBuffer.append(TEXT_76);

+						} else {

+							stringBuffer.append(TEXT_15);

 							stringBuffer.append(genFeature.getUpperName());

 							stringBuffer.append(TEXT_79);

+							stringBuffer.append(genClass.getFlagsField(genFeature));

+							stringBuffer.append(TEXT_77);

 							stringBuffer.append(genFeature.getUpperName());

 							stringBuffer.append(TEXT_80);

+							stringBuffer.append(genFeature.getUpperName());

+							stringBuffer.append(TEXT_81);

 						}

 					} else {

-						stringBuffer.append(TEXT_14);

+						stringBuffer.append(TEXT_15);

 						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_23);

+						stringBuffer.append(TEXT_24);

 					}

 				}

 			} else {//volatile

 				if (genFeature.isResolveProxies() && !genFeature.isListType()) {

-					stringBuffer.append(TEXT_24);

+					stringBuffer.append(TEXT_25);

 					stringBuffer.append(genFeature.getImportedType(genClass));

 					stringBuffer.append(TEXT_8);

 					stringBuffer.append(genFeature.getSafeName());

-					stringBuffer.append(TEXT_81);

-					stringBuffer.append(genFeature.getAccessorName());

 					stringBuffer.append(TEXT_82);

-					stringBuffer.append(genFeature.getSafeName());

-					stringBuffer.append(TEXT_42);

-					stringBuffer.append(genFeature.getSafeNameAsEObject());

+					stringBuffer.append(genFeature.getAccessorName());

 					stringBuffer.append(TEXT_83);

-					stringBuffer.append(genFeature.getNonEObjectInternalTypeCast(genClass));

+					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(TEXT_43);

+					stringBuffer.append(genFeature.getSafeNameAsEObject());

 					stringBuffer.append(TEXT_84);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-					stringBuffer.append(TEXT_20);

-					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(genFeature.getNonEObjectInternalTypeCast(genClass));

 					stringBuffer.append(TEXT_85);

+					stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), false));

+					stringBuffer.append(TEXT_86);

 					stringBuffer.append(genFeature.getSafeName());

-					stringBuffer.append(TEXT_23);

+					stringBuffer.append(TEXT_24);

 				} else if (genFeature.hasDelegateFeature()) {

 					GenFeature delegateFeature = genFeature.getDelegateFeature();

 					if (genFeature.isFeatureMapType()) {

@@ -801,106 +817,106 @@
 								? "<" + genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap") + ".Entry>"

 								: "";

 						if (delegateFeature.isWrappedFeatureMapType()) {

-							stringBuffer.append(TEXT_86);

-							stringBuffer.append(genFeature.getImportedEffectiveFeatureMapWrapperClass());

 							stringBuffer.append(TEXT_87);

-							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

+							stringBuffer.append(genFeature.getImportedEffectiveFeatureMapWrapperClass());

 							stringBuffer.append(TEXT_88);

 							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

 							stringBuffer.append(TEXT_89);

-							stringBuffer.append(delegateFeature.getAccessorName());

-							stringBuffer.append(TEXT_90);

-							stringBuffer.append(featureMapEntryTemplateArgument);

-							stringBuffer.append(TEXT_91);

-							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-							stringBuffer.append(TEXT_73);

-						} else {

-							stringBuffer.append(TEXT_75);

 							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

-							stringBuffer.append(TEXT_92);

+							stringBuffer.append(TEXT_90);

 							stringBuffer.append(delegateFeature.getAccessorName());

-							stringBuffer.append(TEXT_93);

-							stringBuffer.append(featureMapEntryTemplateArgument);

 							stringBuffer.append(TEXT_91);

+							stringBuffer.append(featureMapEntryTemplateArgument);

+							stringBuffer.append(TEXT_92);

 							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-							stringBuffer.append(TEXT_30);

+							stringBuffer.append(TEXT_74);

+						} else {

+							stringBuffer.append(TEXT_76);

+							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

+							stringBuffer.append(TEXT_93);

+							stringBuffer.append(delegateFeature.getAccessorName());

+							stringBuffer.append(TEXT_94);

+							stringBuffer.append(featureMapEntryTemplateArgument);

+							stringBuffer.append(TEXT_92);

+							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+							stringBuffer.append(TEXT_31);

 						}

 					} else if (genFeature.isListType()) {

 						if (delegateFeature.isWrappedFeatureMapType()) {

-							stringBuffer.append(TEXT_94);

-							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

-							stringBuffer.append(TEXT_89);

-							stringBuffer.append(delegateFeature.getAccessorName());

 							stringBuffer.append(TEXT_95);

-							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-							stringBuffer.append(TEXT_30);

-						} else {

-							stringBuffer.append(TEXT_96);

-							stringBuffer.append(delegateFeature.getAccessorName());

-							stringBuffer.append(TEXT_97);

-							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-							stringBuffer.append(TEXT_30);

-						}

-					} else {

-						if (delegateFeature.isWrappedFeatureMapType()) {

-							stringBuffer.append(TEXT_14);

-							if (!isJDK50 && genFeature.isPrimitiveType()) {

-								stringBuffer.append(TEXT_15);

-							}

-							if (genFeature.getTypeGenDataType() == null

-									|| !genFeature.getTypeGenDataType().isObjectType()) {

-								stringBuffer.append(TEXT_15);

-								stringBuffer.append(genFeature.getObjectType(genClass));

-								stringBuffer.append(TEXT_20);

-							}

-							stringBuffer.append(TEXT_87);

 							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

-							stringBuffer.append(TEXT_89);

+							stringBuffer.append(TEXT_90);

+							stringBuffer.append(delegateFeature.getAccessorName());

+							stringBuffer.append(TEXT_96);

+							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+							stringBuffer.append(TEXT_31);

+						} else {

+							stringBuffer.append(TEXT_97);

 							stringBuffer.append(delegateFeature.getAccessorName());

 							stringBuffer.append(TEXT_98);

 							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-							stringBuffer.append(TEXT_26);

+							stringBuffer.append(TEXT_31);

+						}

+					} else {

+						if (delegateFeature.isWrappedFeatureMapType()) {

+							stringBuffer.append(TEXT_15);

 							if (!isJDK50 && genFeature.isPrimitiveType()) {

-								stringBuffer.append(TEXT_21);

-								stringBuffer.append(genFeature.getPrimitiveValueFunction());

-								stringBuffer.append(TEXT_22);

-							}

-							stringBuffer.append(TEXT_23);

-						} else {

-							stringBuffer.append(TEXT_14);

-							if (!isJDK50 && genFeature.isPrimitiveType()) {

-								stringBuffer.append(TEXT_15);

+								stringBuffer.append(TEXT_16);

 							}

 							if (genFeature.getTypeGenDataType() == null

 									|| !genFeature.getTypeGenDataType().isObjectType()) {

-								stringBuffer.append(TEXT_15);

+								stringBuffer.append(TEXT_16);

 								stringBuffer.append(genFeature.getObjectType(genClass));

-								stringBuffer.append(TEXT_20);

-							}

-							stringBuffer.append(TEXT_99);

-							stringBuffer.append(delegateFeature.getAccessorName());

-							stringBuffer.append(TEXT_100);

-							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-							stringBuffer.append(TEXT_26);

-							if (!isJDK50 && genFeature.isPrimitiveType()) {

 								stringBuffer.append(TEXT_21);

-								stringBuffer.append(genFeature.getPrimitiveValueFunction());

-								stringBuffer.append(TEXT_22);

 							}

-							stringBuffer.append(TEXT_23);

+							stringBuffer.append(TEXT_88);

+							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

+							stringBuffer.append(TEXT_90);

+							stringBuffer.append(delegateFeature.getAccessorName());

+							stringBuffer.append(TEXT_99);

+							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+							stringBuffer.append(TEXT_27);

+							if (!isJDK50 && genFeature.isPrimitiveType()) {

+								stringBuffer.append(TEXT_22);

+								stringBuffer.append(genFeature.getPrimitiveValueFunction());

+								stringBuffer.append(TEXT_23);

+							}

+							stringBuffer.append(TEXT_24);

+						} else {

+							stringBuffer.append(TEXT_15);

+							if (!isJDK50 && genFeature.isPrimitiveType()) {

+								stringBuffer.append(TEXT_16);

+							}

+							if (genFeature.getTypeGenDataType() == null

+									|| !genFeature.getTypeGenDataType().isObjectType()) {

+								stringBuffer.append(TEXT_16);

+								stringBuffer.append(genFeature.getObjectType(genClass));

+								stringBuffer.append(TEXT_21);

+							}

+							stringBuffer.append(TEXT_100);

+							stringBuffer.append(delegateFeature.getAccessorName());

+							stringBuffer.append(TEXT_101);

+							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+							stringBuffer.append(TEXT_27);

+							if (!isJDK50 && genFeature.isPrimitiveType()) {

+								stringBuffer.append(TEXT_22);

+								stringBuffer.append(genFeature.getPrimitiveValueFunction());

+								stringBuffer.append(TEXT_23);

+							}

+							stringBuffer.append(TEXT_24);

 						}

 					}

 				} else if (genClass.getGetAccessorOperation(genFeature) != null) {

-					stringBuffer.append(TEXT_24);

+					stringBuffer.append(TEXT_25);

 					stringBuffer.append(genClass.getGetAccessorOperation(genFeature)

 							.getBody(genModel.getIndentation(stringBuffer)));

 				} else if (genFeature.hasGetterBody()) {

-					stringBuffer.append(TEXT_24);

+					stringBuffer.append(TEXT_25);

 					stringBuffer.append(genFeature.getGetterBody(genModel.getIndentation(stringBuffer)));

 				} else {

 					stringBuffer.append(TEXT_2);

 					{

-						//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+						//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 						InternalPatternContext ictx = (InternalPatternContext) ctx;

 						new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -914,6 +930,7 @@
 						callParameters.put("isJDK50", isJDK50);

 						callParameters.put("isInterface", isInterface);

 						callParameters.put("isImplementation", isImplementation);

+						callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 						callParameters.put("isGWT", isGWT);

 						callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 						callParameters.put("singleWildcard", singleWildcard);

@@ -930,7 +947,7 @@
 					//Class/getGenFeature.todo.override.javajetinc

 				}

 			}

-			stringBuffer.append(TEXT_101);

+			stringBuffer.append(TEXT_102);

 		}

 		stringBuffer.append(TEXT_2);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeaturepreinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeaturepreinsert.java
index e15ee2b..6643a3b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeaturepreinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassgetGenFeaturepreinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassimplementedGenOperationTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassimplementedGenOperationTODOoverride.java
index 82d5629..6015e18 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassimplementedGenOperationTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassimplementedGenOperationTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -62,6 +62,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -84,35 +86,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -151,6 +156,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -207,6 +213,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -258,6 +270,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/Classinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/Classinsert.java
index 26b8ebd..bec3898 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/Classinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/Classinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -58,6 +58,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -79,34 +81,37 @@
 					for (Object isJDK50Parameter : isJDK50List) {

 						for (Object isInterfaceParameter : isInterfaceList) {

 							for (Object isImplementationParameter : isImplementationList) {

-								for (Object isGWTParameter : isGWTList) {

-									for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-										for (Object singleWildcardParameter : singleWildcardList) {

-											for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-												for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-													for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-														for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+								for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+									for (Object isGWTParameter : isGWTList) {

+										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+											for (Object singleWildcardParameter : singleWildcardList) {

+												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-															this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-															this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-															this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-															this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-															this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-															this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-															this.isGWT = (java.lang.Boolean) isGWTParameter;

-															this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-															this.singleWildcard = (java.lang.String) singleWildcardParameter;

-															this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-															this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-															this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-															this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																this.isGWT = (java.lang.Boolean) isGWTParameter;

+																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-															if (preCondition(ctx)) {

-																ctx.setNode(

-																		new Node.Container(currentNode, getClass()));

-																orchestration(ctx);

+																if (preCondition(ctx)) {

+																	ctx.setNode(new Node.Container(currentNode,

+																			getClass()));

+																	orchestration(ctx);

+																}

+

 															}

-

 														}

 													}

 												}

@@ -143,6 +148,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -193,6 +199,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -243,6 +255,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/Classinterfacejavadocoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/Classinterfacejavadocoverride.java
index eeae953..8d04970 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/Classinterfacejavadocoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/Classinterfacejavadocoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -79,6 +79,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -100,34 +102,37 @@
 					for (Object isJDK50Parameter : isJDK50List) {

 						for (Object isInterfaceParameter : isInterfaceList) {

 							for (Object isImplementationParameter : isImplementationList) {

-								for (Object isGWTParameter : isGWTList) {

-									for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-										for (Object singleWildcardParameter : singleWildcardList) {

-											for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-												for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-													for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-														for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+								for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+									for (Object isGWTParameter : isGWTList) {

+										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+											for (Object singleWildcardParameter : singleWildcardList) {

+												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-															this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-															this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-															this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-															this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-															this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-															this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-															this.isGWT = (java.lang.Boolean) isGWTParameter;

-															this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-															this.singleWildcard = (java.lang.String) singleWildcardParameter;

-															this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-															this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-															this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-															this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																this.isGWT = (java.lang.Boolean) isGWTParameter;

+																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-															if (preCondition(ctx)) {

-																ctx.setNode(

-																		new Node.Container(currentNode, getClass()));

-																orchestration(ctx);

+																if (preCondition(ctx)) {

+																	ctx.setNode(new Node.Container(currentNode,

+																			getClass()));

+																	orchestration(ctx);

+																}

+

 															}

-

 														}

 													}

 												}

@@ -164,6 +169,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -214,6 +220,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -264,6 +276,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeatureTODOoverride.java
index 8c2ef27..dfaeab6 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -64,6 +64,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -86,35 +88,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -153,6 +158,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -209,6 +215,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -260,6 +272,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeatureannotationsinsert.java
index 1500f03..e006ca1 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeaturejavadocinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeaturejavadocinsert.java
index edf813a..88232eb 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeaturejavadocinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeaturejavadocinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeaturejavadocoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeaturejavadocoverride.java
index bd4c0b3..f803b93 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeaturejavadocoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeaturejavadocoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -76,6 +76,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -98,35 +100,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -165,6 +170,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -221,6 +227,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -272,6 +284,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -295,7 +308,7 @@
 		stringBuffer.append(TEXT_5);

 		stringBuffer.append(TEXT_6);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -309,6 +322,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeatureoverride.java
index 633d1b3..f32ab97 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassisSetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -36,37 +36,38 @@
 	protected final String TEXT_6 = NL + "\t@Deprecated";

 	protected final String TEXT_7 = NL + "\tboolean isSet";

 	protected final String TEXT_8 = "();" + NL;

-	protected final String TEXT_9 = NL + "\tpublic boolean isSet";

-	protected final String TEXT_10 = "_";

-	protected final String TEXT_11 = "()" + NL + "\t{";

-	protected final String TEXT_12 = NL + "\t\treturn eDynamicIsSet(";

-	protected final String TEXT_13 = " - ESTATIC_FEATURE_COUNT";

-	protected final String TEXT_14 = ", ";

-	protected final String TEXT_15 = ");";

-	protected final String TEXT_16 = NL + "\t\treturn eIsSet(";

-	protected final String TEXT_17 = NL + "\t\treturn ";

-	protected final String TEXT_18 = "__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);";

-	protected final String TEXT_19 = NL + "\t\t";

-	protected final String TEXT_20 = " ";

-	protected final String TEXT_21 = " = (";

-	protected final String TEXT_22 = ")eVirtualGet(";

-	protected final String TEXT_23 = " != null && ((";

-	protected final String TEXT_24 = ".Unsettable";

-	protected final String TEXT_25 = ")";

-	protected final String TEXT_26 = ").isSet();";

-	protected final String TEXT_27 = NL + "\t\treturn eVirtualIsSet(";

-	protected final String TEXT_28 = NL + "\t\treturn (";

-	protected final String TEXT_29 = " & ";

-	protected final String TEXT_30 = "_ESETFLAG) != 0;";

-	protected final String TEXT_31 = "ESet;";

-	protected final String TEXT_32 = NL + "\t\treturn !((";

-	protected final String TEXT_33 = ".Internal)((";

-	protected final String TEXT_34 = ".Internal.Wrapper)get";

-	protected final String TEXT_35 = "()).featureMap()).isEmpty(";

-	protected final String TEXT_36 = ".Internal)get";

-	protected final String TEXT_37 = "()).isEmpty(";

-	protected final String TEXT_38 = NL + "\t}" + NL;

-	protected final String TEXT_39 = NL;

+	protected final String TEXT_9 = NL + "\t@Override";

+	protected final String TEXT_10 = NL + "\tpublic boolean isSet";

+	protected final String TEXT_11 = "_";

+	protected final String TEXT_12 = "()" + NL + "\t{";

+	protected final String TEXT_13 = NL + "\t\treturn eDynamicIsSet(";

+	protected final String TEXT_14 = " - ESTATIC_FEATURE_COUNT";

+	protected final String TEXT_15 = ", ";

+	protected final String TEXT_16 = ");";

+	protected final String TEXT_17 = NL + "\t\treturn eIsSet(";

+	protected final String TEXT_18 = NL + "\t\treturn ";

+	protected final String TEXT_19 = "__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);";

+	protected final String TEXT_20 = NL + "\t\t";

+	protected final String TEXT_21 = " ";

+	protected final String TEXT_22 = " = (";

+	protected final String TEXT_23 = ")eVirtualGet(";

+	protected final String TEXT_24 = " != null && ((";

+	protected final String TEXT_25 = ".Unsettable";

+	protected final String TEXT_26 = ")";

+	protected final String TEXT_27 = ").isSet();";

+	protected final String TEXT_28 = NL + "\t\treturn eVirtualIsSet(";

+	protected final String TEXT_29 = NL + "\t\treturn (";

+	protected final String TEXT_30 = " & ";

+	protected final String TEXT_31 = "_ESETFLAG) != 0;";

+	protected final String TEXT_32 = "ESet;";

+	protected final String TEXT_33 = NL + "\t\treturn !((";

+	protected final String TEXT_34 = ".Internal)((";

+	protected final String TEXT_35 = ".Internal.Wrapper)get";

+	protected final String TEXT_36 = "()).featureMap()).isEmpty(";

+	protected final String TEXT_37 = ".Internal)get";

+	protected final String TEXT_38 = "()).isEmpty(";

+	protected final String TEXT_39 = NL + "\t}" + NL;

+	protected final String TEXT_40 = NL;

 

 	public ClassisSetGenFeatureoverride() {

 		//Here is the constructor

@@ -98,6 +99,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -120,35 +123,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -168,8 +174,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_39);

-		stringBuffer.append(TEXT_39);

+		stringBuffer.append(TEXT_40);

+		stringBuffer.append(TEXT_40);

 		return stringBuffer.toString();

 	}

 

@@ -187,6 +193,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -243,6 +250,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -294,6 +307,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -310,7 +324,7 @@
 		if (isInterface) {

 			stringBuffer.append(TEXT_2);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -324,6 +338,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -348,7 +363,7 @@
 			if (isJDK50) { //Class/isSetGenFeature.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -362,6 +377,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -385,99 +401,104 @@
 			stringBuffer.append(genFeature.getAccessorName());

 			stringBuffer.append(TEXT_8);

 		} else {

-			stringBuffer.append(TEXT_9);

+			if (useInterfaceOverrideAnnotation && !genClass.isMapEntry()

+					&& !genClass.hasCollidingIsSetAccessorOperation(genFeature)

+					&& !genFeature.isSuppressedIsSetVisibility()) {

+				stringBuffer.append(TEXT_9);

+			}

+			stringBuffer.append(TEXT_10);

 			stringBuffer.append(genFeature.getAccessorName());

 			if (genClass.hasCollidingIsSetAccessorOperation(genFeature)) {

-				stringBuffer.append(TEXT_10);

+				stringBuffer.append(TEXT_11);

 			}

-			stringBuffer.append(TEXT_11);

+			stringBuffer.append(TEXT_12);

 			if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {

-				stringBuffer.append(TEXT_12);

+				stringBuffer.append(TEXT_13);

 				stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 				if (genClass.hasStaticFeatures()) {

-					stringBuffer.append(TEXT_13);

+					stringBuffer.append(TEXT_14);

 				}

-				stringBuffer.append(TEXT_14);

-				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

 				stringBuffer.append(TEXT_15);

-			} else if (genModel.isReflectiveDelegation()) {

+				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

 				stringBuffer.append(TEXT_16);

-				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-				stringBuffer.append(TEXT_15);

-			} else if (genFeature.hasSettingDelegate()) {

+			} else if (genModel.isReflectiveDelegation()) {

 				stringBuffer.append(TEXT_17);

-				stringBuffer.append(genFeature.getUpperName());

+				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+				stringBuffer.append(TEXT_16);

+			} else if (genFeature.hasSettingDelegate()) {

 				stringBuffer.append(TEXT_18);

+				stringBuffer.append(genFeature.getUpperName());

+				stringBuffer.append(TEXT_19);

 			} else if (!genFeature.isVolatile()) {

 				if (genFeature.isListType()) {

 					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_19);

-						stringBuffer.append(genFeature.getImportedType(genClass));

 						stringBuffer.append(TEXT_20);

-						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_21);

 						stringBuffer.append(genFeature.getImportedType(genClass));

+						stringBuffer.append(TEXT_21);

+						stringBuffer.append(genFeature.getSafeName());

 						stringBuffer.append(TEXT_22);

+						stringBuffer.append(genFeature.getImportedType(genClass));

+						stringBuffer.append(TEXT_23);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_15);

+						stringBuffer.append(TEXT_16);

 					}

-					stringBuffer.append(TEXT_17);

+					stringBuffer.append(TEXT_18);

 					stringBuffer.append(genFeature.getSafeName());

-					stringBuffer.append(TEXT_23);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));

 					stringBuffer.append(TEXT_24);

-					stringBuffer.append(singleWildcard);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));

 					stringBuffer.append(TEXT_25);

-					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(singleWildcard);

 					stringBuffer.append(TEXT_26);

+					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(TEXT_27);

 				} else {

 					if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_27);

+						stringBuffer.append(TEXT_28);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_15);

+						stringBuffer.append(TEXT_16);

 					} else if (genClass.isESetFlag(genFeature)) {

-						stringBuffer.append(TEXT_28);

-						stringBuffer.append(genClass.getESetFlagsField(genFeature));

 						stringBuffer.append(TEXT_29);

-						stringBuffer.append(genFeature.getUpperName());

+						stringBuffer.append(genClass.getESetFlagsField(genFeature));

 						stringBuffer.append(TEXT_30);

-					} else {

-						stringBuffer.append(TEXT_17);

-						stringBuffer.append(genFeature.getUncapName());

+						stringBuffer.append(genFeature.getUpperName());

 						stringBuffer.append(TEXT_31);

+					} else {

+						stringBuffer.append(TEXT_18);

+						stringBuffer.append(genFeature.getUncapName());

+						stringBuffer.append(TEXT_32);

 					}

 				}

 			} else if (genFeature.hasDelegateFeature()) {

 				GenFeature delegateFeature = genFeature.getDelegateFeature();

 				if (delegateFeature.isWrappedFeatureMapType()) {

-					stringBuffer.append(TEXT_32);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

 					stringBuffer.append(TEXT_33);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

 					stringBuffer.append(TEXT_34);

-					stringBuffer.append(delegateFeature.getAccessorName());

-					stringBuffer.append(TEXT_35);

-					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-					stringBuffer.append(TEXT_15);

-				} else {

-					stringBuffer.append(TEXT_32);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

-					stringBuffer.append(TEXT_36);

+					stringBuffer.append(TEXT_35);

 					stringBuffer.append(delegateFeature.getAccessorName());

-					stringBuffer.append(TEXT_37);

+					stringBuffer.append(TEXT_36);

 					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-					stringBuffer.append(TEXT_15);

+					stringBuffer.append(TEXT_16);

+				} else {

+					stringBuffer.append(TEXT_33);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

+					stringBuffer.append(TEXT_37);

+					stringBuffer.append(delegateFeature.getAccessorName());

+					stringBuffer.append(TEXT_38);

+					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+					stringBuffer.append(TEXT_16);

 				}

 			} else if (genClass.getIsSetAccessorOperation(genFeature) != null) {

-				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_20);

 				stringBuffer.append(

 						genClass.getIsSetAccessorOperation(genFeature).getBody(genModel.getIndentation(stringBuffer)));

 			} else {

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -491,6 +512,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -506,7 +528,7 @@
 

 				//Class/isSetGenFeature.todo.override.javajetinc

 			}

-			stringBuffer.append(TEXT_38);

+			stringBuffer.append(TEXT_39);

 		}

 		stringBuffer.append(TEXT_2);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassreflectiveDelegationoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassreflectiveDelegationoverride.java
index ee217aa..e56798d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassreflectiveDelegationoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassreflectiveDelegationoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -68,6 +68,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -89,34 +91,37 @@
 					for (Object isJDK50Parameter : isJDK50List) {

 						for (Object isInterfaceParameter : isInterfaceList) {

 							for (Object isImplementationParameter : isImplementationList) {

-								for (Object isGWTParameter : isGWTList) {

-									for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-										for (Object singleWildcardParameter : singleWildcardList) {

-											for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-												for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-													for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-														for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+								for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+									for (Object isGWTParameter : isGWTList) {

+										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+											for (Object singleWildcardParameter : singleWildcardList) {

+												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-															this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-															this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-															this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-															this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-															this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-															this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-															this.isGWT = (java.lang.Boolean) isGWTParameter;

-															this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-															this.singleWildcard = (java.lang.String) singleWildcardParameter;

-															this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-															this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-															this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-															this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																this.isGWT = (java.lang.Boolean) isGWTParameter;

+																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-															if (preCondition(ctx)) {

-																ctx.setNode(

-																		new Node.Container(currentNode, getClass()));

-																orchestration(ctx);

+																if (preCondition(ctx)) {

+																	ctx.setNode(new Node.Container(currentNode,

+																			getClass()));

+																	orchestration(ctx);

+																}

+

 															}

-

 														}

 													}

 												}

@@ -153,6 +158,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -203,6 +209,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -253,6 +265,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeatureTODOoverride.java
index 4a605eb..6c7ee58 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -65,6 +65,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -88,36 +90,39 @@
 							for (Object isJDK50Parameter : isJDK50List) {

 								for (Object isInterfaceParameter : isInterfaceList) {

 									for (Object isImplementationParameter : isImplementationList) {

-										for (Object isGWTParameter : isGWTList) {

-											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-												for (Object singleWildcardParameter : singleWildcardList) {

-													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+										for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+											for (Object isGWTParameter : isGWTList) {

+												for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+													for (Object singleWildcardParameter : singleWildcardList) {

+														for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+															for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+																for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																	for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																	this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

-																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																	this.isGWT = (java.lang.Boolean) isGWTParameter;

-																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																		this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

+																		this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																		this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																		this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																		this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																		this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																		this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																		this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																		this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																		this.isGWT = (java.lang.Boolean) isGWTParameter;

+																		this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																		this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																		this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																		this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																		this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																		this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																	if (preCondition(ctx)) {

-																		ctx.setNode(new Node.Container(currentNode,

-																				getClass()));

-																		orchestration(ctx);

+																		if (preCondition(ctx)) {

+																			ctx.setNode(new Node.Container(currentNode,

+																					getClass()));

+																			orchestration(ctx);

+																		}

+

 																	}

-

 																}

 															}

 														}

@@ -158,6 +163,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -220,6 +226,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -272,6 +284,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeatureannotationsinsert.java
index fcbcbc2..73eb90e 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturejavadocinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturejavadocinsert.java
index 348623e..24cf343 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturejavadocinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturejavadocinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturejavadocoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturejavadocoverride.java
index 3036217..af6b88b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturejavadocoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturejavadocoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -75,6 +75,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -97,35 +99,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -164,6 +169,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -220,6 +226,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -271,6 +283,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -294,7 +307,7 @@
 		stringBuffer.append(TEXT_5);

 		stringBuffer.append(TEXT_6);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -308,6 +321,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeatureoverride.java
index a9e0d4a..c02d988 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -37,33 +37,33 @@
 	protected final String TEXT_7 = NL + "\tvoid set";

 	protected final String TEXT_8 = "(";

 	protected final String TEXT_9 = " value);" + NL;

-	protected final String TEXT_10 = NL + "\tpublic void set";

-	protected final String TEXT_11 = "_";

-	protected final String TEXT_12 = " ";

-	protected final String TEXT_13 = ")" + NL + "\t{";

-	protected final String TEXT_14 = NL + "\t\teDynamicSet(";

-	protected final String TEXT_15 = " - ESTATIC_FEATURE_COUNT";

-	protected final String TEXT_16 = ", ";

-	protected final String TEXT_17 = "new ";

-	protected final String TEXT_18 = "new";

-	protected final String TEXT_19 = ")";

-	protected final String TEXT_20 = ");";

-	protected final String TEXT_21 = NL + "\t\teSet(";

-	protected final String TEXT_22 = NL + "\t\t";

-	protected final String TEXT_23 = "__ESETTING_DELEGATE.dynamicSet(this, null, 0, ";

-	protected final String TEXT_24 = NL + "\t\tif (new";

-	protected final String TEXT_25 = " != eInternalContainer() || (eContainerFeatureID() != ";

-	protected final String TEXT_26 = " && new";

-	protected final String TEXT_27 = " != null))" + NL + "\t\t{" + NL + "\t\t\tif (";

-	protected final String TEXT_28 = ".isAncestor(this, ";

-	protected final String TEXT_29 = "))" + NL + "\t\t\t\tthrow new ";

-	protected final String TEXT_30 = "(\"Recursive containment not allowed for \" + toString());";

-	protected final String TEXT_31 = NL + "\t\t\t";

-	protected final String TEXT_32 = " msgs = null;" + NL + "\t\t\tif (eInternalContainer() != null)" + NL

+	protected final String TEXT_10 = NL + "\t@Override";

+	protected final String TEXT_11 = NL + "\tpublic void set";

+	protected final String TEXT_12 = "_";

+	protected final String TEXT_13 = " ";

+	protected final String TEXT_14 = ")" + NL + "\t{";

+	protected final String TEXT_15 = NL + "\t\teDynamicSet(";

+	protected final String TEXT_16 = " - ESTATIC_FEATURE_COUNT";

+	protected final String TEXT_17 = ", ";

+	protected final String TEXT_18 = "new ";

+	protected final String TEXT_19 = "new";

+	protected final String TEXT_20 = ")";

+	protected final String TEXT_21 = ");";

+	protected final String TEXT_22 = NL + "\t\teSet(";

+	protected final String TEXT_23 = NL + "\t\t";

+	protected final String TEXT_24 = "__ESETTING_DELEGATE.dynamicSet(this, null, 0, ";

+	protected final String TEXT_25 = NL + "\t\tif (new";

+	protected final String TEXT_26 = " != eInternalContainer() || (eContainerFeatureID() != ";

+	protected final String TEXT_27 = " && new";

+	protected final String TEXT_28 = " != null))" + NL + "\t\t{" + NL + "\t\t\tif (";

+	protected final String TEXT_29 = ".isAncestor(this, ";

+	protected final String TEXT_30 = "))" + NL + "\t\t\t\tthrow new ";

+	protected final String TEXT_31 = "(\"Recursive containment not allowed for \" + toString());";

+	protected final String TEXT_32 = NL + "\t\t\t";

+	protected final String TEXT_33 = " msgs = null;" + NL + "\t\t\tif (eInternalContainer() != null)" + NL

 			+ "\t\t\t\tmsgs = eBasicRemoveFromContainer(msgs);" + NL + "\t\t\tif (new";

-	protected final String TEXT_33 = " != null)" + NL + "\t\t\t\tmsgs = ((";

-	protected final String TEXT_34 = ")new";

-	protected final String TEXT_35 = ").eInverseAdd(this, ";

+	protected final String TEXT_34 = " != null)" + NL + "\t\t\t\tmsgs = ";

+	protected final String TEXT_35 = ".eInverseAdd(this, ";

 	protected final String TEXT_36 = ".class, msgs);" + NL + "\t\t\tmsgs = basicSet";

 	protected final String TEXT_37 = ", msgs);" + NL + "\t\t\tif (msgs != null) msgs.dispatch();" + NL + "\t\t}";

 	protected final String TEXT_38 = NL + "\t\telse if (eNotificationRequired())" + NL + "\t\t\teNotify(new ";

@@ -77,12 +77,12 @@
 	protected final String TEXT_46 = ")" + NL + "\t\t{" + NL + "\t\t\t";

 	protected final String TEXT_47 = " msgs = null;" + NL + "\t\t\tif (";

 	protected final String TEXT_48 = " != null)";

-	protected final String TEXT_49 = NL + "\t\t\t\tmsgs = ((";

-	protected final String TEXT_50 = ").eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

+	protected final String TEXT_49 = NL + "\t\t\t\tmsgs = ";

+	protected final String TEXT_50 = ".eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

 	protected final String TEXT_51 = ", null, msgs);" + NL + "\t\t\tif (new";

-	protected final String TEXT_52 = ").eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ";

+	protected final String TEXT_52 = ".eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ";

 	protected final String TEXT_53 = ", null, msgs);";

-	protected final String TEXT_54 = ").eInverseRemove(this, ";

+	protected final String TEXT_54 = ".eInverseRemove(this, ";

 	protected final String TEXT_55 = ".class, msgs);" + NL + "\t\t\tif (new";

 	protected final String TEXT_56 = ".class, msgs);";

 	protected final String TEXT_57 = NL + "\t\t\tmsgs = basicSet";

@@ -175,6 +175,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -197,35 +199,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -264,6 +269,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -320,6 +326,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -371,6 +383,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -387,7 +400,7 @@
 		if (isInterface) {

 			stringBuffer.append(TEXT_2);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -401,6 +414,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -425,7 +439,7 @@
 			if (isJDK50) { //Class/setGenFeature.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -439,6 +453,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -465,20 +480,25 @@
 			stringBuffer.append(TEXT_9);

 		} else {

 			GenOperation setAccessorOperation = genClass.getSetAccessorOperation(genFeature);

-			stringBuffer.append(TEXT_10);

+			if (useInterfaceOverrideAnnotation && !genClass.isMapEntry()

+					&& !genClass.hasCollidingSetAccessorOperation(genFeature)

+					&& !genFeature.isSuppressedSetVisibility()) {

+				stringBuffer.append(TEXT_10);

+			}

+			stringBuffer.append(TEXT_11);

 			stringBuffer.append(genFeature.getAccessorName());

 			if (genClass.hasCollidingSetAccessorOperation(genFeature)) {

-				stringBuffer.append(TEXT_11);

+				stringBuffer.append(TEXT_12);

 			}

 			stringBuffer.append(TEXT_8);

 			stringBuffer.append(genFeature.getImportedType(genClass));

-			stringBuffer.append(TEXT_12);

+			stringBuffer.append(TEXT_13);

 			stringBuffer.append(setAccessorOperation == null ? "new" + genFeature.getCapName()

 					: setAccessorOperation.getGenParameters().get(0).getName());

-			stringBuffer.append(TEXT_13);

+			stringBuffer.append(TEXT_14);

 			stringBuffer.append(TEXT_2);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.pre.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.pre.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -493,6 +513,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -507,55 +528,117 @@
 			}

 

 			if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {

-				stringBuffer.append(TEXT_14);

+				stringBuffer.append(TEXT_2);

+				{

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.dynamicSetGenFeature.pre.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+

+					InternalPatternContext ictx = (InternalPatternContext) ctx;

+					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

+					stringBuffer.setLength(0);

+

+					final Map<String, Object> callParameters = new HashMap<String, Object>();

+					callParameters.put("setAccessorOperation", setAccessorOperation);

+					callParameters.put("genFeature", genFeature);

+					callParameters.put("genClass", genClass);

+					callParameters.put("genPackage", genPackage);

+					callParameters.put("genModel", genModel);

+					callParameters.put("isJDK50", isJDK50);

+					callParameters.put("isInterface", isInterface);

+					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

+					callParameters.put("isGWT", isGWT);

+					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

+					callParameters.put("singleWildcard", singleWildcard);

+					callParameters.put("negativeOffsetCorrection", negativeOffsetCorrection);

+					callParameters.put("positiveOffsetCorrection", positiveOffsetCorrection);

+					callParameters.put("negativeOperationOffsetCorrection", negativeOperationOffsetCorrection);

+					callParameters.put("positiveOperationOffsetCorrection", positiveOperationOffsetCorrection);

+					CallHelper.executeWithParameterInjection(

+							"platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#_Y__lwCSWEemxeP6B0lLOpA",

+							new ExecutionContext((InternalPatternContext) ctx), callParameters);

+					stringBuffer.setLength(0);

+				}

+

+				stringBuffer.append(TEXT_15);

 				stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 				if (genClass.hasStaticFeatures()) {

-					stringBuffer.append(TEXT_15);

+					stringBuffer.append(TEXT_16);

 				}

-				stringBuffer.append(TEXT_16);

+				stringBuffer.append(TEXT_17);

 				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-				stringBuffer.append(TEXT_16);

+				stringBuffer.append(TEXT_17);

 				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_17);

+					stringBuffer.append(TEXT_18);

 					stringBuffer.append(genFeature.getObjectType(genClass));

 					stringBuffer.append(TEXT_8);

 				}

-				stringBuffer.append(TEXT_18);

+				stringBuffer.append(TEXT_19);

 				stringBuffer.append(genFeature.getCapName());

 				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_19);

+					stringBuffer.append(TEXT_20);

 				}

-				stringBuffer.append(TEXT_20);

-			} else if (genModel.isReflectiveDelegation()) {

 				stringBuffer.append(TEXT_21);

-				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-				stringBuffer.append(TEXT_16);

-				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_17);

-					stringBuffer.append(genFeature.getObjectType(genClass));

-					stringBuffer.append(TEXT_8);

+				stringBuffer.append(TEXT_2);

+				{

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.dynamicSetGenFeature.post.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+

+					InternalPatternContext ictx = (InternalPatternContext) ctx;

+					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

+					stringBuffer.setLength(0);

+

+					final Map<String, Object> callParameters = new HashMap<String, Object>();

+					callParameters.put("setAccessorOperation", setAccessorOperation);

+					callParameters.put("genFeature", genFeature);

+					callParameters.put("genClass", genClass);

+					callParameters.put("genPackage", genPackage);

+					callParameters.put("genModel", genModel);

+					callParameters.put("isJDK50", isJDK50);

+					callParameters.put("isInterface", isInterface);

+					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

+					callParameters.put("isGWT", isGWT);

+					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

+					callParameters.put("singleWildcard", singleWildcard);

+					callParameters.put("negativeOffsetCorrection", negativeOffsetCorrection);

+					callParameters.put("positiveOffsetCorrection", positiveOffsetCorrection);

+					callParameters.put("negativeOperationOffsetCorrection", negativeOperationOffsetCorrection);

+					callParameters.put("positiveOperationOffsetCorrection", positiveOperationOffsetCorrection);

+					CallHelper.executeWithParameterInjection(

+							"platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#_ZGGNwCSWEemxeP6B0lLOpA",

+							new ExecutionContext((InternalPatternContext) ctx), callParameters);

+					stringBuffer.setLength(0);

 				}

-				stringBuffer.append(TEXT_18);

-				stringBuffer.append(genFeature.getCapName());

-				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_19);

-				}

-				stringBuffer.append(TEXT_20);

-			} else if (genFeature.hasSettingDelegate()) {

+

+			} else if (genModel.isReflectiveDelegation()) {

 				stringBuffer.append(TEXT_22);

-				stringBuffer.append(genFeature.getUpperName());

-				stringBuffer.append(TEXT_23);

+				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+				stringBuffer.append(TEXT_17);

 				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_17);

+					stringBuffer.append(TEXT_18);

 					stringBuffer.append(genFeature.getObjectType(genClass));

 					stringBuffer.append(TEXT_8);

 				}

-				stringBuffer.append(TEXT_18);

+				stringBuffer.append(TEXT_19);

 				stringBuffer.append(genFeature.getCapName());

 				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_19);

+					stringBuffer.append(TEXT_20);

 				}

-				stringBuffer.append(TEXT_20);

+				stringBuffer.append(TEXT_21);

+			} else if (genFeature.hasSettingDelegate()) {

+				stringBuffer.append(TEXT_23);

+				stringBuffer.append(genFeature.getUpperName());

+				stringBuffer.append(TEXT_24);

+				if (!isJDK50 && genFeature.isPrimitiveType()) {

+					stringBuffer.append(TEXT_18);

+					stringBuffer.append(genFeature.getObjectType(genClass));

+					stringBuffer.append(TEXT_8);

+				}

+				stringBuffer.append(TEXT_19);

+				stringBuffer.append(genFeature.getCapName());

+				if (!isJDK50 && genFeature.isPrimitiveType()) {

+					stringBuffer.append(TEXT_20);

+				}

+				stringBuffer.append(TEXT_21);

 			} else if (!genFeature.isVolatile()) {

 				if (genFeature.isContainer()) {

 					GenFeature reverseFeature = genFeature.getReverse();

@@ -563,41 +646,39 @@
 					String reverseOffsetCorrection = targetClass.hasOffsetCorrection()

 							? " + " + genClass.getOffsetCorrectionField(genFeature)

 							: "";

-					stringBuffer.append(TEXT_24);

-					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_25);

+					stringBuffer.append(genFeature.getCapName());

+					stringBuffer.append(TEXT_26);

 					stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 					stringBuffer.append(positiveOffsetCorrection);

-					stringBuffer.append(TEXT_26);

-					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_27);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.EcoreUtil"));

+					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_28);

-					stringBuffer.append(genFeature.getEObjectCast());

-					stringBuffer.append(TEXT_18);

-					stringBuffer.append(genFeature.getCapName());

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.EcoreUtil"));

 					stringBuffer.append(TEXT_29);

-					stringBuffer.append(genModel.getImportedName("java.lang.IllegalArgumentException"));

+					stringBuffer.append(genFeature.getEObjectCast());

+					stringBuffer.append(TEXT_19);

+					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_30);

-					stringBuffer.append(genModel.getNonNLS());

+					stringBuffer.append(genModel.getImportedName("java.lang.IllegalArgumentException"));

 					stringBuffer.append(TEXT_31);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

+					stringBuffer.append(genModel.getNonNLS());

 					stringBuffer.append(TEXT_32);

-					stringBuffer.append(genFeature.getCapName());

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

 					stringBuffer.append(TEXT_33);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-					stringBuffer.append(TEXT_34);

 					stringBuffer.append(genFeature.getCapName());

+					stringBuffer.append(TEXT_34);

+					stringBuffer.append(genFeature.getAsInternalEObject("new" + genFeature.getCapName(), true));

 					stringBuffer.append(TEXT_35);

 					stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

 					stringBuffer.append(reverseOffsetCorrection);

-					stringBuffer.append(TEXT_16);

+					stringBuffer.append(TEXT_17);

 					stringBuffer.append(targetClass.getRawImportedInterfaceName());

 					stringBuffer.append(TEXT_36);

 					stringBuffer.append(genFeature.getAccessorName());

 					stringBuffer.append(TEXT_8);

 					stringBuffer.append(genFeature.getInternalTypeCast());

-					stringBuffer.append(TEXT_18);

+					stringBuffer.append(TEXT_19);

 					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_37);

 					if (!genModel.isSuppressNotification()) {

@@ -616,18 +697,18 @@
 					}

 				} else if (genFeature.isBidirectional() || genFeature.isEffectiveContains()) {

 					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_22);

+						stringBuffer.append(TEXT_23);

 						stringBuffer.append(genFeature.getImportedType(genClass));

-						stringBuffer.append(TEXT_12);

+						stringBuffer.append(TEXT_13);

 						stringBuffer.append(genFeature.getSafeName());

 						stringBuffer.append(TEXT_43);

 						stringBuffer.append(genFeature.getImportedType(genClass));

 						stringBuffer.append(TEXT_44);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_20);

+						stringBuffer.append(TEXT_21);

 					}

-					stringBuffer.append(TEXT_24);

+					stringBuffer.append(TEXT_25);

 					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_45);

 					stringBuffer.append(genFeature.getSafeName());

@@ -638,18 +719,14 @@
 					stringBuffer.append(TEXT_48);

 					if (!genFeature.isBidirectional()) {

 						stringBuffer.append(TEXT_49);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-						stringBuffer.append(TEXT_19);

-						stringBuffer.append(genFeature.getSafeName());

+						stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), true));

 						stringBuffer.append(TEXT_50);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(negativeOffsetCorrection);

 						stringBuffer.append(TEXT_51);

 						stringBuffer.append(genFeature.getCapName());

-						stringBuffer.append(TEXT_33);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

 						stringBuffer.append(TEXT_34);

-						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(genFeature.getAsInternalEObject("new" + genFeature.getCapName(), true));

 						stringBuffer.append(TEXT_52);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(negativeOffsetCorrection);

@@ -661,24 +738,20 @@
 								? " + " + genClass.getOffsetCorrectionField(genFeature)

 								: "";

 						stringBuffer.append(TEXT_49);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-						stringBuffer.append(TEXT_19);

-						stringBuffer.append(genFeature.getSafeName());

+						stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), true));

 						stringBuffer.append(TEXT_54);

 						stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

 						stringBuffer.append(reverseOffsetCorrection);

-						stringBuffer.append(TEXT_16);

+						stringBuffer.append(TEXT_17);

 						stringBuffer.append(targetClass.getRawImportedInterfaceName());

 						stringBuffer.append(TEXT_55);

 						stringBuffer.append(genFeature.getCapName());

-						stringBuffer.append(TEXT_33);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

 						stringBuffer.append(TEXT_34);

-						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(genFeature.getAsInternalEObject("new" + genFeature.getCapName(), true));

 						stringBuffer.append(TEXT_35);

 						stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

 						stringBuffer.append(reverseOffsetCorrection);

-						stringBuffer.append(TEXT_16);

+						stringBuffer.append(TEXT_17);

 						stringBuffer.append(targetClass.getRawImportedInterfaceName());

 						stringBuffer.append(TEXT_56);

 					}

@@ -686,7 +759,7 @@
 					stringBuffer.append(genFeature.getAccessorName());

 					stringBuffer.append(TEXT_8);

 					stringBuffer.append(genFeature.getInternalTypeCast());

-					stringBuffer.append(TEXT_18);

+					stringBuffer.append(TEXT_19);

 					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_37);

 					if (genFeature.isUnsettable()) {

@@ -697,7 +770,7 @@
 							stringBuffer.append(TEXT_60);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_20);

+							stringBuffer.append(TEXT_21);

 						} else if (genClass.isESetFlag(genFeature)) {

 							if (!genModel.isSuppressNotification()) {

 								stringBuffer.append(TEXT_59);

@@ -708,7 +781,7 @@
 								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_63);

 							}

-							stringBuffer.append(TEXT_31);

+							stringBuffer.append(TEXT_32);

 							stringBuffer.append(genClass.getESetFlagsField(genFeature));

 							stringBuffer.append(TEXT_64);

 							stringBuffer.append(genFeature.getUpperName());

@@ -721,7 +794,7 @@
 								stringBuffer.append(genFeature.getUncapName());

 								stringBuffer.append(TEXT_67);

 							}

-							stringBuffer.append(TEXT_31);

+							stringBuffer.append(TEXT_32);

 							stringBuffer.append(genFeature.getUncapName());

 							stringBuffer.append(TEXT_68);

 						}

@@ -764,7 +837,7 @@
 					if (genClass.isFlag(genFeature)) {

 						if (!genModel.isSuppressNotification()) {

 							if (genFeature.isBooleanType()) {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getImportedType(genClass));

 								stringBuffer.append(TEXT_73);

 								stringBuffer.append(genFeature.getCapName());

@@ -774,7 +847,7 @@
 								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_74);

 							} else {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getImportedType(genClass));

 								stringBuffer.append(TEXT_73);

 								stringBuffer.append(genFeature.getCapName());

@@ -790,7 +863,7 @@
 							}

 						}

 						if (genFeature.isBooleanType()) {

-							stringBuffer.append(TEXT_24);

+							stringBuffer.append(TEXT_25);

 							stringBuffer.append(genFeature.getCapName());

 							stringBuffer.append(TEXT_79);

 							stringBuffer.append(genClass.getFlagsField(genFeature));

@@ -802,7 +875,7 @@
 							stringBuffer.append(genFeature.getUpperName());

 							stringBuffer.append(TEXT_82);

 						} else {

-							stringBuffer.append(TEXT_24);

+							stringBuffer.append(TEXT_25);

 							stringBuffer.append(genFeature.getCapName());

 							stringBuffer.append(TEXT_83);

 							stringBuffer.append(genFeature.getCapName());

@@ -816,14 +889,14 @@
 							stringBuffer.append(genFeature.getUpperName());

 							stringBuffer.append(TEXT_86);

 							if (isJDK50) {

-								stringBuffer.append(TEXT_18);

+								stringBuffer.append(TEXT_19);

 								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_87);

 							} else {

 								stringBuffer.append(genFeature.getImportedType(genClass));

 								stringBuffer.append(TEXT_88);

 								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_19);

+								stringBuffer.append(TEXT_20);

 							}

 							stringBuffer.append(TEXT_89);

 							stringBuffer.append(genFeature.getUpperName());

@@ -832,7 +905,7 @@
 					} else {

 						if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {

 							if (!genModel.isSuppressNotification()) {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getImportedType(genClass));

 								stringBuffer.append(TEXT_73);

 								stringBuffer.append(genFeature.getCapName());

@@ -843,9 +916,9 @@
 						}

 						if (genFeature.isEnumType()) {

 							if (genModel.isVirtualDelegation()) {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getImportedType(genClass));

-								stringBuffer.append(TEXT_12);

+								stringBuffer.append(TEXT_13);

 								stringBuffer.append(genFeature.getSafeName());

 								stringBuffer.append(TEXT_92);

 								stringBuffer.append(genFeature.getCapName());

@@ -855,7 +928,7 @@
 								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_91);

 							} else {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getSafeName());

 								stringBuffer.append(TEXT_92);

 								stringBuffer.append(genFeature.getCapName());

@@ -867,21 +940,21 @@
 							}

 						} else {

 							if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getImportedType(genClass));

-								stringBuffer.append(TEXT_12);

+								stringBuffer.append(TEXT_13);

 								stringBuffer.append(genFeature.getSafeName());

 								stringBuffer.append(TEXT_75);

 								stringBuffer.append(genFeature.getInternalTypeCast());

-								stringBuffer.append(TEXT_18);

+								stringBuffer.append(TEXT_19);

 								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_91);

 							} else {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getSafeName());

 								stringBuffer.append(TEXT_75);

 								stringBuffer.append(genFeature.getInternalTypeCast());

-								stringBuffer.append(TEXT_18);

+								stringBuffer.append(TEXT_19);

 								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_91);

 							}

@@ -892,9 +965,9 @@
 							stringBuffer.append(TEXT_96);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_16);

+							stringBuffer.append(TEXT_17);

 							stringBuffer.append(genFeature.getSafeName());

-							stringBuffer.append(TEXT_20);

+							stringBuffer.append(TEXT_21);

 						}

 					}

 					if (genFeature.isUnsettable()) {

@@ -912,7 +985,7 @@
 								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_63);

 							}

-							stringBuffer.append(TEXT_22);

+							stringBuffer.append(TEXT_23);

 							stringBuffer.append(genClass.getESetFlagsField(genFeature));

 							stringBuffer.append(TEXT_64);

 							stringBuffer.append(genFeature.getUpperName());

@@ -925,7 +998,7 @@
 								stringBuffer.append(genFeature.getUncapName());

 								stringBuffer.append(TEXT_67);

 							}

-							stringBuffer.append(TEXT_22);

+							stringBuffer.append(TEXT_23);

 							stringBuffer.append(genFeature.getUncapName());

 							stringBuffer.append(TEXT_68);

 						}

@@ -938,7 +1011,7 @@
 							stringBuffer.append(TEXT_40);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_16);

+							stringBuffer.append(TEXT_17);

 							if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

 								stringBuffer.append(TEXT_101);

 								stringBuffer.append(genFeature.getEDefault());

@@ -948,14 +1021,14 @@
 								stringBuffer.append(TEXT_103);

 								stringBuffer.append(genFeature.getCapName());

 							}

-							stringBuffer.append(TEXT_16);

+							stringBuffer.append(TEXT_17);

 							if (genClass.isFlag(genFeature)) {

-								stringBuffer.append(TEXT_18);

+								stringBuffer.append(TEXT_19);

 								stringBuffer.append(genFeature.getCapName());

 							} else {

 								stringBuffer.append(genFeature.getSafeName());

 							}

-							stringBuffer.append(TEXT_16);

+							stringBuffer.append(TEXT_17);

 							if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

 								stringBuffer.append(TEXT_104);

 							} else {

@@ -975,7 +1048,7 @@
 							stringBuffer.append(TEXT_40);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_16);

+							stringBuffer.append(TEXT_17);

 							if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

 								stringBuffer.append(TEXT_103);

 								stringBuffer.append(genFeature.getCapName());

@@ -987,9 +1060,9 @@
 								stringBuffer.append(TEXT_103);

 								stringBuffer.append(genFeature.getCapName());

 							}

-							stringBuffer.append(TEXT_16);

+							stringBuffer.append(TEXT_17);

 							if (genClass.isFlag(genFeature)) {

-								stringBuffer.append(TEXT_18);

+								stringBuffer.append(TEXT_19);

 								stringBuffer.append(genFeature.getCapName());

 							} else {

 								stringBuffer.append(genFeature.getSafeName());

@@ -1000,7 +1073,7 @@
 				}

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.post.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.post.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -1015,6 +1088,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -1039,18 +1113,18 @@
 					stringBuffer.append(delegateFeature.getAccessorName());

 					stringBuffer.append(TEXT_111);

 					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-					stringBuffer.append(TEXT_16);

+					stringBuffer.append(TEXT_17);

 					if (!isJDK50 && genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_17);

+						stringBuffer.append(TEXT_18);

 						stringBuffer.append(genFeature.getObjectType(genClass));

 						stringBuffer.append(TEXT_8);

 					}

-					stringBuffer.append(TEXT_18);

+					stringBuffer.append(TEXT_19);

 					stringBuffer.append(genFeature.getCapName());

 					if (!isJDK50 && genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_19);

+						stringBuffer.append(TEXT_20);

 					}

-					stringBuffer.append(TEXT_20);

+					stringBuffer.append(TEXT_21);

 				} else {

 					stringBuffer.append(TEXT_108);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

@@ -1058,26 +1132,26 @@
 					stringBuffer.append(delegateFeature.getAccessorName());

 					stringBuffer.append(TEXT_113);

 					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-					stringBuffer.append(TEXT_16);

+					stringBuffer.append(TEXT_17);

 					if (!isJDK50 && genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_17);

+						stringBuffer.append(TEXT_18);

 						stringBuffer.append(genFeature.getObjectType(genClass));

 						stringBuffer.append(TEXT_8);

 					}

-					stringBuffer.append(TEXT_18);

+					stringBuffer.append(TEXT_19);

 					stringBuffer.append(genFeature.getCapName());

 					if (!isJDK50 && genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_19);

+						stringBuffer.append(TEXT_20);

 					}

-					stringBuffer.append(TEXT_20);

+					stringBuffer.append(TEXT_21);

 				}

 			} else if (setAccessorOperation != null) {

-				stringBuffer.append(TEXT_22);

+				stringBuffer.append(TEXT_23);

 				stringBuffer.append(setAccessorOperation.getBody(genModel.getIndentation(stringBuffer)));

 			} else {

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.TODO.override" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.TODO.override" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -1092,6 +1166,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturepostinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturepostinsert.java
index e4e1d5a..4154b9d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturepostinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturepostinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -62,6 +62,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -85,36 +87,39 @@
 							for (Object isJDK50Parameter : isJDK50List) {

 								for (Object isInterfaceParameter : isInterfaceList) {

 									for (Object isImplementationParameter : isImplementationList) {

-										for (Object isGWTParameter : isGWTList) {

-											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-												for (Object singleWildcardParameter : singleWildcardList) {

-													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+										for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+											for (Object isGWTParameter : isGWTList) {

+												for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+													for (Object singleWildcardParameter : singleWildcardList) {

+														for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+															for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+																for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																	for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																	this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

-																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																	this.isGWT = (java.lang.Boolean) isGWTParameter;

-																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																		this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

+																		this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																		this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																		this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																		this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																		this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																		this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																		this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																		this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																		this.isGWT = (java.lang.Boolean) isGWTParameter;

+																		this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																		this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																		this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																		this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																		this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																		this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																	if (preCondition(ctx)) {

-																		ctx.setNode(new Node.Container(currentNode,

-																				getClass()));

-																		orchestration(ctx);

+																		if (preCondition(ctx)) {

+																			ctx.setNode(new Node.Container(currentNode,

+																					getClass()));

+																			orchestration(ctx);

+																		}

+

 																	}

-

 																}

 															}

 														}

@@ -155,6 +160,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -217,6 +223,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -269,6 +281,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturepreinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturepreinsert.java
index 53873cf..beead13 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturepreinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClasssetGenFeaturepreinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -62,6 +62,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -85,36 +87,39 @@
 							for (Object isJDK50Parameter : isJDK50List) {

 								for (Object isInterfaceParameter : isInterfaceList) {

 									for (Object isImplementationParameter : isImplementationList) {

-										for (Object isGWTParameter : isGWTList) {

-											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-												for (Object singleWildcardParameter : singleWildcardList) {

-													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+										for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+											for (Object isGWTParameter : isGWTList) {

+												for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+													for (Object singleWildcardParameter : singleWildcardList) {

+														for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+															for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+																for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																	for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																	this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

-																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																	this.isGWT = (java.lang.Boolean) isGWTParameter;

-																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																		this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

+																		this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																		this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																		this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																		this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																		this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																		this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																		this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																		this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																		this.isGWT = (java.lang.Boolean) isGWTParameter;

+																		this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																		this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																		this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																		this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																		this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																		this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																	if (preCondition(ctx)) {

-																		ctx.setNode(new Node.Container(currentNode,

-																				getClass()));

-																		orchestration(ctx);

+																		if (preCondition(ctx)) {

+																			ctx.setNode(new Node.Container(currentNode,

+																					getClass()));

+																			orchestration(ctx);

+																		}

+

 																	}

-

 																}

 															}

 														}

@@ -155,6 +160,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -217,6 +223,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -269,6 +281,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeatureTODOoverride.java
index 88a479d..0241f41 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -63,6 +63,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -85,35 +87,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -152,6 +157,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -208,6 +214,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -259,6 +271,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeatureannotationsinsert.java
index 6f827d5..5bccd55 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeaturejavadocinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeaturejavadocinsert.java
index 9a5dcdd..2fe0277 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeaturejavadocinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeaturejavadocinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeaturejavadocoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeaturejavadocoverride.java
index e907039..32cf6b9 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeaturejavadocoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeaturejavadocoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -74,6 +74,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -96,35 +98,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -163,6 +168,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -219,6 +225,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -270,6 +282,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -293,7 +306,7 @@
 		stringBuffer.append(TEXT_5);

 		stringBuffer.append(TEXT_6);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -307,6 +320,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeatureoverride.java
index 1dfd17f..88a87ca 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Class/ClassunsetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Class;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -36,88 +36,89 @@
 	protected final String TEXT_6 = NL + "\t@Deprecated";

 	protected final String TEXT_7 = NL + "\tvoid unset";

 	protected final String TEXT_8 = "();" + NL;

-	protected final String TEXT_9 = NL + "\tpublic void unset";

-	protected final String TEXT_10 = "_";

-	protected final String TEXT_11 = "()" + NL + "\t{";

-	protected final String TEXT_12 = NL + "\t\teDynamicUnset(";

-	protected final String TEXT_13 = " - ESTATIC_FEATURE_COUNT";

-	protected final String TEXT_14 = ", ";

-	protected final String TEXT_15 = ");";

-	protected final String TEXT_16 = NL + "\t\teUnset(";

-	protected final String TEXT_17 = NL + "\t\t";

-	protected final String TEXT_18 = "__ESETTING_DELEGATE.dynamicUnset(this, null, 0);";

-	protected final String TEXT_19 = " ";

-	protected final String TEXT_20 = " = (";

-	protected final String TEXT_21 = ")eVirtualGet(";

-	protected final String TEXT_22 = NL + "\t\tif (";

-	protected final String TEXT_23 = " != null) ((";

-	protected final String TEXT_24 = ".Unsettable";

-	protected final String TEXT_25 = ")";

-	protected final String TEXT_26 = ").unset();";

-	protected final String TEXT_27 = " != null)" + NL + "\t\t{" + NL + "\t\t\t";

-	protected final String TEXT_28 = " msgs = null;";

-	protected final String TEXT_29 = NL + "\t\t\tmsgs = ((";

-	protected final String TEXT_30 = ").eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

-	protected final String TEXT_31 = ", null, msgs);";

-	protected final String TEXT_32 = ").eInverseRemove(this, ";

-	protected final String TEXT_33 = ".class, msgs);";

-	protected final String TEXT_34 = NL + "\t\t\tmsgs = basicUnset";

-	protected final String TEXT_35 = "(msgs);" + NL + "\t\t\tif (msgs != null) msgs.dispatch();" + NL + "\t\t}" + NL

+	protected final String TEXT_9 = NL + "\t@Override";

+	protected final String TEXT_10 = NL + "\tpublic void unset";

+	protected final String TEXT_11 = "_";

+	protected final String TEXT_12 = "()" + NL + "\t{";

+	protected final String TEXT_13 = NL + "\t\teDynamicUnset(";

+	protected final String TEXT_14 = " - ESTATIC_FEATURE_COUNT";

+	protected final String TEXT_15 = ", ";

+	protected final String TEXT_16 = ");";

+	protected final String TEXT_17 = NL + "\t\teUnset(";

+	protected final String TEXT_18 = NL + "\t\t";

+	protected final String TEXT_19 = "__ESETTING_DELEGATE.dynamicUnset(this, null, 0);";

+	protected final String TEXT_20 = " ";

+	protected final String TEXT_21 = " = (";

+	protected final String TEXT_22 = ")eVirtualGet(";

+	protected final String TEXT_23 = NL + "\t\tif (";

+	protected final String TEXT_24 = " != null) ((";

+	protected final String TEXT_25 = ".Unsettable";

+	protected final String TEXT_26 = ")";

+	protected final String TEXT_27 = ").unset();";

+	protected final String TEXT_28 = " != null)" + NL + "\t\t{" + NL + "\t\t\t";

+	protected final String TEXT_29 = " msgs = null;";

+	protected final String TEXT_30 = NL + "\t\t\tmsgs = ";

+	protected final String TEXT_31 = ".eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

+	protected final String TEXT_32 = ", null, msgs);";

+	protected final String TEXT_33 = ".eInverseRemove(this, ";

+	protected final String TEXT_34 = ".class, msgs);";

+	protected final String TEXT_35 = NL + "\t\t\tmsgs = basicUnset";

+	protected final String TEXT_36 = "(msgs);" + NL + "\t\t\tif (msgs != null) msgs.dispatch();" + NL + "\t\t}" + NL

 			+ "\t\telse" + NL + "\t\t{";

-	protected final String TEXT_36 = NL + "\t\t\tboolean old";

-	protected final String TEXT_37 = "ESet = eVirtualIsSet(";

-	protected final String TEXT_38 = "ESet = (";

-	protected final String TEXT_39 = " & ";

-	protected final String TEXT_40 = "_ESETFLAG) != 0;";

-	protected final String TEXT_41 = NL + "\t\t\t";

-	protected final String TEXT_42 = " &= ~";

-	protected final String TEXT_43 = "_ESETFLAG;";

-	protected final String TEXT_44 = "ESet = ";

-	protected final String TEXT_45 = "ESet;";

-	protected final String TEXT_46 = "ESet = false;";

-	protected final String TEXT_47 = NL + "\t\t\tif (eNotificationRequired())" + NL + "\t\t\t\teNotify(new ";

-	protected final String TEXT_48 = "(this, ";

-	protected final String TEXT_49 = ".UNSET, ";

-	protected final String TEXT_50 = ", null, null, old";

-	protected final String TEXT_51 = "ESet));";

-	protected final String TEXT_52 = NL + "\t\t}";

-	protected final String TEXT_53 = " old";

-	protected final String TEXT_54 = "_EFLAG) != 0;";

-	protected final String TEXT_55 = " = ";

-	protected final String TEXT_56 = "_EFLAG_VALUES[(";

-	protected final String TEXT_57 = "_EFLAG) >>> ";

-	protected final String TEXT_58 = "_EFLAG_OFFSET];";

-	protected final String TEXT_59 = NL + "\t\tObject old";

-	protected final String TEXT_60 = " = eVirtualUnset(";

-	protected final String TEXT_61 = ";";

-	protected final String TEXT_62 = NL + "\t\tboolean isSetChange = old";

-	protected final String TEXT_63 = " != EVIRTUAL_NO_VALUE;";

-	protected final String TEXT_64 = NL + "\t\tboolean old";

-	protected final String TEXT_65 = " = null;";

-	protected final String TEXT_66 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t\teNotify(new ";

-	protected final String TEXT_67 = "isSetChange ? old";

-	protected final String TEXT_68 = " : null";

-	protected final String TEXT_69 = "old";

-	protected final String TEXT_70 = ", null, ";

-	protected final String TEXT_71 = "isSetChange";

-	protected final String TEXT_72 = "ESet";

-	protected final String TEXT_73 = "));";

-	protected final String TEXT_74 = ") ";

-	protected final String TEXT_75 = " |= ";

-	protected final String TEXT_76 = "_EFLAG; else ";

-	protected final String TEXT_77 = "_EFLAG;";

-	protected final String TEXT_78 = " & ~";

-	protected final String TEXT_79 = "_EFLAG | ";

-	protected final String TEXT_80 = "_EFLAG_DEFAULT;";

-	protected final String TEXT_81 = " : ";

-	protected final String TEXT_82 = NL + "\t\t((";

-	protected final String TEXT_83 = ".Internal)((";

-	protected final String TEXT_84 = ".Internal.Wrapper)get";

-	protected final String TEXT_85 = "()).featureMap()).clear(";

-	protected final String TEXT_86 = ".Internal)get";

-	protected final String TEXT_87 = "()).clear(";

-	protected final String TEXT_88 = NL + "\t}" + NL;

-	protected final String TEXT_89 = NL;

+	protected final String TEXT_37 = NL + "\t\t\tboolean old";

+	protected final String TEXT_38 = "ESet = eVirtualIsSet(";

+	protected final String TEXT_39 = "ESet = (";

+	protected final String TEXT_40 = " & ";

+	protected final String TEXT_41 = "_ESETFLAG) != 0;";

+	protected final String TEXT_42 = NL + "\t\t\t";

+	protected final String TEXT_43 = " &= ~";

+	protected final String TEXT_44 = "_ESETFLAG;";

+	protected final String TEXT_45 = "ESet = ";

+	protected final String TEXT_46 = "ESet;";

+	protected final String TEXT_47 = "ESet = false;";

+	protected final String TEXT_48 = NL + "\t\t\tif (eNotificationRequired())" + NL + "\t\t\t\teNotify(new ";

+	protected final String TEXT_49 = "(this, ";

+	protected final String TEXT_50 = ".UNSET, ";

+	protected final String TEXT_51 = ", null, null, old";

+	protected final String TEXT_52 = "ESet));";

+	protected final String TEXT_53 = NL + "\t\t}";

+	protected final String TEXT_54 = " old";

+	protected final String TEXT_55 = "_EFLAG) != 0;";

+	protected final String TEXT_56 = " = ";

+	protected final String TEXT_57 = "_EFLAG_VALUES[(";

+	protected final String TEXT_58 = "_EFLAG) >>> ";

+	protected final String TEXT_59 = "_EFLAG_OFFSET];";

+	protected final String TEXT_60 = NL + "\t\tObject old";

+	protected final String TEXT_61 = " = eVirtualUnset(";

+	protected final String TEXT_62 = ";";

+	protected final String TEXT_63 = NL + "\t\tboolean isSetChange = old";

+	protected final String TEXT_64 = " != EVIRTUAL_NO_VALUE;";

+	protected final String TEXT_65 = NL + "\t\tboolean old";

+	protected final String TEXT_66 = " = null;";

+	protected final String TEXT_67 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t\teNotify(new ";

+	protected final String TEXT_68 = "isSetChange ? old";

+	protected final String TEXT_69 = " : null";

+	protected final String TEXT_70 = "old";

+	protected final String TEXT_71 = ", null, ";

+	protected final String TEXT_72 = "isSetChange";

+	protected final String TEXT_73 = "ESet";

+	protected final String TEXT_74 = "));";

+	protected final String TEXT_75 = ") ";

+	protected final String TEXT_76 = " |= ";

+	protected final String TEXT_77 = "_EFLAG; else ";

+	protected final String TEXT_78 = "_EFLAG;";

+	protected final String TEXT_79 = " & ~";

+	protected final String TEXT_80 = "_EFLAG | ";

+	protected final String TEXT_81 = "_EFLAG_DEFAULT;";

+	protected final String TEXT_82 = " : ";

+	protected final String TEXT_83 = NL + "\t\t((";

+	protected final String TEXT_84 = ".Internal)((";

+	protected final String TEXT_85 = ".Internal.Wrapper)get";

+	protected final String TEXT_86 = "()).featureMap()).clear(";

+	protected final String TEXT_87 = ".Internal)get";

+	protected final String TEXT_88 = "()).clear(";

+	protected final String TEXT_89 = NL + "\t}" + NL;

+	protected final String TEXT_90 = NL;

 

 	public ClassunsetGenFeatureoverride() {

 		//Here is the constructor

@@ -149,6 +150,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -171,35 +174,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -219,8 +225,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_89);

-		stringBuffer.append(TEXT_89);

+		stringBuffer.append(TEXT_90);

+		stringBuffer.append(TEXT_90);

 		return stringBuffer.toString();

 	}

 

@@ -238,6 +244,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -294,6 +301,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -345,6 +358,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -361,7 +375,7 @@
 		if (isInterface) {

 			stringBuffer.append(TEXT_2);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -375,6 +389,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -399,7 +414,7 @@
 			if (isJDK50) { //Class/unsetGenFeature.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -413,6 +428,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -436,366 +452,367 @@
 			stringBuffer.append(genFeature.getAccessorName());

 			stringBuffer.append(TEXT_8);

 		} else {

-			stringBuffer.append(TEXT_9);

+			if (useInterfaceOverrideAnnotation && !genClass.isMapEntry()

+					&& !genClass.hasCollidingUnsetAccessorOperation(genFeature)

+					&& !genFeature.isSuppressedUnsetVisibility()) {

+				stringBuffer.append(TEXT_9);

+			}

+			stringBuffer.append(TEXT_10);

 			stringBuffer.append(genFeature.getAccessorName());

 			if (genClass.hasCollidingUnsetAccessorOperation(genFeature)) {

-				stringBuffer.append(TEXT_10);

+				stringBuffer.append(TEXT_11);

 			}

-			stringBuffer.append(TEXT_11);

+			stringBuffer.append(TEXT_12);

 			if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {

-				stringBuffer.append(TEXT_12);

+				stringBuffer.append(TEXT_13);

 				stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 				if (genClass.hasStaticFeatures()) {

-					stringBuffer.append(TEXT_13);

+					stringBuffer.append(TEXT_14);

 				}

-				stringBuffer.append(TEXT_14);

-				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

 				stringBuffer.append(TEXT_15);

-			} else if (genModel.isReflectiveDelegation()) {

+				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

 				stringBuffer.append(TEXT_16);

-				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-				stringBuffer.append(TEXT_15);

-			} else if (genFeature.hasSettingDelegate()) {

+			} else if (genModel.isReflectiveDelegation()) {

 				stringBuffer.append(TEXT_17);

-				stringBuffer.append(genFeature.getUpperName());

+				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+				stringBuffer.append(TEXT_16);

+			} else if (genFeature.hasSettingDelegate()) {

 				stringBuffer.append(TEXT_18);

+				stringBuffer.append(genFeature.getUpperName());

+				stringBuffer.append(TEXT_19);

 			} else if (!genFeature.isVolatile()) {

 				if (genFeature.isListType()) {

 					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_17);

+						stringBuffer.append(TEXT_18);

 						stringBuffer.append(genFeature.getImportedType(genClass));

-						stringBuffer.append(TEXT_19);

-						stringBuffer.append(genFeature.getSafeName());

 						stringBuffer.append(TEXT_20);

-						stringBuffer.append(genFeature.getImportedType(genClass));

+						stringBuffer.append(genFeature.getSafeName());

 						stringBuffer.append(TEXT_21);

+						stringBuffer.append(genFeature.getImportedType(genClass));

+						stringBuffer.append(TEXT_22);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_15);

+						stringBuffer.append(TEXT_16);

 					}

-					stringBuffer.append(TEXT_22);

-					stringBuffer.append(genFeature.getSafeName());

 					stringBuffer.append(TEXT_23);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));

-					stringBuffer.append(TEXT_24);

-					stringBuffer.append(singleWildcard);

-					stringBuffer.append(TEXT_25);

 					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(TEXT_24);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));

+					stringBuffer.append(TEXT_25);

+					stringBuffer.append(singleWildcard);

 					stringBuffer.append(TEXT_26);

-				} else if (genFeature.isBidirectional() || genFeature.isEffectiveContains()) {

-					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_17);

-						stringBuffer.append(genFeature.getImportedType(genClass));

-						stringBuffer.append(TEXT_19);

-						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_20);

-						stringBuffer.append(genFeature.getImportedType(genClass));

-						stringBuffer.append(TEXT_21);

-						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

-						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_15);

-					}

-					stringBuffer.append(TEXT_22);

 					stringBuffer.append(genFeature.getSafeName());

 					stringBuffer.append(TEXT_27);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

-					stringBuffer.append(TEXT_28);

-					if (!genFeature.isBidirectional()) {

-						stringBuffer.append(TEXT_29);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-						stringBuffer.append(TEXT_25);

+				} else if (genFeature.isBidirectional() || genFeature.isEffectiveContains()) {

+					if (genModel.isVirtualDelegation()) {

+						stringBuffer.append(TEXT_18);

+						stringBuffer.append(genFeature.getImportedType(genClass));

+						stringBuffer.append(TEXT_20);

 						stringBuffer.append(genFeature.getSafeName());

+						stringBuffer.append(TEXT_21);

+						stringBuffer.append(genFeature.getImportedType(genClass));

+						stringBuffer.append(TEXT_22);

+						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

+						stringBuffer.append(positiveOffsetCorrection);

+						stringBuffer.append(TEXT_16);

+					}

+					stringBuffer.append(TEXT_23);

+					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(TEXT_28);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

+					stringBuffer.append(TEXT_29);

+					if (!genFeature.isBidirectional()) {

 						stringBuffer.append(TEXT_30);

+						stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), true));

+						stringBuffer.append(TEXT_31);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(negativeOffsetCorrection);

-						stringBuffer.append(TEXT_31);

+						stringBuffer.append(TEXT_32);

 					} else {

 						GenFeature reverseFeature = genFeature.getReverse();

 						GenClass targetClass = reverseFeature.getGenClass();

 						String reverseOffsetCorrection = targetClass.hasOffsetCorrection()

 								? " + " + genClass.getOffsetCorrectionField(genFeature)

 								: "";

-						stringBuffer.append(TEXT_29);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-						stringBuffer.append(TEXT_25);

-						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_32);

+						stringBuffer.append(TEXT_30);

+						stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), true));

+						stringBuffer.append(TEXT_33);

 						stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

 						stringBuffer.append(reverseOffsetCorrection);

-						stringBuffer.append(TEXT_14);

+						stringBuffer.append(TEXT_15);

 						stringBuffer.append(targetClass.getRawImportedInterfaceName());

-						stringBuffer.append(TEXT_33);

+						stringBuffer.append(TEXT_34);

 					}

-					stringBuffer.append(TEXT_34);

-					stringBuffer.append(genFeature.getAccessorName());

 					stringBuffer.append(TEXT_35);

+					stringBuffer.append(genFeature.getAccessorName());

+					stringBuffer.append(TEXT_36);

 					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_36);

-						stringBuffer.append(genFeature.getCapName());

 						stringBuffer.append(TEXT_37);

+						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(TEXT_38);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_15);

+						stringBuffer.append(TEXT_16);

 					} else if (genClass.isESetFlag(genFeature)) {

 						if (!genModel.isSuppressNotification()) {

-							stringBuffer.append(TEXT_36);

+							stringBuffer.append(TEXT_37);

 							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_38);

-							stringBuffer.append(genClass.getESetFlagsField(genFeature));

 							stringBuffer.append(TEXT_39);

-							stringBuffer.append(genFeature.getUpperName());

+							stringBuffer.append(genClass.getESetFlagsField(genFeature));

 							stringBuffer.append(TEXT_40);

+							stringBuffer.append(genFeature.getUpperName());

+							stringBuffer.append(TEXT_41);

 						}

-						stringBuffer.append(TEXT_41);

-						stringBuffer.append(genClass.getESetFlagsField(genFeature));

 						stringBuffer.append(TEXT_42);

-						stringBuffer.append(genFeature.getUpperName());

+						stringBuffer.append(genClass.getESetFlagsField(genFeature));

 						stringBuffer.append(TEXT_43);

+						stringBuffer.append(genFeature.getUpperName());

+						stringBuffer.append(TEXT_44);

 					} else {

 						if (!genModel.isSuppressNotification()) {

-							stringBuffer.append(TEXT_36);

+							stringBuffer.append(TEXT_37);

 							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_44);

-							stringBuffer.append(genFeature.getUncapName());

 							stringBuffer.append(TEXT_45);

+							stringBuffer.append(genFeature.getUncapName());

+							stringBuffer.append(TEXT_46);

 						}

-						stringBuffer.append(TEXT_41);

+						stringBuffer.append(TEXT_42);

 						stringBuffer.append(genFeature.getUncapName());

-						stringBuffer.append(TEXT_46);

+						stringBuffer.append(TEXT_47);

 					}

 					if (!genModel.isSuppressNotification()) {

-						stringBuffer.append(TEXT_47);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

 						stringBuffer.append(TEXT_48);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

+						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

 						stringBuffer.append(TEXT_49);

+						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

+						stringBuffer.append(TEXT_50);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_50);

-						stringBuffer.append(genFeature.getCapName());

 						stringBuffer.append(TEXT_51);

+						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(TEXT_52);

 					}

-					stringBuffer.append(TEXT_52);

+					stringBuffer.append(TEXT_53);

 				} else {

 					if (genClass.isFlag(genFeature)) {

 						if (!genModel.isSuppressNotification()) {

 							if (genFeature.isBooleanType()) {

-								stringBuffer.append(TEXT_17);

+								stringBuffer.append(TEXT_18);

 								stringBuffer.append(genFeature.getImportedType(genClass));

-								stringBuffer.append(TEXT_53);

-								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_20);

-								stringBuffer.append(genClass.getFlagsField(genFeature));

-								stringBuffer.append(TEXT_39);

-								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_54);

-							} else {

-								stringBuffer.append(TEXT_17);

-								stringBuffer.append(genFeature.getImportedType(genClass));

-								stringBuffer.append(TEXT_53);

 								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_55);

-								stringBuffer.append(genFeature.getUpperName());

-								stringBuffer.append(TEXT_56);

+								stringBuffer.append(TEXT_21);

 								stringBuffer.append(genClass.getFlagsField(genFeature));

-								stringBuffer.append(TEXT_39);

+								stringBuffer.append(TEXT_40);

+								stringBuffer.append(genFeature.getUpperName());

+								stringBuffer.append(TEXT_55);

+							} else {

+								stringBuffer.append(TEXT_18);

+								stringBuffer.append(genFeature.getImportedType(genClass));

+								stringBuffer.append(TEXT_54);

+								stringBuffer.append(genFeature.getCapName());

+								stringBuffer.append(TEXT_56);

 								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_57);

+								stringBuffer.append(genClass.getFlagsField(genFeature));

+								stringBuffer.append(TEXT_40);

 								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_58);

+								stringBuffer.append(genFeature.getUpperName());

+								stringBuffer.append(TEXT_59);

 							}

 						}

 					} else if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_59);

-						stringBuffer.append(genFeature.getCapName());

 						stringBuffer.append(TEXT_60);

+						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(TEXT_61);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_15);

+						stringBuffer.append(TEXT_16);

 					} else {

 						if (!genModel.isSuppressNotification()) {

-							stringBuffer.append(TEXT_17);

+							stringBuffer.append(TEXT_18);

 							stringBuffer.append(genFeature.getImportedType(genClass));

-							stringBuffer.append(TEXT_53);

+							stringBuffer.append(TEXT_54);

 							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_55);

+							stringBuffer.append(TEXT_56);

 							stringBuffer.append(genFeature.getSafeName());

-							stringBuffer.append(TEXT_61);

+							stringBuffer.append(TEXT_62);

 						}

 					}

 					if (!genModel.isSuppressNotification()) {

 						if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

-							stringBuffer.append(TEXT_62);

-							stringBuffer.append(genFeature.getCapName());

 							stringBuffer.append(TEXT_63);

+							stringBuffer.append(genFeature.getCapName());

+							stringBuffer.append(TEXT_64);

 						} else if (genClass.isESetFlag(genFeature)) {

-							stringBuffer.append(TEXT_64);

+							stringBuffer.append(TEXT_65);

 							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_38);

-							stringBuffer.append(genClass.getESetFlagsField(genFeature));

 							stringBuffer.append(TEXT_39);

-							stringBuffer.append(genFeature.getUpperName());

+							stringBuffer.append(genClass.getESetFlagsField(genFeature));

 							stringBuffer.append(TEXT_40);

+							stringBuffer.append(genFeature.getUpperName());

+							stringBuffer.append(TEXT_41);

 						} else {

-							stringBuffer.append(TEXT_64);

+							stringBuffer.append(TEXT_65);

 							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_44);

-							stringBuffer.append(genFeature.getUncapName());

 							stringBuffer.append(TEXT_45);

+							stringBuffer.append(genFeature.getUncapName());

+							stringBuffer.append(TEXT_46);

 						}

 					}

 					if (genFeature.isReferenceType()) {

-						stringBuffer.append(TEXT_17);

+						stringBuffer.append(TEXT_18);

 						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_65);

+						stringBuffer.append(TEXT_66);

 						if (!genModel.isVirtualDelegation()) {

 							if (genClass.isESetFlag(genFeature)) {

-								stringBuffer.append(TEXT_17);

+								stringBuffer.append(TEXT_18);

 								stringBuffer.append(genClass.getESetFlagsField(genFeature));

-								stringBuffer.append(TEXT_42);

-								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_43);

+								stringBuffer.append(genFeature.getUpperName());

+								stringBuffer.append(TEXT_44);

 							} else {

-								stringBuffer.append(TEXT_17);

+								stringBuffer.append(TEXT_18);

 								stringBuffer.append(genFeature.getUncapName());

-								stringBuffer.append(TEXT_46);

+								stringBuffer.append(TEXT_47);

 							}

 						}

 						if (!genModel.isSuppressNotification()) {

-							stringBuffer.append(TEXT_66);

+							stringBuffer.append(TEXT_67);

 							stringBuffer

 									.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

-							stringBuffer.append(TEXT_48);

-							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

 							stringBuffer.append(TEXT_49);

+							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

+							stringBuffer.append(TEXT_50);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_14);

+							stringBuffer.append(TEXT_15);

 							if (genModel.isVirtualDelegation()) {

-								stringBuffer.append(TEXT_67);

-								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_68);

-							} else {

+								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_69);

+							} else {

+								stringBuffer.append(TEXT_70);

 								stringBuffer.append(genFeature.getCapName());

 							}

-							stringBuffer.append(TEXT_70);

+							stringBuffer.append(TEXT_71);

 							if (genModel.isVirtualDelegation()) {

-								stringBuffer.append(TEXT_71);

-							} else {

-								stringBuffer.append(TEXT_69);

-								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_72);

+							} else {

+								stringBuffer.append(TEXT_70);

+								stringBuffer.append(genFeature.getCapName());

+								stringBuffer.append(TEXT_73);

 							}

-							stringBuffer.append(TEXT_73);

+							stringBuffer.append(TEXT_74);

 						}

 					} else {

 						if (genClass.isFlag(genFeature)) {

 							if (genFeature.isBooleanType()) {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getEDefault());

-								stringBuffer.append(TEXT_74);

-								stringBuffer.append(genClass.getFlagsField(genFeature));

 								stringBuffer.append(TEXT_75);

-								stringBuffer.append(genFeature.getUpperName());

-								stringBuffer.append(TEXT_76);

 								stringBuffer.append(genClass.getFlagsField(genFeature));

-								stringBuffer.append(TEXT_42);

+								stringBuffer.append(TEXT_76);

 								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_77);

-							} else {

-								stringBuffer.append(TEXT_17);

 								stringBuffer.append(genClass.getFlagsField(genFeature));

-								stringBuffer.append(TEXT_55);

-								stringBuffer.append(genClass.getFlagsField(genFeature));

-								stringBuffer.append(TEXT_78);

+								stringBuffer.append(TEXT_43);

 								stringBuffer.append(genFeature.getUpperName());

+								stringBuffer.append(TEXT_78);

+							} else {

+								stringBuffer.append(TEXT_18);

+								stringBuffer.append(genClass.getFlagsField(genFeature));

+								stringBuffer.append(TEXT_56);

+								stringBuffer.append(genClass.getFlagsField(genFeature));

 								stringBuffer.append(TEXT_79);

 								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_80);

+								stringBuffer.append(genFeature.getUpperName());

+								stringBuffer.append(TEXT_81);

 							}

 						} else if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {

-							stringBuffer.append(TEXT_17);

+							stringBuffer.append(TEXT_18);

 							stringBuffer.append(genFeature.getSafeName());

-							stringBuffer.append(TEXT_55);

+							stringBuffer.append(TEXT_56);

 							stringBuffer.append(genFeature.getEDefault());

-							stringBuffer.append(TEXT_61);

+							stringBuffer.append(TEXT_62);

 						}

 						if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {

 							if (genClass.isESetFlag(genFeature)) {

-								stringBuffer.append(TEXT_17);

+								stringBuffer.append(TEXT_18);

 								stringBuffer.append(genClass.getESetFlagsField(genFeature));

-								stringBuffer.append(TEXT_42);

-								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_43);

+								stringBuffer.append(genFeature.getUpperName());

+								stringBuffer.append(TEXT_44);

 							} else {

-								stringBuffer.append(TEXT_17);

+								stringBuffer.append(TEXT_18);

 								stringBuffer.append(genFeature.getUncapName());

-								stringBuffer.append(TEXT_46);

+								stringBuffer.append(TEXT_47);

 							}

 						}

 						if (!genModel.isSuppressNotification()) {

-							stringBuffer.append(TEXT_66);

+							stringBuffer.append(TEXT_67);

 							stringBuffer

 									.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

-							stringBuffer.append(TEXT_48);

-							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

 							stringBuffer.append(TEXT_49);

+							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

+							stringBuffer.append(TEXT_50);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_14);

+							stringBuffer.append(TEXT_15);

 							if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

-								stringBuffer.append(TEXT_67);

+								stringBuffer.append(TEXT_68);

 								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_81);

+								stringBuffer.append(TEXT_82);

 								stringBuffer.append(genFeature.getEDefault());

 							} else {

-								stringBuffer.append(TEXT_69);

+								stringBuffer.append(TEXT_70);

 								stringBuffer.append(genFeature.getCapName());

 							}

-							stringBuffer.append(TEXT_14);

+							stringBuffer.append(TEXT_15);

 							stringBuffer.append(genFeature.getEDefault());

-							stringBuffer.append(TEXT_14);

+							stringBuffer.append(TEXT_15);

 							if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

-								stringBuffer.append(TEXT_71);

-							} else {

-								stringBuffer.append(TEXT_69);

-								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_72);

+							} else {

+								stringBuffer.append(TEXT_70);

+								stringBuffer.append(genFeature.getCapName());

+								stringBuffer.append(TEXT_73);

 							}

-							stringBuffer.append(TEXT_73);

+							stringBuffer.append(TEXT_74);

 						}

 					}

 				}

 			} else if (genFeature.hasDelegateFeature()) {

 				GenFeature delegateFeature = genFeature.getDelegateFeature();

 				if (delegateFeature.isWrappedFeatureMapType()) {

-					stringBuffer.append(TEXT_82);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

 					stringBuffer.append(TEXT_83);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

 					stringBuffer.append(TEXT_84);

-					stringBuffer.append(delegateFeature.getAccessorName());

-					stringBuffer.append(TEXT_85);

-					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-					stringBuffer.append(TEXT_15);

-				} else {

-					stringBuffer.append(TEXT_82);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

-					stringBuffer.append(TEXT_86);

+					stringBuffer.append(TEXT_85);

 					stringBuffer.append(delegateFeature.getAccessorName());

-					stringBuffer.append(TEXT_87);

+					stringBuffer.append(TEXT_86);

 					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-					stringBuffer.append(TEXT_15);

+					stringBuffer.append(TEXT_16);

+				} else {

+					stringBuffer.append(TEXT_83);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

+					stringBuffer.append(TEXT_87);

+					stringBuffer.append(delegateFeature.getAccessorName());

+					stringBuffer.append(TEXT_88);

+					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+					stringBuffer.append(TEXT_16);

 				}

 			} else if (genClass.getUnsetAccessorOperation(genFeature) != null) {

-				stringBuffer.append(TEXT_17);

+				stringBuffer.append(TEXT_18);

 				stringBuffer.append(

 						genClass.getUnsetAccessorOperation(genFeature).getBody(genModel.getIndentation(stringBuffer)));

 			} else {

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -809,6 +826,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -824,7 +842,7 @@
 

 				//Class/unsetGenFeature.todo.override.javajetinc

 			}

-			stringBuffer.append(TEXT_88);

+			stringBuffer.append(TEXT_89);

 		}

 		stringBuffer.append(TEXT_2);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeatureTODOoverride.java
index 104c2d6..9bb6d35 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -64,6 +64,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -86,35 +88,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -153,6 +158,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -209,6 +215,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -260,6 +272,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeatureannotationsinsert.java
index 9c51a97..50cccb4 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeatureoverride.java
index e29eb3a..d0f6916 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -93,6 +93,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -115,35 +117,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -182,6 +187,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -238,6 +244,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -289,6 +301,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -310,7 +323,7 @@
 		if (isJDK50) { //Class/basicGetGenFeature.annotations.insert.javajetinc

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -324,6 +337,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -348,7 +362,7 @@
 		stringBuffer.append(TEXT_8);

 		stringBuffer.append(TEXT_4);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -362,6 +376,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

@@ -451,7 +466,7 @@
 		} else {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -465,6 +480,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeaturepreinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeaturepreinsert.java
index a900e66..f0e68c3 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeaturepreinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicGetGenFeaturepreinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeatureTODOoverride.java
index b298a37..a024516 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -67,6 +67,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -89,35 +91,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -156,6 +161,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -212,6 +218,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -263,6 +275,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeatureannotationsinsert.java
index cfe11d8..9948113 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeatureoverride.java
index 875da1a..1654217 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -39,53 +39,52 @@
 	protected final String TEXT_9 = " new";

 	protected final String TEXT_10 = ", ";

 	protected final String TEXT_11 = " msgs)" + NL + "\t{";

-	protected final String TEXT_12 = NL + "\t\tmsgs = eBasicSetContainer((";

-	protected final String TEXT_13 = ")new";

-	protected final String TEXT_14 = ", msgs);";

-	protected final String TEXT_15 = NL + "\t\treturn msgs;";

-	protected final String TEXT_16 = NL + "\t\tmsgs = eDynamicInverseAdd((";

-	protected final String TEXT_17 = NL + "\t\tObject old";

-	protected final String TEXT_18 = " = eVirtualSet(";

-	protected final String TEXT_19 = ", new";

-	protected final String TEXT_20 = ");";

-	protected final String TEXT_21 = NL + "\t\t";

-	protected final String TEXT_22 = " old";

-	protected final String TEXT_23 = " = ";

-	protected final String TEXT_24 = ";" + NL + "\t\t";

-	protected final String TEXT_25 = " = new";

-	protected final String TEXT_26 = ";";

-	protected final String TEXT_27 = NL + "\t\tboolean isSetChange = old";

-	protected final String TEXT_28 = " == EVIRTUAL_NO_VALUE;";

-	protected final String TEXT_29 = NL + "\t\tboolean old";

-	protected final String TEXT_30 = "ESet = (";

-	protected final String TEXT_31 = " & ";

-	protected final String TEXT_32 = "_ESETFLAG) != 0;";

-	protected final String TEXT_33 = " |= ";

-	protected final String TEXT_34 = "_ESETFLAG;";

-	protected final String TEXT_35 = "ESet = ";

-	protected final String TEXT_36 = "ESet;";

-	protected final String TEXT_37 = "ESet = true;";

-	protected final String TEXT_38 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t{";

-	protected final String TEXT_39 = NL + "\t\t\t";

-	protected final String TEXT_40 = " notification = new ";

-	protected final String TEXT_41 = "(this, ";

-	protected final String TEXT_42 = ".SET, ";

-	protected final String TEXT_43 = "isSetChange ? null : old";

-	protected final String TEXT_44 = "old";

-	protected final String TEXT_45 = "isSetChange";

-	protected final String TEXT_46 = "!old";

-	protected final String TEXT_47 = "ESet";

-	protected final String TEXT_48 = " == EVIRTUAL_NO_VALUE ? null : old";

-	protected final String TEXT_49 = NL + "\t\t\tif (msgs == null) msgs = notification; else msgs.add(notification);"

+	protected final String TEXT_12 = NL + "\t\tmsgs = eBasicSetContainer(";

+	protected final String TEXT_13 = ", msgs);";

+	protected final String TEXT_14 = NL + "\t\treturn msgs;";

+	protected final String TEXT_15 = NL + "\t\tmsgs = eDynamicInverseAdd(";

+	protected final String TEXT_16 = NL + "\t\tObject old";

+	protected final String TEXT_17 = " = eVirtualSet(";

+	protected final String TEXT_18 = ", new";

+	protected final String TEXT_19 = ");";

+	protected final String TEXT_20 = NL + "\t\t";

+	protected final String TEXT_21 = " old";

+	protected final String TEXT_22 = " = ";

+	protected final String TEXT_23 = ";" + NL + "\t\t";

+	protected final String TEXT_24 = " = new";

+	protected final String TEXT_25 = ";";

+	protected final String TEXT_26 = NL + "\t\tboolean isSetChange = old";

+	protected final String TEXT_27 = " == EVIRTUAL_NO_VALUE;";

+	protected final String TEXT_28 = NL + "\t\tboolean old";

+	protected final String TEXT_29 = "ESet = (";

+	protected final String TEXT_30 = " & ";

+	protected final String TEXT_31 = "_ESETFLAG) != 0;";

+	protected final String TEXT_32 = " |= ";

+	protected final String TEXT_33 = "_ESETFLAG;";

+	protected final String TEXT_34 = "ESet = ";

+	protected final String TEXT_35 = "ESet;";

+	protected final String TEXT_36 = "ESet = true;";

+	protected final String TEXT_37 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t{";

+	protected final String TEXT_38 = NL + "\t\t\t";

+	protected final String TEXT_39 = " notification = new ";

+	protected final String TEXT_40 = "(this, ";

+	protected final String TEXT_41 = ".SET, ";

+	protected final String TEXT_42 = "isSetChange ? null : old";

+	protected final String TEXT_43 = "old";

+	protected final String TEXT_44 = "isSetChange";

+	protected final String TEXT_45 = "!old";

+	protected final String TEXT_46 = "ESet";

+	protected final String TEXT_47 = " == EVIRTUAL_NO_VALUE ? null : old";

+	protected final String TEXT_48 = NL + "\t\t\tif (msgs == null) msgs = notification; else msgs.add(notification);"

 			+ NL + "\t\t}";

-	protected final String TEXT_50 = NL + "\t\treturn ((";

-	protected final String TEXT_51 = ".Internal)((";

-	protected final String TEXT_52 = ".Internal.Wrapper)get";

-	protected final String TEXT_53 = "()).featureMap()).basicAdd(";

-	protected final String TEXT_54 = ".Internal)get";

-	protected final String TEXT_55 = "()).basicAdd(";

-	protected final String TEXT_56 = NL + "\t}" + NL + NL;

-	protected final String TEXT_57 = NL;

+	protected final String TEXT_49 = NL + "\t\treturn ((";

+	protected final String TEXT_50 = ".Internal)((";

+	protected final String TEXT_51 = ".Internal.Wrapper)get";

+	protected final String TEXT_52 = "()).featureMap()).basicAdd(";

+	protected final String TEXT_53 = ".Internal)get";

+	protected final String TEXT_54 = "()).basicAdd(";

+	protected final String TEXT_55 = NL + "\t}" + NL + NL;

+	protected final String TEXT_56 = NL;

 

 	public InterfacebasicSetGenFeatureoverride() {

 		//Here is the constructor

@@ -117,6 +116,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -139,35 +140,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -187,8 +191,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_57);

-		stringBuffer.append(TEXT_57);

+		stringBuffer.append(TEXT_56);

+		stringBuffer.append(TEXT_56);

 		return stringBuffer.toString();

 	}

 

@@ -206,6 +210,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -262,6 +267,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -313,6 +324,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -334,7 +346,7 @@
 		if (isJDK50) { //Class/basicSetGenFeature.annotations.insert.javajetinc

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -348,6 +360,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -379,7 +392,7 @@
 		if (genFeature.isContainer()) {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -393,6 +406,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -407,16 +421,14 @@
 			}

 

 			stringBuffer.append(TEXT_12);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-			stringBuffer.append(TEXT_13);

-			stringBuffer.append(genFeature.getCapName());

+			stringBuffer.append(genFeature.getAsInternalEObject("new" + genFeature.getCapName(), false));

 			stringBuffer.append(TEXT_10);

 			stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 			stringBuffer.append(positiveOffsetCorrection);

-			stringBuffer.append(TEXT_14);

+			stringBuffer.append(TEXT_13);

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -430,6 +442,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -443,11 +456,11 @@
 				stringBuffer.setLength(0);

 			}

 

-			stringBuffer.append(TEXT_15);

+			stringBuffer.append(TEXT_14);

 		} else if (genModel.isDynamicDelegation()) {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -461,6 +474,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -474,17 +488,15 @@
 				stringBuffer.setLength(0);

 			}

 

-			stringBuffer.append(TEXT_16);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-			stringBuffer.append(TEXT_13);

-			stringBuffer.append(genFeature.getCapName());

+			stringBuffer.append(TEXT_15);

+			stringBuffer.append(genFeature.getAsInternalEObject("new" + genFeature.getCapName(), false));

 			stringBuffer.append(TEXT_10);

 			stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 			stringBuffer.append(positiveOffsetCorrection);

-			stringBuffer.append(TEXT_14);

+			stringBuffer.append(TEXT_13);

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -498,6 +510,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -511,11 +524,11 @@
 				stringBuffer.setLength(0);

 			}

 

-			stringBuffer.append(TEXT_15);

+			stringBuffer.append(TEXT_14);

 		} else if (!genFeature.isVolatile()) {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -529,6 +542,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -543,122 +557,122 @@
 			}

 

 			if (genModel.isVirtualDelegation()) {

-				stringBuffer.append(TEXT_17);

+				stringBuffer.append(TEXT_16);

 				stringBuffer.append(genFeature.getCapName());

-				stringBuffer.append(TEXT_18);

+				stringBuffer.append(TEXT_17);

 				stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 				stringBuffer.append(positiveOffsetCorrection);

+				stringBuffer.append(TEXT_18);

+				stringBuffer.append(genFeature.getCapName());

 				stringBuffer.append(TEXT_19);

-				stringBuffer.append(genFeature.getCapName());

-				stringBuffer.append(TEXT_20);

 			} else {

-				stringBuffer.append(TEXT_21);

+				stringBuffer.append(TEXT_20);

 				stringBuffer.append(genFeature.getImportedType(genClass));

-				stringBuffer.append(TEXT_22);

+				stringBuffer.append(TEXT_21);

 				stringBuffer.append(genFeature.getCapName());

+				stringBuffer.append(TEXT_22);

+				stringBuffer.append(genFeature.getSafeName());

 				stringBuffer.append(TEXT_23);

 				stringBuffer.append(genFeature.getSafeName());

 				stringBuffer.append(TEXT_24);

-				stringBuffer.append(genFeature.getSafeName());

-				stringBuffer.append(TEXT_25);

 				stringBuffer.append(genFeature.getCapName());

-				stringBuffer.append(TEXT_26);

+				stringBuffer.append(TEXT_25);

 			}

 			if (genFeature.isUnsettable()) {

 				if (genModel.isVirtualDelegation()) {

 					if (!genModel.isSuppressNotification()) {

-						stringBuffer.append(TEXT_27);

+						stringBuffer.append(TEXT_26);

 						stringBuffer.append(genFeature.getCapName());

-						stringBuffer.append(TEXT_28);

+						stringBuffer.append(TEXT_27);

 					}

 				} else if (genClass.isESetFlag(genFeature)) {

-					stringBuffer.append(TEXT_29);

+					stringBuffer.append(TEXT_28);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_30);

+					stringBuffer.append(TEXT_29);

 					stringBuffer.append(genClass.getESetFlagsField(genFeature));

-					stringBuffer.append(TEXT_31);

+					stringBuffer.append(TEXT_30);

 					stringBuffer.append(genFeature.getUpperName());

-					stringBuffer.append(TEXT_32);

+					stringBuffer.append(TEXT_31);

 					if (!genModel.isSuppressNotification()) {

-						stringBuffer.append(TEXT_21);

+						stringBuffer.append(TEXT_20);

 						stringBuffer.append(genClass.getESetFlagsField(genFeature));

-						stringBuffer.append(TEXT_33);

+						stringBuffer.append(TEXT_32);

 						stringBuffer.append(genFeature.getUpperName());

-						stringBuffer.append(TEXT_34);

+						stringBuffer.append(TEXT_33);

 					}

 				} else {

 					if (!genModel.isSuppressNotification()) {

-						stringBuffer.append(TEXT_29);

+						stringBuffer.append(TEXT_28);

 						stringBuffer.append(genFeature.getCapName());

-						stringBuffer.append(TEXT_35);

+						stringBuffer.append(TEXT_34);

 						stringBuffer.append(genFeature.getUncapName());

-						stringBuffer.append(TEXT_36);

+						stringBuffer.append(TEXT_35);

 					}

-					stringBuffer.append(TEXT_21);

+					stringBuffer.append(TEXT_20);

 					stringBuffer.append(genFeature.getUncapName());

-					stringBuffer.append(TEXT_37);

+					stringBuffer.append(TEXT_36);

 				}

 			}

 			if (!genModel.isSuppressNotification()) {

-				stringBuffer.append(TEXT_38);

+				stringBuffer.append(TEXT_37);

 				if (genFeature.isUnsettable()) {

+					stringBuffer.append(TEXT_38);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

 					stringBuffer.append(TEXT_39);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

 					stringBuffer.append(TEXT_40);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

-					stringBuffer.append(TEXT_41);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

-					stringBuffer.append(TEXT_42);

+					stringBuffer.append(TEXT_41);

+					stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

+					stringBuffer.append(positiveOffsetCorrection);

+					stringBuffer.append(TEXT_10);

+					if (genModel.isVirtualDelegation()) {

+						stringBuffer.append(TEXT_42);

+						stringBuffer.append(genFeature.getCapName());

+					} else {

+						stringBuffer.append(TEXT_43);

+						stringBuffer.append(genFeature.getCapName());

+					}

+					stringBuffer.append(TEXT_18);

+					stringBuffer.append(genFeature.getCapName());

+					stringBuffer.append(TEXT_10);

+					if (genModel.isVirtualDelegation()) {

+						stringBuffer.append(TEXT_44);

+					} else {

+						stringBuffer.append(TEXT_45);

+						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(TEXT_46);

+					}

+					stringBuffer.append(TEXT_19);

+				} else {

+					stringBuffer.append(TEXT_38);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

+					stringBuffer.append(TEXT_39);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

+					stringBuffer.append(TEXT_40);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

+					stringBuffer.append(TEXT_41);

 					stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 					stringBuffer.append(positiveOffsetCorrection);

 					stringBuffer.append(TEXT_10);

 					if (genModel.isVirtualDelegation()) {

 						stringBuffer.append(TEXT_43);

 						stringBuffer.append(genFeature.getCapName());

-					} else {

-						stringBuffer.append(TEXT_44);

-						stringBuffer.append(genFeature.getCapName());

-					}

-					stringBuffer.append(TEXT_19);

-					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_10);

-					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_45);

-					} else {

-						stringBuffer.append(TEXT_46);

-						stringBuffer.append(genFeature.getCapName());

 						stringBuffer.append(TEXT_47);

-					}

-					stringBuffer.append(TEXT_20);

-				} else {

-					stringBuffer.append(TEXT_39);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

-					stringBuffer.append(TEXT_40);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

-					stringBuffer.append(TEXT_41);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

-					stringBuffer.append(TEXT_42);

-					stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

-					stringBuffer.append(positiveOffsetCorrection);

-					stringBuffer.append(TEXT_10);

-					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_44);

-						stringBuffer.append(genFeature.getCapName());

-						stringBuffer.append(TEXT_48);

 						stringBuffer.append(genFeature.getCapName());

 					} else {

-						stringBuffer.append(TEXT_44);

+						stringBuffer.append(TEXT_43);

 						stringBuffer.append(genFeature.getCapName());

 					}

-					stringBuffer.append(TEXT_19);

+					stringBuffer.append(TEXT_18);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_20);

+					stringBuffer.append(TEXT_19);

 				}

-				stringBuffer.append(TEXT_49);

+				stringBuffer.append(TEXT_48);

 			}

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -672,6 +686,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -685,36 +700,36 @@
 				stringBuffer.setLength(0);

 			}

 

-			stringBuffer.append(TEXT_15);

+			stringBuffer.append(TEXT_14);

 		} else if (genFeature.hasDelegateFeature()) {

 			GenFeature delegateFeature = genFeature.getDelegateFeature();

 			if (delegateFeature.isWrappedFeatureMapType()) {

+				stringBuffer.append(TEXT_49);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

 				stringBuffer.append(TEXT_50);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

 				stringBuffer.append(TEXT_51);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

+				stringBuffer.append(delegateFeature.getAccessorName());

 				stringBuffer.append(TEXT_52);

-				stringBuffer.append(delegateFeature.getAccessorName());

-				stringBuffer.append(TEXT_53);

 				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_18);

 				stringBuffer.append(genFeature.getCapName());

-				stringBuffer.append(TEXT_14);

+				stringBuffer.append(TEXT_13);

 			} else {

-				stringBuffer.append(TEXT_50);

+				stringBuffer.append(TEXT_49);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

-				stringBuffer.append(TEXT_54);

+				stringBuffer.append(TEXT_53);

 				stringBuffer.append(delegateFeature.getAccessorName());

-				stringBuffer.append(TEXT_55);

+				stringBuffer.append(TEXT_54);

 				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_18);

 				stringBuffer.append(genFeature.getCapName());

-				stringBuffer.append(TEXT_14);

+				stringBuffer.append(TEXT_13);

 			}

 		} else {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -728,6 +743,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -743,7 +759,7 @@
 

 			//Class/basicSetGenFeature.todo.override.javajetinc

 		}

-		stringBuffer.append(TEXT_56);

+		stringBuffer.append(TEXT_55);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeaturepostinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeaturepostinsert.java
index 97efaa9..6af46d2 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeaturepostinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeaturepostinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeaturepreinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeaturepreinsert.java
index daca8a7..89b64b4 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeaturepreinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicSetGenFeaturepreinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicUnsetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicUnsetGenFeatureTODOoverride.java
index 28842c3..92b700e 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicUnsetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicUnsetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -67,6 +67,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -89,35 +91,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -156,6 +161,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -212,6 +218,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -263,6 +275,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicUnsetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicUnsetGenFeatureannotationsinsert.java
index 388aba5..166f4fd 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicUnsetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicUnsetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicUnsetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicUnsetGenFeatureoverride.java
index 068c93c..361a9a2 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicUnsetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacebasicUnsetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -37,46 +37,45 @@
 	protected final String TEXT_7 = " basicUnset";

 	protected final String TEXT_8 = "(";

 	protected final String TEXT_9 = " msgs)" + NL + "\t{";

-	protected final String TEXT_10 = NL + "\t\treturn eDynamicInverseRemove((";

-	protected final String TEXT_11 = ")";

-	protected final String TEXT_12 = "basicGet";

-	protected final String TEXT_13 = "(), ";

-	protected final String TEXT_14 = ", msgs);";

-	protected final String TEXT_15 = "Object old";

-	protected final String TEXT_16 = " = ";

-	protected final String TEXT_17 = "eVirtualUnset(";

-	protected final String TEXT_18 = ");";

-	protected final String TEXT_19 = NL + "\t\t";

-	protected final String TEXT_20 = " old";

-	protected final String TEXT_21 = ";";

-	protected final String TEXT_22 = " = null;";

-	protected final String TEXT_23 = NL + "\t\tboolean isSetChange = old";

-	protected final String TEXT_24 = " != EVIRTUAL_NO_VALUE;";

-	protected final String TEXT_25 = NL + "\t\tboolean old";

-	protected final String TEXT_26 = "ESet = (";

-	protected final String TEXT_27 = " & ";

-	protected final String TEXT_28 = "_ESETFLAG) != 0;";

-	protected final String TEXT_29 = " &= ~";

-	protected final String TEXT_30 = "_ESETFLAG;";

-	protected final String TEXT_31 = "ESet = ";

-	protected final String TEXT_32 = "ESet;";

-	protected final String TEXT_33 = "ESet = false;";

-	protected final String TEXT_34 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t{" + NL + "\t\t\t";

-	protected final String TEXT_35 = " notification = new ";

-	protected final String TEXT_36 = "(this, ";

-	protected final String TEXT_37 = ".UNSET, ";

-	protected final String TEXT_38 = ", ";

-	protected final String TEXT_39 = "isSetChange ? old";

-	protected final String TEXT_40 = " : null";

-	protected final String TEXT_41 = "old";

-	protected final String TEXT_42 = ", null, ";

-	protected final String TEXT_43 = "isSetChange";

-	protected final String TEXT_44 = "ESet";

-	protected final String TEXT_45 = ");" + NL

+	protected final String TEXT_10 = NL + "\t\treturn eDynamicInverseRemove(";

+	protected final String TEXT_11 = "basicGet";

+	protected final String TEXT_12 = "(), ";

+	protected final String TEXT_13 = ", msgs);";

+	protected final String TEXT_14 = "Object old";

+	protected final String TEXT_15 = " = ";

+	protected final String TEXT_16 = "eVirtualUnset(";

+	protected final String TEXT_17 = ");";

+	protected final String TEXT_18 = NL + "\t\t";

+	protected final String TEXT_19 = " old";

+	protected final String TEXT_20 = ";";

+	protected final String TEXT_21 = " = null;";

+	protected final String TEXT_22 = NL + "\t\tboolean isSetChange = old";

+	protected final String TEXT_23 = " != EVIRTUAL_NO_VALUE;";

+	protected final String TEXT_24 = NL + "\t\tboolean old";

+	protected final String TEXT_25 = "ESet = (";

+	protected final String TEXT_26 = " & ";

+	protected final String TEXT_27 = "_ESETFLAG) != 0;";

+	protected final String TEXT_28 = " &= ~";

+	protected final String TEXT_29 = "_ESETFLAG;";

+	protected final String TEXT_30 = "ESet = ";

+	protected final String TEXT_31 = "ESet;";

+	protected final String TEXT_32 = "ESet = false;";

+	protected final String TEXT_33 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t{" + NL + "\t\t\t";

+	protected final String TEXT_34 = " notification = new ";

+	protected final String TEXT_35 = "(this, ";

+	protected final String TEXT_36 = ".UNSET, ";

+	protected final String TEXT_37 = ", ";

+	protected final String TEXT_38 = "isSetChange ? old";

+	protected final String TEXT_39 = " : null";

+	protected final String TEXT_40 = "old";

+	protected final String TEXT_41 = ", null, ";

+	protected final String TEXT_42 = "isSetChange";

+	protected final String TEXT_43 = "ESet";

+	protected final String TEXT_44 = ");" + NL

 			+ "\t\t\tif (msgs == null) msgs = notification; else msgs.add(notification);" + NL + "\t\t}" + NL

 			+ "\t\treturn msgs;";

-	protected final String TEXT_46 = NL + "\t}" + NL + NL;

-	protected final String TEXT_47 = NL;

+	protected final String TEXT_45 = NL + "\t}" + NL + NL;

+	protected final String TEXT_46 = NL;

 

 	public InterfacebasicUnsetGenFeatureoverride() {

 		//Here is the constructor

@@ -108,6 +107,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -130,35 +131,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -178,8 +182,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_47);

-		stringBuffer.append(TEXT_47);

+		stringBuffer.append(TEXT_46);

+		stringBuffer.append(TEXT_46);

 		return stringBuffer.toString();

 	}

 

@@ -197,6 +201,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -253,6 +258,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -304,6 +315,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -325,7 +337,7 @@
 		if (isJDK50) { //Class/basicUnsetGenFeature.annotations.insert.javajetinc

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -339,6 +351,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -365,109 +378,108 @@
 		stringBuffer.append(TEXT_9);

 		if (genModel.isDynamicDelegation()) {

 			stringBuffer.append(TEXT_10);

-			stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-			stringBuffer.append(TEXT_11);

+			stringBuffer.append(genFeature.getAsInternalEObject("", false));

 			if (genFeature.isResolveProxies()) {

-				stringBuffer.append(TEXT_12);

+				stringBuffer.append(TEXT_11);

 				stringBuffer.append(genFeature.getAccessorName());

 			} else {

 				stringBuffer.append(genFeature.getGetAccessor());

 			}

-			stringBuffer.append(TEXT_13);

+			stringBuffer.append(TEXT_12);

 			stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 			stringBuffer.append(positiveOffsetCorrection);

-			stringBuffer.append(TEXT_14);

+			stringBuffer.append(TEXT_13);

 		} else if (!genFeature.isVolatile()) {

 			if (genModel.isVirtualDelegation()) {

 				if (!genModel.isSuppressNotification()) {

-					stringBuffer.append(TEXT_15);

+					stringBuffer.append(TEXT_14);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_16);

+					stringBuffer.append(TEXT_15);

 				}

-				stringBuffer.append(TEXT_17);

+				stringBuffer.append(TEXT_16);

 				stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 				stringBuffer.append(positiveOffsetCorrection);

-				stringBuffer.append(TEXT_18);

+				stringBuffer.append(TEXT_17);

 			} else {

 				if (!genModel.isSuppressNotification()) {

-					stringBuffer.append(TEXT_19);

+					stringBuffer.append(TEXT_18);

 					stringBuffer.append(genFeature.getImportedType(genClass));

-					stringBuffer.append(TEXT_20);

+					stringBuffer.append(TEXT_19);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_16);

+					stringBuffer.append(TEXT_15);

 					stringBuffer.append(genFeature.getSafeName());

-					stringBuffer.append(TEXT_21);

+					stringBuffer.append(TEXT_20);

 				}

-				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_18);

 				stringBuffer.append(genFeature.getSafeName());

-				stringBuffer.append(TEXT_22);

+				stringBuffer.append(TEXT_21);

 			}

 			if (genModel.isVirtualDelegation()) {

 				if (!genModel.isSuppressNotification()) {

-					stringBuffer.append(TEXT_23);

+					stringBuffer.append(TEXT_22);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_24);

+					stringBuffer.append(TEXT_23);

 				}

 			} else if (genClass.isESetFlag(genFeature)) {

 				if (!genModel.isSuppressNotification()) {

-					stringBuffer.append(TEXT_25);

+					stringBuffer.append(TEXT_24);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_26);

+					stringBuffer.append(TEXT_25);

 					stringBuffer.append(genClass.getESetFlagsField(genFeature));

-					stringBuffer.append(TEXT_27);

+					stringBuffer.append(TEXT_26);

 					stringBuffer.append(genFeature.getUpperName());

-					stringBuffer.append(TEXT_28);

+					stringBuffer.append(TEXT_27);

 				}

-				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_18);

 				stringBuffer.append(genClass.getESetFlagsField(genFeature));

-				stringBuffer.append(TEXT_29);

+				stringBuffer.append(TEXT_28);

 				stringBuffer.append(genFeature.getUpperName());

-				stringBuffer.append(TEXT_30);

+				stringBuffer.append(TEXT_29);

 			} else {

 				if (!genModel.isSuppressNotification()) {

-					stringBuffer.append(TEXT_25);

+					stringBuffer.append(TEXT_24);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_31);

+					stringBuffer.append(TEXT_30);

 					stringBuffer.append(genFeature.getUncapName());

-					stringBuffer.append(TEXT_32);

+					stringBuffer.append(TEXT_31);

 				}

-				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_18);

 				stringBuffer.append(genFeature.getUncapName());

-				stringBuffer.append(TEXT_33);

+				stringBuffer.append(TEXT_32);

 			}

 			if (!genModel.isSuppressNotification()) {

+				stringBuffer.append(TEXT_33);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

 				stringBuffer.append(TEXT_34);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

 				stringBuffer.append(TEXT_35);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

-				stringBuffer.append(TEXT_36);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

-				stringBuffer.append(TEXT_37);

+				stringBuffer.append(TEXT_36);

 				stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 				stringBuffer.append(positiveOffsetCorrection);

-				stringBuffer.append(TEXT_38);

+				stringBuffer.append(TEXT_37);

 				if (genModel.isVirtualDelegation()) {

+					stringBuffer.append(TEXT_38);

+					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_39);

-					stringBuffer.append(genFeature.getCapName());

+				} else {

 					stringBuffer.append(TEXT_40);

-				} else {

-					stringBuffer.append(TEXT_41);

 					stringBuffer.append(genFeature.getCapName());

 				}

-				stringBuffer.append(TEXT_42);

+				stringBuffer.append(TEXT_41);

 				if (genModel.isVirtualDelegation()) {

-					stringBuffer.append(TEXT_43);

+					stringBuffer.append(TEXT_42);

 				} else {

-					stringBuffer.append(TEXT_41);

+					stringBuffer.append(TEXT_40);

 					stringBuffer.append(genFeature.getCapName());

-					stringBuffer.append(TEXT_44);

+					stringBuffer.append(TEXT_43);

 				}

-				stringBuffer.append(TEXT_45);

+				stringBuffer.append(TEXT_44);

 			}

 		} else {

 			stringBuffer.append(TEXT_4);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -481,6 +493,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -496,7 +509,7 @@
 

 			//Class/basicUnsetGenFeature.todo.override.javajetinc

 		}

-		stringBuffer.append(TEXT_46);

+		stringBuffer.append(TEXT_45);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedeclaredFieldGenFeatureinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedeclaredFieldGenFeatureinsert.java
index ff619b7..b05737a 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedeclaredFieldGenFeatureinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedeclaredFieldGenFeatureinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedeclaredFieldGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedeclaredFieldGenFeatureoverride.java
index 10c0b13..d6ec393 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedeclaredFieldGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedeclaredFieldGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -133,6 +133,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -155,35 +157,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -222,6 +227,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -278,6 +284,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -329,6 +341,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -700,7 +713,7 @@
 		}

 		stringBuffer.append(TEXT_32);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.declaredFieldGenFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.declaredFieldGenFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -714,6 +727,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedynamicDelegation.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedynamicDelegation.java
new file mode 100644
index 0000000..75a35c2
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedynamicDelegation.java
@@ -0,0 +1,278 @@
+//Generated with EGF 1.6.0.201901231418

+package org.eclipse.egf.emf.pattern.model.call.Interface;

+

+import org.eclipse.egf.emf.pattern.base.*;

+import org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil;

+import org.eclipse.emf.codegen.ecore.genmodel.*;

+import org.eclipse.emf.codegen.ecore.genmodel.impl.*;

+import org.eclipse.emf.codegen.ecore.genmodel.generator.*;

+import org.eclipse.emf.codegen.util.*;

+import org.eclipse.emf.ecore.util.*;

+import org.eclipse.emf.common.util.*;

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class InterfacedynamicDelegation {

+	protected static String nl;

+

+	public static synchronized InterfacedynamicDelegation create(String lineSeparator) {

+		nl = lineSeparator;

+		InterfacedynamicDelegation result = new InterfacedynamicDelegation();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "";

+	protected final String TEXT_2 = NL;

+

+	public InterfacedynamicDelegation() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> genClassList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genPackageList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genModelList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isJDK50List = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isInterfaceList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isImplementationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isGWTList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> publicStaticFinalFlagList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> singleWildcardList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> negativeOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> positiveOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> negativeOperationOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> positiveOperationOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object genClassParameter : genClassList) {

+			for (Object genPackageParameter : genPackageList) {

+				for (Object genModelParameter : genModelList) {

+					for (Object isJDK50Parameter : isJDK50List) {

+						for (Object isInterfaceParameter : isInterfaceList) {

+							for (Object isImplementationParameter : isImplementationList) {

+								for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+									for (Object isGWTParameter : isGWTList) {

+										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+											for (Object singleWildcardParameter : singleWildcardList) {

+												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+

+																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																this.isGWT = (java.lang.Boolean) isGWTParameter;

+																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+

+																if (preCondition(ctx)) {

+																	ctx.setNode(new Node.Container(currentNode,

+																			getClass()));

+																	orchestration(ctx);

+																}

+

+															}

+														}

+													}

+												}

+											}

+										}

+									}

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_doGenerate(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("genClass", this.genClass);

+			parameterValues.put("genPackage", this.genPackage);

+			parameterValues.put("genModel", this.genModel);

+			parameterValues.put("isJDK50", this.isJDK50);

+			parameterValues.put("isInterface", this.isInterface);

+			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

+			parameterValues.put("isGWT", this.isGWT);

+			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

+			parameterValues.put("singleWildcard", this.singleWildcard);

+			parameterValues.put("negativeOffsetCorrection", this.negativeOffsetCorrection);

+			parameterValues.put("positiveOffsetCorrection", this.positiveOffsetCorrection);

+			parameterValues.put("negativeOperationOffsetCorrection", this.negativeOperationOffsetCorrection);

+			parameterValues.put("positiveOperationOffsetCorrection", this.positiveOperationOffsetCorrection);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenClass genClass = null;

+

+	public void set_genClass(org.eclipse.emf.codegen.ecore.genmodel.GenClass object) {

+		this.genClass = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenPackage genPackage = null;

+

+	public void set_genPackage(org.eclipse.emf.codegen.ecore.genmodel.GenPackage object) {

+		this.genPackage = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenModel genModel = null;

+

+	public void set_genModel(org.eclipse.emf.codegen.ecore.genmodel.GenModel object) {

+		this.genModel = object;

+	}

+

+	protected java.lang.Boolean isJDK50 = null;

+

+	public void set_isJDK50(java.lang.Boolean object) {

+		this.isJDK50 = object;

+	}

+

+	protected java.lang.Boolean isInterface = null;

+

+	public void set_isInterface(java.lang.Boolean object) {

+		this.isInterface = object;

+	}

+

+	protected java.lang.Boolean isImplementation = null;

+

+	public void set_isImplementation(java.lang.Boolean object) {

+		this.isImplementation = object;

+	}

+

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

+	protected java.lang.Boolean isGWT = null;

+

+	public void set_isGWT(java.lang.Boolean object) {

+		this.isGWT = object;

+	}

+

+	protected java.lang.String publicStaticFinalFlag = null;

+

+	public void set_publicStaticFinalFlag(java.lang.String object) {

+		this.publicStaticFinalFlag = object;

+	}

+

+	protected java.lang.String singleWildcard = null;

+

+	public void set_singleWildcard(java.lang.String object) {

+		this.singleWildcard = object;

+	}

+

+	protected java.lang.String negativeOffsetCorrection = null;

+

+	public void set_negativeOffsetCorrection(java.lang.String object) {

+		this.negativeOffsetCorrection = object;

+	}

+

+	protected java.lang.String positiveOffsetCorrection = null;

+

+	public void set_positiveOffsetCorrection(java.lang.String object) {

+		this.positiveOffsetCorrection = object;

+	}

+

+	protected java.lang.String negativeOperationOffsetCorrection = null;

+

+	public void set_negativeOperationOffsetCorrection(java.lang.String object) {

+		this.negativeOperationOffsetCorrection = object;

+	}

+

+	protected java.lang.String positiveOperationOffsetCorrection = null;

+

+	public void set_positiveOperationOffsetCorrection(java.lang.String object) {

+		this.positiveOperationOffsetCorrection = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("genClass", this.genClass);

+		parameters.put("genPackage", this.genPackage);

+		parameters.put("genModel", this.genModel);

+		parameters.put("isJDK50", this.isJDK50);

+		parameters.put("isInterface", this.isInterface);

+		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

+		parameters.put("isGWT", this.isGWT);

+		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

+		parameters.put("singleWildcard", this.singleWildcard);

+		parameters.put("negativeOffsetCorrection", this.negativeOffsetCorrection);

+		parameters.put("positiveOffsetCorrection", this.positiveOffsetCorrection);

+		parameters.put("negativeOperationOffsetCorrection", this.negativeOperationOffsetCorrection);

+		parameters.put("positiveOperationOffsetCorrection", this.positiveOperationOffsetCorrection);

+		return parameters;

+	}

+

+	protected void method_doGenerate(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

+}
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedynamicSetGenFeaturepostinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedynamicSetGenFeaturepostinsert.java
new file mode 100644
index 0000000..7dcc487
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedynamicSetGenFeaturepostinsert.java
@@ -0,0 +1,304 @@
+//Generated with EGF 1.6.0.201901231418

+package org.eclipse.egf.emf.pattern.model.call.Interface;

+

+import org.eclipse.egf.emf.pattern.base.*;

+import org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil;

+import org.eclipse.emf.codegen.ecore.genmodel.*;

+import org.eclipse.emf.codegen.ecore.genmodel.impl.*;

+import org.eclipse.emf.codegen.ecore.genmodel.generator.*;

+import org.eclipse.emf.codegen.util.*;

+import org.eclipse.emf.ecore.util.*;

+import org.eclipse.emf.common.util.*;

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class InterfacedynamicSetGenFeaturepostinsert {

+	protected static String nl;

+

+	public static synchronized InterfacedynamicSetGenFeaturepostinsert create(String lineSeparator) {

+		nl = lineSeparator;

+		InterfacedynamicSetGenFeaturepostinsert result = new InterfacedynamicSetGenFeaturepostinsert();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "";

+	protected final String TEXT_2 = NL;

+

+	public InterfacedynamicSetGenFeaturepostinsert() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> setAccessorOperationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genFeatureList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genClassList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genPackageList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genModelList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isJDK50List = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isInterfaceList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isImplementationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isGWTList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> publicStaticFinalFlagList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> singleWildcardList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> negativeOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> positiveOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> negativeOperationOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> positiveOperationOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object setAccessorOperationParameter : setAccessorOperationList) {

+			for (Object genFeatureParameter : genFeatureList) {

+				for (Object genClassParameter : genClassList) {

+					for (Object genPackageParameter : genPackageList) {

+						for (Object genModelParameter : genModelList) {

+							for (Object isJDK50Parameter : isJDK50List) {

+								for (Object isInterfaceParameter : isInterfaceList) {

+									for (Object isImplementationParameter : isImplementationList) {

+										for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+											for (Object isGWTParameter : isGWTList) {

+												for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+													for (Object singleWildcardParameter : singleWildcardList) {

+														for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+															for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+																for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																	for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+

+																		this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

+																		this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																		this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																		this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																		this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																		this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																		this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																		this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																		this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																		this.isGWT = (java.lang.Boolean) isGWTParameter;

+																		this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																		this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																		this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																		this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																		this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																		this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+

+																		if (preCondition(ctx)) {

+																			ctx.setNode(new Node.Container(currentNode,

+																					getClass()));

+																			orchestration(ctx);

+																		}

+

+																	}

+																}

+															}

+														}

+													}

+												}

+											}

+										}

+									}

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_doGenerate(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("setAccessorOperation", this.setAccessorOperation);

+			parameterValues.put("genFeature", this.genFeature);

+			parameterValues.put("genClass", this.genClass);

+			parameterValues.put("genPackage", this.genPackage);

+			parameterValues.put("genModel", this.genModel);

+			parameterValues.put("isJDK50", this.isJDK50);

+			parameterValues.put("isInterface", this.isInterface);

+			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

+			parameterValues.put("isGWT", this.isGWT);

+			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

+			parameterValues.put("singleWildcard", this.singleWildcard);

+			parameterValues.put("negativeOffsetCorrection", this.negativeOffsetCorrection);

+			parameterValues.put("positiveOffsetCorrection", this.positiveOffsetCorrection);

+			parameterValues.put("negativeOperationOffsetCorrection", this.negativeOperationOffsetCorrection);

+			parameterValues.put("positiveOperationOffsetCorrection", this.positiveOperationOffsetCorrection);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenOperation setAccessorOperation = null;

+

+	public void set_setAccessorOperation(org.eclipse.emf.codegen.ecore.genmodel.GenOperation object) {

+		this.setAccessorOperation = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenFeature genFeature = null;

+

+	public void set_genFeature(org.eclipse.emf.codegen.ecore.genmodel.GenFeature object) {

+		this.genFeature = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenClass genClass = null;

+

+	public void set_genClass(org.eclipse.emf.codegen.ecore.genmodel.GenClass object) {

+		this.genClass = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenPackage genPackage = null;

+

+	public void set_genPackage(org.eclipse.emf.codegen.ecore.genmodel.GenPackage object) {

+		this.genPackage = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenModel genModel = null;

+

+	public void set_genModel(org.eclipse.emf.codegen.ecore.genmodel.GenModel object) {

+		this.genModel = object;

+	}

+

+	protected java.lang.Boolean isJDK50 = null;

+

+	public void set_isJDK50(java.lang.Boolean object) {

+		this.isJDK50 = object;

+	}

+

+	protected java.lang.Boolean isInterface = null;

+

+	public void set_isInterface(java.lang.Boolean object) {

+		this.isInterface = object;

+	}

+

+	protected java.lang.Boolean isImplementation = null;

+

+	public void set_isImplementation(java.lang.Boolean object) {

+		this.isImplementation = object;

+	}

+

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

+	protected java.lang.Boolean isGWT = null;

+

+	public void set_isGWT(java.lang.Boolean object) {

+		this.isGWT = object;

+	}

+

+	protected java.lang.String publicStaticFinalFlag = null;

+

+	public void set_publicStaticFinalFlag(java.lang.String object) {

+		this.publicStaticFinalFlag = object;

+	}

+

+	protected java.lang.String singleWildcard = null;

+

+	public void set_singleWildcard(java.lang.String object) {

+		this.singleWildcard = object;

+	}

+

+	protected java.lang.String negativeOffsetCorrection = null;

+

+	public void set_negativeOffsetCorrection(java.lang.String object) {

+		this.negativeOffsetCorrection = object;

+	}

+

+	protected java.lang.String positiveOffsetCorrection = null;

+

+	public void set_positiveOffsetCorrection(java.lang.String object) {

+		this.positiveOffsetCorrection = object;

+	}

+

+	protected java.lang.String negativeOperationOffsetCorrection = null;

+

+	public void set_negativeOperationOffsetCorrection(java.lang.String object) {

+		this.negativeOperationOffsetCorrection = object;

+	}

+

+	protected java.lang.String positiveOperationOffsetCorrection = null;

+

+	public void set_positiveOperationOffsetCorrection(java.lang.String object) {

+		this.positiveOperationOffsetCorrection = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("setAccessorOperation", this.setAccessorOperation);

+		parameters.put("genFeature", this.genFeature);

+		parameters.put("genClass", this.genClass);

+		parameters.put("genPackage", this.genPackage);

+		parameters.put("genModel", this.genModel);

+		parameters.put("isJDK50", this.isJDK50);

+		parameters.put("isInterface", this.isInterface);

+		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

+		parameters.put("isGWT", this.isGWT);

+		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

+		parameters.put("singleWildcard", this.singleWildcard);

+		parameters.put("negativeOffsetCorrection", this.negativeOffsetCorrection);

+		parameters.put("positiveOffsetCorrection", this.positiveOffsetCorrection);

+		parameters.put("negativeOperationOffsetCorrection", this.negativeOperationOffsetCorrection);

+		parameters.put("positiveOperationOffsetCorrection", this.positiveOperationOffsetCorrection);

+		return parameters;

+	}

+

+	protected void method_doGenerate(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

+}
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedynamicSetGenFeaturepreinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedynamicSetGenFeaturepreinsert.java
new file mode 100644
index 0000000..0e64691
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacedynamicSetGenFeaturepreinsert.java
@@ -0,0 +1,304 @@
+//Generated with EGF 1.6.0.201901231418

+package org.eclipse.egf.emf.pattern.model.call.Interface;

+

+import org.eclipse.egf.emf.pattern.base.*;

+import org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil;

+import org.eclipse.emf.codegen.ecore.genmodel.*;

+import org.eclipse.emf.codegen.ecore.genmodel.impl.*;

+import org.eclipse.emf.codegen.ecore.genmodel.generator.*;

+import org.eclipse.emf.codegen.util.*;

+import org.eclipse.emf.ecore.util.*;

+import org.eclipse.emf.common.util.*;

+import org.eclipse.egf.common.helper.*;

+import java.util.*;

+import org.eclipse.emf.ecore.*;

+import org.eclipse.egf.model.pattern.*;

+import org.eclipse.egf.pattern.execution.*;

+import org.eclipse.egf.pattern.query.*;

+

+public class InterfacedynamicSetGenFeaturepreinsert {

+	protected static String nl;

+

+	public static synchronized InterfacedynamicSetGenFeaturepreinsert create(String lineSeparator) {

+		nl = lineSeparator;

+		InterfacedynamicSetGenFeaturepreinsert result = new InterfacedynamicSetGenFeaturepreinsert();

+		nl = null;

+		return result;

+	}

+

+	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

+	protected final String TEXT_1 = "";

+	protected final String TEXT_2 = NL;

+

+	public InterfacedynamicSetGenFeaturepreinsert() {

+		//Here is the constructor

+		StringBuffer stringBuffer = new StringBuffer();

+

+		// add initialisation of the pattern variables (declaration has been already done).

+

+	}

+

+	public String generate(Object argument) throws Exception {

+		final StringBuffer stringBuffer = new StringBuffer();

+

+		InternalPatternContext ctx = (InternalPatternContext) argument;

+		Map<String, String> queryCtx = null;

+		IQuery.ParameterDescription paramDesc = null;

+		Node.Container currentNode = ctx.getNode();

+

+		List<Object> setAccessorOperationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genFeatureList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genClassList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genPackageList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> genModelList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isJDK50List = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isInterfaceList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isImplementationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> isGWTList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> publicStaticFinalFlagList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> singleWildcardList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> negativeOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> positiveOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> negativeOperationOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> positiveOperationOffsetCorrectionList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+

+		for (Object setAccessorOperationParameter : setAccessorOperationList) {

+			for (Object genFeatureParameter : genFeatureList) {

+				for (Object genClassParameter : genClassList) {

+					for (Object genPackageParameter : genPackageList) {

+						for (Object genModelParameter : genModelList) {

+							for (Object isJDK50Parameter : isJDK50List) {

+								for (Object isInterfaceParameter : isInterfaceList) {

+									for (Object isImplementationParameter : isImplementationList) {

+										for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+											for (Object isGWTParameter : isGWTList) {

+												for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+													for (Object singleWildcardParameter : singleWildcardList) {

+														for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+															for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+																for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																	for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+

+																		this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

+																		this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																		this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																		this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																		this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																		this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																		this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																		this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																		this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																		this.isGWT = (java.lang.Boolean) isGWTParameter;

+																		this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																		this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																		this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																		this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																		this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																		this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+

+																		if (preCondition(ctx)) {

+																			ctx.setNode(new Node.Container(currentNode,

+																					getClass()));

+																			orchestration(ctx);

+																		}

+

+																	}

+																}

+															}

+														}

+													}

+												}

+											}

+										}

+									}

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+		ctx.setNode(currentNode);

+		if (ctx.useReporter()) {

+			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

+		}

+

+		stringBuffer.append(TEXT_1);

+		stringBuffer.append(TEXT_2);

+		return stringBuffer.toString();

+	}

+

+	public String orchestration(PatternContext ctx) throws Exception {

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+

+		method_doGenerate(new StringBuffer(), ictx);

+

+		if (ictx.useReporter()) {

+			Map<String, Object> parameterValues = new HashMap<String, Object>();

+			parameterValues.put("setAccessorOperation", this.setAccessorOperation);

+			parameterValues.put("genFeature", this.genFeature);

+			parameterValues.put("genClass", this.genClass);

+			parameterValues.put("genPackage", this.genPackage);

+			parameterValues.put("genModel", this.genModel);

+			parameterValues.put("isJDK50", this.isJDK50);

+			parameterValues.put("isInterface", this.isInterface);

+			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

+			parameterValues.put("isGWT", this.isGWT);

+			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

+			parameterValues.put("singleWildcard", this.singleWildcard);

+			parameterValues.put("negativeOffsetCorrection", this.negativeOffsetCorrection);

+			parameterValues.put("positiveOffsetCorrection", this.positiveOffsetCorrection);

+			parameterValues.put("negativeOperationOffsetCorrection", this.negativeOperationOffsetCorrection);

+			parameterValues.put("positiveOperationOffsetCorrection", this.positiveOperationOffsetCorrection);

+			String outputWithCallBack = OutputManager.computeLoopOutput(ictx);

+			String loop = OutputManager.computeLoopOutputWithoutCallback(ictx);

+			ictx.getReporter().loopFinished(loop, outputWithCallBack, ictx, parameterValues);

+		}

+		return null;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenOperation setAccessorOperation = null;

+

+	public void set_setAccessorOperation(org.eclipse.emf.codegen.ecore.genmodel.GenOperation object) {

+		this.setAccessorOperation = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenFeature genFeature = null;

+

+	public void set_genFeature(org.eclipse.emf.codegen.ecore.genmodel.GenFeature object) {

+		this.genFeature = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenClass genClass = null;

+

+	public void set_genClass(org.eclipse.emf.codegen.ecore.genmodel.GenClass object) {

+		this.genClass = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenPackage genPackage = null;

+

+	public void set_genPackage(org.eclipse.emf.codegen.ecore.genmodel.GenPackage object) {

+		this.genPackage = object;

+	}

+

+	protected org.eclipse.emf.codegen.ecore.genmodel.GenModel genModel = null;

+

+	public void set_genModel(org.eclipse.emf.codegen.ecore.genmodel.GenModel object) {

+		this.genModel = object;

+	}

+

+	protected java.lang.Boolean isJDK50 = null;

+

+	public void set_isJDK50(java.lang.Boolean object) {

+		this.isJDK50 = object;

+	}

+

+	protected java.lang.Boolean isInterface = null;

+

+	public void set_isInterface(java.lang.Boolean object) {

+		this.isInterface = object;

+	}

+

+	protected java.lang.Boolean isImplementation = null;

+

+	public void set_isImplementation(java.lang.Boolean object) {

+		this.isImplementation = object;

+	}

+

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

+	protected java.lang.Boolean isGWT = null;

+

+	public void set_isGWT(java.lang.Boolean object) {

+		this.isGWT = object;

+	}

+

+	protected java.lang.String publicStaticFinalFlag = null;

+

+	public void set_publicStaticFinalFlag(java.lang.String object) {

+		this.publicStaticFinalFlag = object;

+	}

+

+	protected java.lang.String singleWildcard = null;

+

+	public void set_singleWildcard(java.lang.String object) {

+		this.singleWildcard = object;

+	}

+

+	protected java.lang.String negativeOffsetCorrection = null;

+

+	public void set_negativeOffsetCorrection(java.lang.String object) {

+		this.negativeOffsetCorrection = object;

+	}

+

+	protected java.lang.String positiveOffsetCorrection = null;

+

+	public void set_positiveOffsetCorrection(java.lang.String object) {

+		this.positiveOffsetCorrection = object;

+	}

+

+	protected java.lang.String negativeOperationOffsetCorrection = null;

+

+	public void set_negativeOperationOffsetCorrection(java.lang.String object) {

+		this.negativeOperationOffsetCorrection = object;

+	}

+

+	protected java.lang.String positiveOperationOffsetCorrection = null;

+

+	public void set_positiveOperationOffsetCorrection(java.lang.String object) {

+		this.positiveOperationOffsetCorrection = object;

+	}

+

+	public Map<String, Object> getParameters() {

+		final Map<String, Object> parameters = new HashMap<String, Object>();

+		parameters.put("setAccessorOperation", this.setAccessorOperation);

+		parameters.put("genFeature", this.genFeature);

+		parameters.put("genClass", this.genClass);

+		parameters.put("genPackage", this.genPackage);

+		parameters.put("genModel", this.genModel);

+		parameters.put("isJDK50", this.isJDK50);

+		parameters.put("isInterface", this.isInterface);

+		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

+		parameters.put("isGWT", this.isGWT);

+		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

+		parameters.put("singleWildcard", this.singleWildcard);

+		parameters.put("negativeOffsetCorrection", this.negativeOffsetCorrection);

+		parameters.put("positiveOffsetCorrection", this.positiveOffsetCorrection);

+		parameters.put("negativeOperationOffsetCorrection", this.negativeOperationOffsetCorrection);

+		parameters.put("positiveOperationOffsetCorrection", this.positiveOperationOffsetCorrection);

+		return parameters;

+	}

+

+	protected void method_doGenerate(final StringBuffer stringBuffer, final PatternContext ctx) throws Exception {

+

+		InternalPatternContext ictx = (InternalPatternContext) ctx;

+		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

+	}

+

+	public boolean preCondition(PatternContext ctx) throws Exception {

+		return true;

+	}

+}
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceeIsSetoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceeIsSetoverride.java
index 9875866..adc4b44 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceeIsSetoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceeIsSetoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -109,6 +109,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -130,34 +132,37 @@
 					for (Object isJDK50Parameter : isJDK50List) {

 						for (Object isInterfaceParameter : isInterfaceList) {

 							for (Object isImplementationParameter : isImplementationList) {

-								for (Object isGWTParameter : isGWTList) {

-									for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-										for (Object singleWildcardParameter : singleWildcardList) {

-											for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-												for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-													for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-														for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+								for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+									for (Object isGWTParameter : isGWTList) {

+										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+											for (Object singleWildcardParameter : singleWildcardList) {

+												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-															this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-															this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-															this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-															this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-															this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-															this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-															this.isGWT = (java.lang.Boolean) isGWTParameter;

-															this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-															this.singleWildcard = (java.lang.String) singleWildcardParameter;

-															this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-															this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-															this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-															this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																this.isGWT = (java.lang.Boolean) isGWTParameter;

+																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-															if (preCondition(ctx)) {

-																ctx.setNode(

-																		new Node.Container(currentNode, getClass()));

-																orchestration(ctx);

+																if (preCondition(ctx)) {

+																	ctx.setNode(new Node.Container(currentNode,

+																			getClass()));

+																	orchestration(ctx);

+																}

+

 															}

-

 														}

 													}

 												}

@@ -194,6 +199,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -244,6 +250,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -294,6 +306,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceeUnsetoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceeUnsetoverride.java
index 2ff4c44..3336133 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceeUnsetoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceeUnsetoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -83,6 +83,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -104,34 +106,37 @@
 					for (Object isJDK50Parameter : isJDK50List) {

 						for (Object isInterfaceParameter : isInterfaceList) {

 							for (Object isImplementationParameter : isImplementationList) {

-								for (Object isGWTParameter : isGWTList) {

-									for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-										for (Object singleWildcardParameter : singleWildcardList) {

-											for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-												for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-													for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-														for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+								for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+									for (Object isGWTParameter : isGWTList) {

+										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+											for (Object singleWildcardParameter : singleWildcardList) {

+												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-															this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-															this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-															this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-															this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-															this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-															this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-															this.isGWT = (java.lang.Boolean) isGWTParameter;

-															this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-															this.singleWildcard = (java.lang.String) singleWildcardParameter;

-															this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-															this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-															this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-															this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																this.isGWT = (java.lang.Boolean) isGWTParameter;

+																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-															if (preCondition(ctx)) {

-																ctx.setNode(

-																		new Node.Container(currentNode, getClass()));

-																orchestration(ctx);

+																if (preCondition(ctx)) {

+																	ctx.setNode(new Node.Container(currentNode,

+																			getClass()));

+																	orchestration(ctx);

+																}

+

 															}

-

 														}

 													}

 												}

@@ -168,6 +173,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -218,6 +224,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -268,6 +280,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceegfCustomconstructoroverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceegfCustomconstructoroverride.java
index daf70e3..8a54f63 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceegfCustomconstructoroverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceegfCustomconstructoroverride.java
@@ -1,7 +1,8 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

+import org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil;

 import org.eclipse.emf.codegen.ecore.genmodel.*;

 import org.eclipse.emf.codegen.ecore.genmodel.impl.*;

 import org.eclipse.emf.codegen.ecore.genmodel.generator.*;

@@ -28,7 +29,6 @@
 	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

 	protected final String TEXT_1 = NL + "\t\tsuper();" + NL;

 	protected final String TEXT_2 = NL;

-	protected final String TEXT_3 = NL;

 

 	public InterfaceegfCustomconstructoroverride() {

 		//Here is the constructor

@@ -58,6 +58,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -79,34 +81,37 @@
 					for (Object isJDK50Parameter : isJDK50List) {

 						for (Object isInterfaceParameter : isInterfaceList) {

 							for (Object isImplementationParameter : isImplementationList) {

-								for (Object isGWTParameter : isGWTList) {

-									for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-										for (Object singleWildcardParameter : singleWildcardList) {

-											for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-												for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-													for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-														for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+								for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+									for (Object isGWTParameter : isGWTList) {

+										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+											for (Object singleWildcardParameter : singleWildcardList) {

+												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-															this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-															this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-															this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-															this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-															this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-															this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-															this.isGWT = (java.lang.Boolean) isGWTParameter;

-															this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-															this.singleWildcard = (java.lang.String) singleWildcardParameter;

-															this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-															this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-															this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-															this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																this.isGWT = (java.lang.Boolean) isGWTParameter;

+																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-															if (preCondition(ctx)) {

-																ctx.setNode(

-																		new Node.Container(currentNode, getClass()));

-																orchestration(ctx);

+																if (preCondition(ctx)) {

+																	ctx.setNode(new Node.Container(currentNode,

+																			getClass()));

+																	orchestration(ctx);

+																}

+

 															}

-

 														}

 													}

 												}

@@ -126,7 +131,7 @@
 		}

 

 		stringBuffer.append(TEXT_2);

-		stringBuffer.append(TEXT_3);

+		stringBuffer.append(TEXT_2);

 		return stringBuffer.toString();

 	}

 

@@ -143,6 +148,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -193,6 +199,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -243,6 +255,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenFeatureReifiedoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenFeatureReifiedoverride.java
index fc501f9..6c28305 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenFeatureReifiedoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenFeatureReifiedoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -116,6 +116,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -140,37 +142,40 @@
 								for (Object isJDK50Parameter : isJDK50List) {

 									for (Object isInterfaceParameter : isInterfaceList) {

 										for (Object isImplementationParameter : isImplementationList) {

-											for (Object isGWTParameter : isGWTList) {

-												for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-													for (Object singleWildcardParameter : singleWildcardList) {

-														for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-															for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-																for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-																	for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+											for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+												for (Object isGWTParameter : isGWTList) {

+													for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+														for (Object singleWildcardParameter : singleWildcardList) {

+															for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+																for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+																	for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																		for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																		this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																		this.classExtendsGenClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) classExtendsGenClassParameter;

-																		this.classExtendsAllGenFeatures = (java.util.List) classExtendsAllGenFeaturesParameter;

-																		this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																		this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																		this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																		this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																		this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																		this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																		this.isGWT = (java.lang.Boolean) isGWTParameter;

-																		this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																		this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																		this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																		this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																		this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																		this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																			this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																			this.classExtendsGenClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) classExtendsGenClassParameter;

+																			this.classExtendsAllGenFeatures = (java.util.List) classExtendsAllGenFeaturesParameter;

+																			this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																			this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																			this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																			this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																			this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																			this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																			this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																			this.isGWT = (java.lang.Boolean) isGWTParameter;

+																			this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																			this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																			this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																			this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																			this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																			this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																		if (preCondition(ctx)) {

-																			ctx.setNode(new Node.Container(currentNode,

-																					getClass()));

-																			orchestration(ctx);

+																			if (preCondition(ctx)) {

+																				ctx.setNode(new Node.Container(

+																						currentNode, getClass()));

+																				orchestration(ctx);

+																			}

+

 																		}

-

 																	}

 																}

 															}

@@ -213,6 +218,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -281,6 +287,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -334,6 +346,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -364,7 +377,7 @@
 			if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {

 				stringBuffer.append(TEXT_7);

 			}

-			if (classExtendsAllGenFeatures.contains(genFeature)) {

+			if (useInterfaceOverrideAnnotation || classExtendsAllGenFeatures.contains(genFeature)) {

 				stringBuffer.append(TEXT_8);

 			}

 			stringBuffer.append(TEXT_9);

@@ -415,7 +428,7 @@
 			if (isJDK50) { //Class/getGenFeature.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_25);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -429,6 +442,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -449,7 +463,7 @@
 			if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {

 				stringBuffer.append(TEXT_7);

 			}

-			if (classExtendsAllGenFeatures.contains(genFeature)) {

+			if (useInterfaceOverrideAnnotation || classExtendsAllGenFeatures.contains(genFeature)) {

 				stringBuffer.append(TEXT_8);

 			}

 			stringBuffer.append(TEXT_9);

@@ -462,7 +476,7 @@
 			stringBuffer.append(TEXT_11);

 			stringBuffer.append(TEXT_25);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -476,6 +490,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -535,7 +550,7 @@
 			if (isJDK50) { //Class/basicSetGenFeature.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_25);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -549,6 +564,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -595,7 +611,7 @@
 			if (isJDK50) { //Class/setGenFeature.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_25);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -609,6 +625,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenFeatureinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenFeatureinsert.java
index 52b3221..f299e2e 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenFeatureinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenFeatureinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenFeatureoverride.java
index 802b18b..27048da 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -37,48 +37,49 @@
 	protected final String TEXT_7 = "();" + NL;

 	protected final String TEXT_8 = NL + "\t@SuppressWarnings(\"unchecked\")";

 	protected final String TEXT_9 = NL + "\t@Deprecated";

-	protected final String TEXT_10 = NL + "\tpublic ";

-	protected final String TEXT_11 = "()" + NL + "\t{";

-	protected final String TEXT_12 = NL + "\t\t";

-	protected final String TEXT_13 = " list = (";

-	protected final String TEXT_14 = ")";

-	protected final String TEXT_15 = "();" + NL + "\t\tif (list.isEmpty()) return ";

-	protected final String TEXT_16 = "_EEMPTY_ARRAY;";

-	protected final String TEXT_17 = NL + "\t\tif (";

-	protected final String TEXT_18 = " == null || ";

-	protected final String TEXT_19 = ".isEmpty()) return ";

-	protected final String TEXT_20 = "_EEMPTY_ARRAY;" + NL + "\t\t";

-	protected final String TEXT_21 = ";";

-	protected final String TEXT_22 = NL + "\t\tlist.shrink();" + NL + "\t\treturn (";

-	protected final String TEXT_23 = "[])list.data();" + NL + "\t}" + NL;

-	protected final String TEXT_24 = " get";

-	protected final String TEXT_25 = "(int index);" + NL;

-	protected final String TEXT_26 = "(int index)" + NL + "\t{" + NL + "\t\treturn ";

-	protected final String TEXT_27 = "(";

-	protected final String TEXT_28 = "().get(index);" + NL + "\t}" + NL;

-	protected final String TEXT_29 = NL + "\tint get";

-	protected final String TEXT_30 = "Length();" + NL;

-	protected final String TEXT_31 = NL + "\tpublic int get";

-	protected final String TEXT_32 = "Length()" + NL + "\t{";

-	protected final String TEXT_33 = NL + "\t\treturn ";

-	protected final String TEXT_34 = "().size();";

-	protected final String TEXT_35 = " == null ? 0 : ";

-	protected final String TEXT_36 = ".size();";

-	protected final String TEXT_37 = NL + "\t}" + NL;

-	protected final String TEXT_38 = NL + "\tvoid set";

-	protected final String TEXT_39 = "[] new";

-	protected final String TEXT_40 = ");" + NL;

-	protected final String TEXT_41 = NL + "\tpublic void set";

-	protected final String TEXT_42 = ")" + NL + "\t{" + NL + "\t\t((";

-	protected final String TEXT_43 = "()).setData(new";

-	protected final String TEXT_44 = ".length, new";

-	protected final String TEXT_45 = ");" + NL + "\t}" + NL;

-	protected final String TEXT_46 = "(int index, ";

-	protected final String TEXT_47 = " element);" + NL;

-	protected final String TEXT_48 = " element)" + NL + "\t{" + NL + "\t\t";

-	protected final String TEXT_49 = "().set(index, element);" + NL + "\t}" + NL;

-	protected final String TEXT_50 = NL;

+	protected final String TEXT_10 = NL + "\t@Override";

+	protected final String TEXT_11 = NL + "\tpublic ";

+	protected final String TEXT_12 = "()" + NL + "\t{";

+	protected final String TEXT_13 = NL + "\t\t";

+	protected final String TEXT_14 = " list = (";

+	protected final String TEXT_15 = ")";

+	protected final String TEXT_16 = "();" + NL + "\t\tif (list.isEmpty()) return ";

+	protected final String TEXT_17 = "_EEMPTY_ARRAY;";

+	protected final String TEXT_18 = NL + "\t\tif (";

+	protected final String TEXT_19 = " == null || ";

+	protected final String TEXT_20 = ".isEmpty()) return ";

+	protected final String TEXT_21 = "_EEMPTY_ARRAY;" + NL + "\t\t";

+	protected final String TEXT_22 = ";";

+	protected final String TEXT_23 = NL + "\t\tlist.shrink();" + NL + "\t\treturn (";

+	protected final String TEXT_24 = "[])list.data();" + NL + "\t}" + NL;

+	protected final String TEXT_25 = " get";

+	protected final String TEXT_26 = "(int index);" + NL;

+	protected final String TEXT_27 = "(int index)" + NL + "\t{" + NL + "\t\treturn ";

+	protected final String TEXT_28 = "(";

+	protected final String TEXT_29 = "().get(index);" + NL + "\t}" + NL;

+	protected final String TEXT_30 = NL + "\tint get";

+	protected final String TEXT_31 = "Length();" + NL;

+	protected final String TEXT_32 = NL + "\tpublic int get";

+	protected final String TEXT_33 = "Length()" + NL + "\t{";

+	protected final String TEXT_34 = NL + "\t\treturn ";

+	protected final String TEXT_35 = "().size();";

+	protected final String TEXT_36 = " == null ? 0 : ";

+	protected final String TEXT_37 = ".size();";

+	protected final String TEXT_38 = NL + "\t}" + NL;

+	protected final String TEXT_39 = NL + "\tvoid set";

+	protected final String TEXT_40 = "[] new";

+	protected final String TEXT_41 = ");" + NL;

+	protected final String TEXT_42 = NL + "\tpublic void set";

+	protected final String TEXT_43 = ")" + NL + "\t{" + NL + "\t\t((";

+	protected final String TEXT_44 = "()).setData(new";

+	protected final String TEXT_45 = ".length, new";

+	protected final String TEXT_46 = ");" + NL + "\t}" + NL;

+	protected final String TEXT_47 = "(int index, ";

+	protected final String TEXT_48 = " element);" + NL;

+	protected final String TEXT_49 = " element)" + NL + "\t{" + NL + "\t\t";

+	protected final String TEXT_50 = "().set(index, element);" + NL + "\t}" + NL;

 	protected final String TEXT_51 = NL;

+	protected final String TEXT_52 = NL;

 

 	public InterfacegenFeatureoverride() {

 		//Here is the constructor

@@ -110,6 +111,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -132,35 +135,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -180,8 +186,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_51);

-		stringBuffer.append(TEXT_51);

+		stringBuffer.append(TEXT_52);

+		stringBuffer.append(TEXT_52);

 		return stringBuffer.toString();

 	}

 

@@ -199,6 +205,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -255,6 +262,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -306,6 +319,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -341,43 +355,46 @@
 				if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {

 					stringBuffer.append(TEXT_9);

 				}

-				stringBuffer.append(TEXT_10);

+				if (useInterfaceOverrideAnnotation) {

+					stringBuffer.append(TEXT_10);

+				}

+				stringBuffer.append(TEXT_11);

 				stringBuffer.append(arrayElementType);

 				stringBuffer.append(TEXT_6);

 				stringBuffer.append(genFeature.getGetArrayAccessor());

-				stringBuffer.append(TEXT_11);

+				stringBuffer.append(TEXT_12);

 				if (genFeature.isVolatile()) {

-					stringBuffer.append(TEXT_12);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

-					stringBuffer.append(genFeature.getListTemplateArguments(genClass));

 					stringBuffer.append(TEXT_13);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

 					stringBuffer.append(genFeature.getListTemplateArguments(genClass));

 					stringBuffer.append(TEXT_14);

-					stringBuffer.append(genFeature.getGetAccessor());

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

+					stringBuffer.append(genFeature.getListTemplateArguments(genClass));

 					stringBuffer.append(TEXT_15);

-					stringBuffer.append(genFeature.getUpperName());

+					stringBuffer.append(genFeature.getGetAccessor());

 					stringBuffer.append(TEXT_16);

-				} else {

+					stringBuffer.append(genFeature.getUpperName());

 					stringBuffer.append(TEXT_17);

-					stringBuffer.append(genFeature.getSafeName());

+				} else {

 					stringBuffer.append(TEXT_18);

 					stringBuffer.append(genFeature.getSafeName());

 					stringBuffer.append(TEXT_19);

-					stringBuffer.append(genFeature.getUpperName());

+					stringBuffer.append(genFeature.getSafeName());

 					stringBuffer.append(TEXT_20);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

-					stringBuffer.append(genFeature.getListTemplateArguments(genClass));

-					stringBuffer.append(TEXT_13);

+					stringBuffer.append(genFeature.getUpperName());

+					stringBuffer.append(TEXT_21);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

 					stringBuffer.append(genFeature.getListTemplateArguments(genClass));

 					stringBuffer.append(TEXT_14);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

+					stringBuffer.append(genFeature.getListTemplateArguments(genClass));

+					stringBuffer.append(TEXT_15);

 					stringBuffer.append(genFeature.getSafeName());

-					stringBuffer.append(TEXT_21);

+					stringBuffer.append(TEXT_22);

 				}

-				stringBuffer.append(TEXT_22);

-				stringBuffer.append(arrayElementType);

 				stringBuffer.append(TEXT_23);

+				stringBuffer.append(arrayElementType);

+				stringBuffer.append(TEXT_24);

 			}

 			stringBuffer.append(TEXT_2);

 			if (genFeature.hasAPITags()) {

@@ -391,22 +408,25 @@
 			if (!isImplementation) {

 				stringBuffer.append(TEXT_5);

 				stringBuffer.append(genFeature.getListItemType(genClass));

-				stringBuffer.append(TEXT_24);

-				stringBuffer.append(genFeature.getAccessorName());

 				stringBuffer.append(TEXT_25);

-			} else {

-				stringBuffer.append(TEXT_10);

-				stringBuffer.append(genFeature.getListItemType(genClass));

-				stringBuffer.append(TEXT_24);

 				stringBuffer.append(genFeature.getAccessorName());

 				stringBuffer.append(TEXT_26);

+			} else {

+				if (useInterfaceOverrideAnnotation) {

+					stringBuffer.append(TEXT_10);

+				}

+				stringBuffer.append(TEXT_11);

+				stringBuffer.append(genFeature.getListItemType(genClass));

+				stringBuffer.append(TEXT_25);

+				stringBuffer.append(genFeature.getAccessorName());

+				stringBuffer.append(TEXT_27);

 				if (!genModel.useGenerics()) {

-					stringBuffer.append(TEXT_27);

+					stringBuffer.append(TEXT_28);

 					stringBuffer.append(genFeature.getListItemType(genClass));

-					stringBuffer.append(TEXT_14);

+					stringBuffer.append(TEXT_15);

 				}

 				stringBuffer.append(genFeature.getGetAccessor());

-				stringBuffer.append(TEXT_28);

+				stringBuffer.append(TEXT_29);

 			}

 			stringBuffer.append(TEXT_2);

 			if (genFeature.hasAPITags()) {

@@ -418,25 +438,28 @@
 				stringBuffer.append(TEXT_9);

 			}

 			if (!isImplementation) {

-				stringBuffer.append(TEXT_29);

-				stringBuffer.append(genFeature.getAccessorName());

 				stringBuffer.append(TEXT_30);

-			} else {

-				stringBuffer.append(TEXT_31);

 				stringBuffer.append(genFeature.getAccessorName());

+				stringBuffer.append(TEXT_31);

+			} else {

+				if (useInterfaceOverrideAnnotation) {

+					stringBuffer.append(TEXT_10);

+				}

 				stringBuffer.append(TEXT_32);

+				stringBuffer.append(genFeature.getAccessorName());

+				stringBuffer.append(TEXT_33);

 				if (genFeature.isVolatile()) {

-					stringBuffer.append(TEXT_33);

-					stringBuffer.append(genFeature.getGetAccessor());

 					stringBuffer.append(TEXT_34);

-				} else {

-					stringBuffer.append(TEXT_33);

-					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(genFeature.getGetAccessor());

 					stringBuffer.append(TEXT_35);

+				} else {

+					stringBuffer.append(TEXT_34);

 					stringBuffer.append(genFeature.getSafeName());

 					stringBuffer.append(TEXT_36);

+					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(TEXT_37);

 				}

-				stringBuffer.append(TEXT_37);

+				stringBuffer.append(TEXT_38);

 			}

 			stringBuffer.append(TEXT_2);

 			if (genFeature.hasAPITags()) {

@@ -448,30 +471,33 @@
 				stringBuffer.append(TEXT_9);

 			}

 			if (!isImplementation) {

-				stringBuffer.append(TEXT_38);

-				stringBuffer.append(genFeature.getAccessorName());

-				stringBuffer.append(TEXT_27);

-				stringBuffer.append(genFeature.getListItemType(genClass));

 				stringBuffer.append(TEXT_39);

-				stringBuffer.append(genFeature.getCapName());

+				stringBuffer.append(genFeature.getAccessorName());

+				stringBuffer.append(TEXT_28);

+				stringBuffer.append(genFeature.getListItemType(genClass));

 				stringBuffer.append(TEXT_40);

-			} else {

-				stringBuffer.append(TEXT_41);

-				stringBuffer.append(genFeature.getAccessorName());

-				stringBuffer.append(TEXT_27);

-				stringBuffer.append(genFeature.getListItemType(genClass));

-				stringBuffer.append(TEXT_39);

 				stringBuffer.append(genFeature.getCapName());

+				stringBuffer.append(TEXT_41);

+			} else {

+				if (useInterfaceOverrideAnnotation) {

+					stringBuffer.append(TEXT_10);

+				}

 				stringBuffer.append(TEXT_42);

+				stringBuffer.append(genFeature.getAccessorName());

+				stringBuffer.append(TEXT_28);

+				stringBuffer.append(genFeature.getListItemType(genClass));

+				stringBuffer.append(TEXT_40);

+				stringBuffer.append(genFeature.getCapName());

+				stringBuffer.append(TEXT_43);

 				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

 				stringBuffer.append(genFeature.getListTemplateArguments(genClass));

-				stringBuffer.append(TEXT_14);

+				stringBuffer.append(TEXT_15);

 				stringBuffer.append(genFeature.getGetAccessor());

-				stringBuffer.append(TEXT_43);

-				stringBuffer.append(genFeature.getCapName());

 				stringBuffer.append(TEXT_44);

 				stringBuffer.append(genFeature.getCapName());

 				stringBuffer.append(TEXT_45);

+				stringBuffer.append(genFeature.getCapName());

+				stringBuffer.append(TEXT_46);

 			}

 			stringBuffer.append(TEXT_2);

 			if (genFeature.hasAPITags()) {

@@ -483,25 +509,28 @@
 				stringBuffer.append(TEXT_9);

 			}

 			if (!isImplementation) {

-				stringBuffer.append(TEXT_38);

+				stringBuffer.append(TEXT_39);

 				stringBuffer.append(genFeature.getAccessorName());

-				stringBuffer.append(TEXT_46);

-				stringBuffer.append(genFeature.getListItemType(genClass));

 				stringBuffer.append(TEXT_47);

-			} else {

-				stringBuffer.append(TEXT_41);

-				stringBuffer.append(genFeature.getAccessorName());

-				stringBuffer.append(TEXT_46);

 				stringBuffer.append(genFeature.getListItemType(genClass));

 				stringBuffer.append(TEXT_48);

-				stringBuffer.append(genFeature.getGetAccessor());

+			} else {

+				if (useInterfaceOverrideAnnotation) {

+					stringBuffer.append(TEXT_10);

+				}

+				stringBuffer.append(TEXT_42);

+				stringBuffer.append(genFeature.getAccessorName());

+				stringBuffer.append(TEXT_47);

+				stringBuffer.append(genFeature.getListItemType(genClass));

 				stringBuffer.append(TEXT_49);

+				stringBuffer.append(genFeature.getGetAccessor());

+				stringBuffer.append(TEXT_50);

 			}

 		}

 		if (genFeature.isGet() && (isImplementation || !genFeature.isSuppressedGetVisibility())) {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_51);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -515,6 +544,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -531,9 +561,9 @@
 			//Class/getGenFeature.override.javajetinc

 		}

 		if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicGet()) {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_51);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -547,6 +577,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -563,9 +594,9 @@
 			//Class/basicGetGenFeature.override.javajetinc

 		}

 		if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicSet()) {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_51);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -579,6 +610,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -595,9 +627,9 @@
 			//Class/basicSetGenFeature.override.javajetinc

 		}

 		if (genFeature.isSet() && (isImplementation || !genFeature.isSuppressedSetVisibility())) {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_51);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -611,6 +643,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -627,9 +660,9 @@
 			//Class/setGenFeature.override.javajetinc

 		}

 		if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicUnset()) {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_51);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -643,6 +676,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -659,9 +693,9 @@
 			//Class.basicUnsetGenFeature.override.javajetinc

 		}

 		if (genFeature.isUnset() && (isImplementation || !genFeature.isSuppressedUnsetVisibility())) {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_51);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -675,6 +709,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -691,9 +726,9 @@
 			//Class/unsetGenFeature.override.javajetinc

 		}

 		if (genFeature.isIsSet() && (isImplementation || !genFeature.isSuppressedIsSetVisibility())) {

-			stringBuffer.append(TEXT_50);

+			stringBuffer.append(TEXT_51);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -707,6 +742,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -722,9 +758,9 @@
 

 			//Class/isSetGenFeature.override.javajetinc

 		}

-		stringBuffer.append(TEXT_50);

+		stringBuffer.append(TEXT_51);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -738,6 +774,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

@@ -751,7 +788,7 @@
 			stringBuffer.setLength(0);

 		}

 

-		stringBuffer.append(TEXT_50);

+		stringBuffer.append(TEXT_51);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationannotationsinsert.java
index 4e5e8ee..81bc5c2 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationinsert.java
index 553043b..a506abe 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationjavadocinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationjavadocinsert.java
index f5e2ecb..6b6534c 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationjavadocinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationjavadocinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationjavadocoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationjavadocoverride.java
index 05e2726..617ea4b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationjavadocoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationjavadocoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -72,6 +72,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -94,35 +96,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -161,6 +166,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -217,6 +223,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -268,6 +280,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -283,7 +296,7 @@
 		stringBuffer.append(TEXT_1);

 		stringBuffer.append(TEXT_2);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.javadoc.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.javadoc.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -297,6 +310,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationoverride.java
index 661af5c..8339409 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegenOperationoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -55,54 +55,55 @@
 	protected final String TEXT_23 = NL + "\t";

 	protected final String TEXT_24 = ";" + NL;

 	protected final String TEXT_25 = NL + "\t@SuppressWarnings(\"unchecked\")";

-	protected final String TEXT_26 = NL + "\tpublic ";

-	protected final String TEXT_27 = NL + "\t{";

-	protected final String TEXT_28 = NL + "\t\t";

-	protected final String TEXT_29 = NL + "\t\treturn" + NL + "\t\t\t";

-	protected final String TEXT_30 = ".validate" + NL + "\t\t\t\t(";

-	protected final String TEXT_31 = "," + NL + "\t\t\t\t this," + NL + "\t\t\t\t ";

-	protected final String TEXT_32 = "," + NL + "\t\t\t\t ";

-	protected final String TEXT_33 = "," + NL + "\t\t\t\t \"";

-	protected final String TEXT_34 = "\",";

-	protected final String TEXT_35 = NL + "\t\t\t\t ";

-	protected final String TEXT_36 = "__EEXPRESSION," + NL + "\t\t\t\t ";

-	protected final String TEXT_37 = ".ERROR," + NL + "\t\t\t\t ";

-	protected final String TEXT_38 = ".DIAGNOSTIC_SOURCE," + NL + "\t\t\t\t ";

-	protected final String TEXT_39 = ".";

-	protected final String TEXT_40 = ");";

-	protected final String TEXT_41 = NL + "\t\t// TODO: implement this method" + NL

+	protected final String TEXT_26 = NL + "\t@Override";

+	protected final String TEXT_27 = NL + "\tpublic ";

+	protected final String TEXT_28 = NL + "\t{";

+	protected final String TEXT_29 = NL + "\t\t";

+	protected final String TEXT_30 = NL + "\t\treturn" + NL + "\t\t\t";

+	protected final String TEXT_31 = ".validate" + NL + "\t\t\t\t(";

+	protected final String TEXT_32 = "," + NL + "\t\t\t\t this," + NL + "\t\t\t\t ";

+	protected final String TEXT_33 = "," + NL + "\t\t\t\t ";

+	protected final String TEXT_34 = "," + NL + "\t\t\t\t \"";

+	protected final String TEXT_35 = "\",";

+	protected final String TEXT_36 = NL + "\t\t\t\t ";

+	protected final String TEXT_37 = "__EEXPRESSION," + NL + "\t\t\t\t ";

+	protected final String TEXT_38 = ".ERROR," + NL + "\t\t\t\t ";

+	protected final String TEXT_39 = ".DIAGNOSTIC_SOURCE," + NL + "\t\t\t\t ";

+	protected final String TEXT_40 = ".";

+	protected final String TEXT_41 = ");";

+	protected final String TEXT_42 = 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_42 = " != null)" + NL + "\t\t\t{" + NL + "\t\t\t\t";

-	protected final String TEXT_43 = ".add" + NL + "\t\t\t\t\t(new ";

-	protected final String TEXT_44 = NL + "\t\t\t\t\t\t(";

-	protected final String TEXT_45 = ".ERROR," + NL + "\t\t\t\t\t\t ";

-	protected final String TEXT_46 = ".DIAGNOSTIC_SOURCE," + NL + "\t\t\t\t\t\t ";

-	protected final String TEXT_47 = "," + NL + "\t\t\t\t\t\t ";

-	protected final String TEXT_48 = ".INSTANCE.getString(\"_UI_GenericInvariant_diagnostic\", new Object[] { \"";

-	protected final String TEXT_49 = "\", ";

-	protected final String TEXT_50 = ".getObjectLabel(this, ";

-	protected final String TEXT_51 = ") }),";

-	protected final String TEXT_52 = NL + "\t\t\t\t\t\t new Object [] { this }));" + NL + "\t\t\t}" + NL

+	protected final String TEXT_43 = " != null)" + NL + "\t\t\t{" + NL + "\t\t\t\t";

+	protected final String TEXT_44 = ".add" + NL + "\t\t\t\t\t(new ";

+	protected final String TEXT_45 = NL + "\t\t\t\t\t\t(";

+	protected final String TEXT_46 = ".ERROR," + NL + "\t\t\t\t\t\t ";

+	protected final String TEXT_47 = ".DIAGNOSTIC_SOURCE," + NL + "\t\t\t\t\t\t ";

+	protected final String TEXT_48 = "," + NL + "\t\t\t\t\t\t ";

+	protected final String TEXT_49 = ".INSTANCE.getString(\"_UI_GenericInvariant_diagnostic\", new Object[] { \"";

+	protected final String TEXT_50 = "\", ";

+	protected final String TEXT_51 = ".getObjectLabel(this, ";

+	protected final String TEXT_52 = ") }),";

+	protected final String TEXT_53 = 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_53 = NL + "\t\ttry" + NL + "\t\t{";

-	protected final String TEXT_54 = NL + "\t\t\t";

-	protected final String TEXT_55 = "__EINVOCATION_DELEGATE.dynamicInvoke(this, ";

-	protected final String TEXT_56 = "new ";

-	protected final String TEXT_57 = ".UnmodifiableEList<Object>(";

-	protected final String TEXT_58 = ", ";

-	protected final String TEXT_59 = "null";

-	protected final String TEXT_60 = NL + "\t\t\treturn ";

-	protected final String TEXT_61 = ").";

-	protected final String TEXT_62 = "()";

-	protected final String TEXT_63 = ";";

-	protected final String TEXT_64 = NL + "\t\t}" + NL + "\t\tcatch (";

-	protected final String TEXT_65 = " ite)" + NL + "\t\t{" + NL + "\t\t\tthrow new ";

-	protected final String TEXT_66 = "(ite);" + NL + "\t\t}";

-	protected final String TEXT_67 = NL + "\t}" + NL;

-	protected final String TEXT_68 = NL;

+	protected final String TEXT_54 = NL + "\t\ttry" + NL + "\t\t{";

+	protected final String TEXT_55 = NL + "\t\t\t";

+	protected final String TEXT_56 = "__EINVOCATION_DELEGATE.dynamicInvoke(this, ";

+	protected final String TEXT_57 = "new ";

+	protected final String TEXT_58 = ".UnmodifiableEList<Object>(";

+	protected final String TEXT_59 = ", ";

+	protected final String TEXT_60 = "null";

+	protected final String TEXT_61 = NL + "\t\t\treturn ";

+	protected final String TEXT_62 = ").";

+	protected final String TEXT_63 = "()";

+	protected final String TEXT_64 = ";";

+	protected final String TEXT_65 = NL + "\t\t}" + NL + "\t\tcatch (";

+	protected final String TEXT_66 = " ite)" + NL + "\t\t{" + NL + "\t\t\tthrow new ";

+	protected final String TEXT_67 = "(ite);" + NL + "\t\t}";

+	protected final String TEXT_68 = NL + "\t}" + NL;

+	protected final String TEXT_69 = NL;

 

 	public InterfacegenOperationoverride() {

 		//Here is the constructor

@@ -134,6 +135,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -156,35 +159,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -204,8 +210,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_68);

-		stringBuffer.append(TEXT_68);

+		stringBuffer.append(TEXT_69);

+		stringBuffer.append(TEXT_69);

 		return stringBuffer.toString();

 	}

 

@@ -223,6 +229,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -279,6 +286,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -330,6 +343,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -407,7 +421,7 @@
 		if (isInterface) {

 			stringBuffer.append(TEXT_14);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.javadoc.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.javadoc.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -421,6 +435,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -445,7 +460,7 @@
 			if (isJDK50) { //Class/genOperation.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_14);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.annotations.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.annotations.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -459,6 +474,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -493,7 +509,10 @@
 					&& genOperation.hasInvocationDelegate() && genOperation.isUncheckedCast(genClass)) {

 				stringBuffer.append(TEXT_25);

 			}

-			stringBuffer.append(TEXT_26);

+			if (useInterfaceOverrideAnnotation && !genClass.isMapEntry() && !genOperation.isSuppressedVisibility()) {

+				stringBuffer.append(TEXT_26);

+			}

+			stringBuffer.append(TEXT_27);

 			stringBuffer.append(genOperation.getTypeParameters(genClass));

 			stringBuffer.append(genOperation.getImportedType(genClass));

 			stringBuffer.append(TEXT_11);

@@ -502,91 +521,91 @@
 			stringBuffer.append(genOperation.getParameters(isImplementation, genClass));

 			stringBuffer.append(TEXT_6);

 			stringBuffer.append(genOperation.getThrows(genClass));

-			stringBuffer.append(TEXT_27);

+			stringBuffer.append(TEXT_28);

 			if (genOperation.hasBody()) {

-				stringBuffer.append(TEXT_28);

+				stringBuffer.append(TEXT_29);

 				stringBuffer.append(genOperation.getBody(genModel.getIndentation(stringBuffer)));

 			} else if (genOperation.isInvariant()) {

 				GenClass opClass = genOperation.getGenClass();

 				String diagnostics = genOperation.getGenParameters().get(0).getName();

 				String context = genOperation.getGenParameters().get(1).getName();

 				if (genOperation.hasInvariantExpression()) {

-					stringBuffer.append(TEXT_29);

-					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

 					stringBuffer.append(TEXT_30);

-					stringBuffer.append(genClass.getQualifiedClassifierAccessor());

+					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

 					stringBuffer.append(TEXT_31);

+					stringBuffer.append(genClass.getQualifiedClassifierAccessor());

+					stringBuffer.append(TEXT_32);

 					stringBuffer.append(diagnostics);

-					stringBuffer.append(TEXT_32);

-					stringBuffer.append(context);

 					stringBuffer.append(TEXT_33);

-					stringBuffer.append(genOperation.getValidationDelegate());

+					stringBuffer.append(context);

 					stringBuffer.append(TEXT_34);

-					stringBuffer.append(genModel.getNonNLS());

+					stringBuffer.append(genOperation.getValidationDelegate());

 					stringBuffer.append(TEXT_35);

+					stringBuffer.append(genModel.getNonNLS());

+					stringBuffer.append(TEXT_36);

 					stringBuffer.append(genOperation.getQualifiedOperationAccessor());

-					stringBuffer.append(TEXT_32);

+					stringBuffer.append(TEXT_33);

 					stringBuffer

 							.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));

-					stringBuffer.append(TEXT_36);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Diagnostic"));

 					stringBuffer.append(TEXT_37);

-					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Diagnostic"));

 					stringBuffer.append(TEXT_38);

 					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

 					stringBuffer.append(TEXT_39);

-					stringBuffer.append(opClass.getOperationID(genOperation));

+					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

 					stringBuffer.append(TEXT_40);

-				} else {

+					stringBuffer.append(opClass.getOperationID(genOperation));

 					stringBuffer.append(TEXT_41);

-					stringBuffer.append(diagnostics);

+				} else {

 					stringBuffer.append(TEXT_42);

 					stringBuffer.append(diagnostics);

 					stringBuffer.append(TEXT_43);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicDiagnostic"));

+					stringBuffer.append(diagnostics);

 					stringBuffer.append(TEXT_44);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Diagnostic"));

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicDiagnostic"));

 					stringBuffer.append(TEXT_45);

-					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.Diagnostic"));

 					stringBuffer.append(TEXT_46);

 					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

-					stringBuffer.append(TEXT_39);

-					stringBuffer.append(opClass.getOperationID(genOperation));

 					stringBuffer.append(TEXT_47);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.plugin.EcorePlugin"));

+					stringBuffer.append(opClass.getGenPackage().getImportedValidatorClassName());

+					stringBuffer.append(TEXT_40);

+					stringBuffer.append(opClass.getOperationID(genOperation));

 					stringBuffer.append(TEXT_48);

-					stringBuffer.append(genOperation.getName());

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.plugin.EcorePlugin"));

 					stringBuffer.append(TEXT_49);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.EObjectValidator"));

+					stringBuffer.append(genOperation.getName());

 					stringBuffer.append(TEXT_50);

-					stringBuffer.append(context);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.EObjectValidator"));

 					stringBuffer.append(TEXT_51);

+					stringBuffer.append(context);

+					stringBuffer.append(TEXT_52);

 					stringBuffer.append(genModel.getNonNLS());

 					stringBuffer.append(genModel.getNonNLS(2));

-					stringBuffer.append(TEXT_52);

+					stringBuffer.append(TEXT_53);

 				}

 			} else if (genOperation.hasInvocationDelegate()) {

 				int size = genOperation.getGenParameters().size();

-				stringBuffer.append(TEXT_53);

+				stringBuffer.append(TEXT_54);

 				if (genOperation.isVoid()) {

-					stringBuffer.append(TEXT_54);

+					stringBuffer.append(TEXT_55);

 					stringBuffer

 							.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));

-					stringBuffer.append(TEXT_55);

+					stringBuffer.append(TEXT_56);

 					if (size > 0) {

-						stringBuffer.append(TEXT_56);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

 						stringBuffer.append(TEXT_57);

-						stringBuffer.append(size);

+						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

 						stringBuffer.append(TEXT_58);

+						stringBuffer.append(size);

+						stringBuffer.append(TEXT_59);

 						stringBuffer.append(genOperation.getParametersArray(genClass));

 						stringBuffer.append(TEXT_6);

 					} else {

-						stringBuffer.append(TEXT_59);

+						stringBuffer.append(TEXT_60);

 					}

-					stringBuffer.append(TEXT_40);

+					stringBuffer.append(TEXT_41);

 				} else {

-					stringBuffer.append(TEXT_60);

+					stringBuffer.append(TEXT_61);

 					if (!isJDK50 && genOperation.isPrimitiveType()) {

 						stringBuffer.append(TEXT_3);

 					}

@@ -595,37 +614,37 @@
 					stringBuffer.append(TEXT_6);

 					stringBuffer

 							.append(CodeGenUtil.upperName(genClass.getUniqueName(genOperation), genModel.getLocale()));

-					stringBuffer.append(TEXT_55);

+					stringBuffer.append(TEXT_56);

 					if (size > 0) {

-						stringBuffer.append(TEXT_56);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

 						stringBuffer.append(TEXT_57);

-						stringBuffer.append(size);

+						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.BasicEList"));

 						stringBuffer.append(TEXT_58);

+						stringBuffer.append(size);

+						stringBuffer.append(TEXT_59);

 						stringBuffer.append(genOperation.getParametersArray(genClass));

 						stringBuffer.append(TEXT_6);

 					} else {

-						stringBuffer.append(TEXT_59);

+						stringBuffer.append(TEXT_60);

 					}

 					stringBuffer.append(TEXT_6);

 					if (!isJDK50 && genOperation.isPrimitiveType()) {

-						stringBuffer.append(TEXT_61);

-						stringBuffer.append(genOperation.getPrimitiveValueFunction());

 						stringBuffer.append(TEXT_62);

+						stringBuffer.append(genOperation.getPrimitiveValueFunction());

+						stringBuffer.append(TEXT_63);

 					}

-					stringBuffer.append(TEXT_63);

+					stringBuffer.append(TEXT_64);

 				}

-				stringBuffer.append(TEXT_64);

+				stringBuffer.append(TEXT_65);

 				stringBuffer

 						.append(genModel.getImportedName(isGWT ? "org.eclipse.emf.common.util.InvocationTargetException"

 								: "java.lang.reflect.InvocationTargetException"));

-				stringBuffer.append(TEXT_65);

-				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.WrappedException"));

 				stringBuffer.append(TEXT_66);

+				stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.util.WrappedException"));

+				stringBuffer.append(TEXT_67);

 			} else {

 				stringBuffer.append(TEXT_14);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.implementedGenOperation.TODO.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.implementedGenOperation.TODO.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -639,6 +658,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -654,11 +674,11 @@
 

 				//Class/implementedGenOperation.todo.override.javajetinc

 			}

-			stringBuffer.append(TEXT_67);

+			stringBuffer.append(TEXT_68);

 		}

 		stringBuffer.append(TEXT_14);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -672,6 +692,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeatureTODOoverride.java
index fde6f52..1832e49 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -70,6 +70,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -92,35 +94,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -159,6 +164,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -215,6 +221,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -266,6 +278,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeatureannotationsinsert.java
index 59dceb1..5ec9a46 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeaturejavadocinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeaturejavadocinsert.java
index fae678d..b11a8f7 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeaturejavadocinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeaturejavadocinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeaturejavadocoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeaturejavadocoverride.java
index ced6245..23f7c50 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeaturejavadocoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeaturejavadocoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -99,6 +99,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -121,35 +123,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -188,6 +193,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -244,6 +250,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -295,6 +307,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -381,7 +394,7 @@
 		}

 		stringBuffer.append(TEXT_19);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -395,6 +408,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeatureoverride.java
index 1676ae8..d826e86 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -38,98 +38,99 @@
 	protected final String TEXT_8 = " ";

 	protected final String TEXT_9 = "();" + NL;

 	protected final String TEXT_10 = NL + "\t@SuppressWarnings(\"unchecked\")";

-	protected final String TEXT_11 = NL + "\tpublic ";

-	protected final String TEXT_12 = "_";

-	protected final String TEXT_13 = "()" + NL + "\t{";

-	protected final String TEXT_14 = NL + "\t\treturn ";

-	protected final String TEXT_15 = "(";

-	protected final String TEXT_16 = ")eDynamicGet(";

-	protected final String TEXT_17 = " - ESTATIC_FEATURE_COUNT";

-	protected final String TEXT_18 = ", ";

-	protected final String TEXT_19 = ", true, ";

-	protected final String TEXT_20 = ")";

-	protected final String TEXT_21 = ").";

-	protected final String TEXT_22 = "()";

-	protected final String TEXT_23 = ";";

-	protected final String TEXT_24 = NL + "\t\t";

-	protected final String TEXT_25 = ")eGet(";

-	protected final String TEXT_26 = ", true)";

-	protected final String TEXT_27 = "__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false)";

-	protected final String TEXT_28 = " = (";

-	protected final String TEXT_29 = ")eVirtualGet(";

-	protected final String TEXT_30 = ");";

-	protected final String TEXT_31 = NL + "\t\tif (";

-	protected final String TEXT_32 = " == null)" + NL + "\t\t{";

-	protected final String TEXT_33 = NL + "\t\t\teVirtualSet(";

-	protected final String TEXT_34 = " = new ";

-	protected final String TEXT_35 = NL + "\t\t\t";

-	protected final String TEXT_36 = NL + "\t\t}" + NL + "\t\treturn ";

-	protected final String TEXT_37 = NL + "\t\tif (eContainerFeatureID() != ";

-	protected final String TEXT_38 = ") return null;" + NL + "\t\treturn (";

-	protected final String TEXT_39 = "eContainer";

-	protected final String TEXT_40 = "eInternalContainer";

-	protected final String TEXT_41 = "();";

-	protected final String TEXT_42 = " != null && ";

-	protected final String TEXT_43 = ".eIsProxy())" + NL + "\t\t{" + NL + "\t\t\t";

-	protected final String TEXT_44 = " old";

-	protected final String TEXT_45 = ";" + NL + "\t\t\t";

+	protected final String TEXT_11 = NL + "\t@Override";

+	protected final String TEXT_12 = NL + "\tpublic ";

+	protected final String TEXT_13 = "_";

+	protected final String TEXT_14 = "()" + NL + "\t{";

+	protected final String TEXT_15 = NL + "\t\treturn ";

+	protected final String TEXT_16 = "(";

+	protected final String TEXT_17 = ")eDynamicGet(";

+	protected final String TEXT_18 = " - ESTATIC_FEATURE_COUNT";

+	protected final String TEXT_19 = ", ";

+	protected final String TEXT_20 = ", true, ";

+	protected final String TEXT_21 = ")";

+	protected final String TEXT_22 = ").";

+	protected final String TEXT_23 = "()";

+	protected final String TEXT_24 = ";";

+	protected final String TEXT_25 = NL + "\t\t";

+	protected final String TEXT_26 = ")eGet(";

+	protected final String TEXT_27 = ", true)";

+	protected final String TEXT_28 = "__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false)";

+	protected final String TEXT_29 = " = (";

+	protected final String TEXT_30 = ")eVirtualGet(";

+	protected final String TEXT_31 = ");";

+	protected final String TEXT_32 = NL + "\t\tif (";

+	protected final String TEXT_33 = " == null)" + NL + "\t\t{";

+	protected final String TEXT_34 = NL + "\t\t\teVirtualSet(";

+	protected final String TEXT_35 = " = new ";

+	protected final String TEXT_36 = NL + "\t\t\t";

+	protected final String TEXT_37 = NL + "\t\t}" + NL + "\t\treturn ";

+	protected final String TEXT_38 = NL + "\t\tif (eContainerFeatureID() != ";

+	protected final String TEXT_39 = ") return null;" + NL + "\t\treturn (";

+	protected final String TEXT_40 = "eContainer";

+	protected final String TEXT_41 = "eInternalContainer";

+	protected final String TEXT_42 = "();";

+	protected final String TEXT_43 = " != null && ";

+	protected final String TEXT_44 = ".eIsProxy())" + NL + "\t\t{" + NL + "\t\t\t";

+	protected final String TEXT_45 = " old";

 	protected final String TEXT_46 = " = ";

-	protected final String TEXT_47 = "eResolveProxy(old";

-	protected final String TEXT_48 = ");" + NL + "\t\t\tif (";

-	protected final String TEXT_49 = " != old";

-	protected final String TEXT_50 = ")" + NL + "\t\t\t{";

-	protected final String TEXT_51 = NL + "\t\t\t\t";

-	protected final String TEXT_52 = " new";

-	protected final String TEXT_53 = " msgs = old";

-	protected final String TEXT_54 = ".eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

-	protected final String TEXT_55 = ", null, null);";

-	protected final String TEXT_56 = " msgs =  old";

-	protected final String TEXT_57 = ".eInverseRemove(this, ";

-	protected final String TEXT_58 = ".class, null);";

-	protected final String TEXT_59 = NL + "\t\t\t\tif (new";

-	protected final String TEXT_60 = ".eInternalContainer() == null)" + NL + "\t\t\t\t{";

-	protected final String TEXT_61 = NL + "\t\t\t\t\tmsgs = new";

-	protected final String TEXT_62 = ".eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ";

-	protected final String TEXT_63 = ", null, msgs);";

-	protected final String TEXT_64 = NL + "\t\t\t\t\tmsgs =  new";

-	protected final String TEXT_65 = ".eInverseAdd(this, ";

-	protected final String TEXT_66 = ".class, msgs);";

-	protected final String TEXT_67 = NL + "\t\t\t\t}" + NL + "\t\t\t\tif (msgs != null) msgs.dispatch();";

-	protected final String TEXT_68 = NL + "\t\t\t\teVirtualSet(";

-	protected final String TEXT_69 = NL + "\t\t\t\tif (eNotificationRequired())" + NL + "\t\t\t\t\teNotify(new ";

-	protected final String TEXT_70 = "(this, ";

-	protected final String TEXT_71 = ".RESOLVE, ";

-	protected final String TEXT_72 = ", old";

-	protected final String TEXT_73 = "));";

-	protected final String TEXT_74 = NL + "\t\t\t}" + NL + "\t\t}";

-	protected final String TEXT_75 = NL + "\t\treturn (";

-	protected final String TEXT_76 = " & ";

-	protected final String TEXT_77 = "_EFLAG) != 0;";

-	protected final String TEXT_78 = "_EFLAG_VALUES[(";

-	protected final String TEXT_79 = "_EFLAG) >>> ";

-	protected final String TEXT_80 = "_EFLAG_OFFSET];";

-	protected final String TEXT_81 = " = basicGet";

-	protected final String TEXT_82 = "();" + NL + "\t\treturn ";

-	protected final String TEXT_83 = ".eIsProxy() ? ";

-	protected final String TEXT_84 = "eResolveProxy((";

-	protected final String TEXT_85 = ") : ";

-	protected final String TEXT_86 = NL + "\t\treturn new ";

-	protected final String TEXT_87 = "((";

-	protected final String TEXT_88 = ".Internal)((";

-	protected final String TEXT_89 = ".Internal.Wrapper)get";

-	protected final String TEXT_90 = "()).featureMap().";

-	protected final String TEXT_91 = "list(";

-	protected final String TEXT_92 = ")get";

-	protected final String TEXT_93 = "().";

-	protected final String TEXT_94 = NL + "\t\treturn ((";

-	protected final String TEXT_95 = "()).featureMap().list(";

-	protected final String TEXT_96 = NL + "\t\treturn get";

-	protected final String TEXT_97 = "().list(";

-	protected final String TEXT_98 = "()).featureMap().get(";

-	protected final String TEXT_99 = "get";

-	protected final String TEXT_100 = "().get(";

-	protected final String TEXT_101 = NL + "\t}" + NL;

-	protected final String TEXT_102 = NL;

+	protected final String TEXT_47 = ";" + NL + "\t\t\t";

+	protected final String TEXT_48 = "eResolveProxy(old";

+	protected final String TEXT_49 = ");" + NL + "\t\t\tif (";

+	protected final String TEXT_50 = " != old";

+	protected final String TEXT_51 = ")" + NL + "\t\t\t{";

+	protected final String TEXT_52 = NL + "\t\t\t\t";

+	protected final String TEXT_53 = " new";

+	protected final String TEXT_54 = " msgs = old";

+	protected final String TEXT_55 = ".eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

+	protected final String TEXT_56 = ", null, null);";

+	protected final String TEXT_57 = " msgs =  old";

+	protected final String TEXT_58 = ".eInverseRemove(this, ";

+	protected final String TEXT_59 = ".class, null);";

+	protected final String TEXT_60 = NL + "\t\t\t\tif (new";

+	protected final String TEXT_61 = ".eInternalContainer() == null)" + NL + "\t\t\t\t{";

+	protected final String TEXT_62 = NL + "\t\t\t\t\tmsgs = new";

+	protected final String TEXT_63 = ".eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ";

+	protected final String TEXT_64 = ", null, msgs);";

+	protected final String TEXT_65 = NL + "\t\t\t\t\tmsgs =  new";

+	protected final String TEXT_66 = ".eInverseAdd(this, ";

+	protected final String TEXT_67 = ".class, msgs);";

+	protected final String TEXT_68 = NL + "\t\t\t\t}" + NL + "\t\t\t\tif (msgs != null) msgs.dispatch();";

+	protected final String TEXT_69 = NL + "\t\t\t\teVirtualSet(";

+	protected final String TEXT_70 = NL + "\t\t\t\tif (eNotificationRequired())" + NL + "\t\t\t\t\teNotify(new ";

+	protected final String TEXT_71 = "(this, ";

+	protected final String TEXT_72 = ".RESOLVE, ";

+	protected final String TEXT_73 = ", old";

+	protected final String TEXT_74 = "));";

+	protected final String TEXT_75 = NL + "\t\t\t}" + NL + "\t\t}";

+	protected final String TEXT_76 = NL + "\t\treturn (";

+	protected final String TEXT_77 = " & ";

+	protected final String TEXT_78 = "_EFLAG) != 0;";

+	protected final String TEXT_79 = "_EFLAG_VALUES[(";

+	protected final String TEXT_80 = "_EFLAG) >>> ";

+	protected final String TEXT_81 = "_EFLAG_OFFSET];";

+	protected final String TEXT_82 = " = basicGet";

+	protected final String TEXT_83 = "();" + NL + "\t\treturn ";

+	protected final String TEXT_84 = ".eIsProxy() ? ";

+	protected final String TEXT_85 = "eResolveProxy(";

+	protected final String TEXT_86 = ") : ";

+	protected final String TEXT_87 = NL + "\t\treturn new ";

+	protected final String TEXT_88 = "((";

+	protected final String TEXT_89 = ".Internal)((";

+	protected final String TEXT_90 = ".Internal.Wrapper)get";

+	protected final String TEXT_91 = "()).featureMap().";

+	protected final String TEXT_92 = "list(";

+	protected final String TEXT_93 = ")get";

+	protected final String TEXT_94 = "().";

+	protected final String TEXT_95 = NL + "\t\treturn ((";

+	protected final String TEXT_96 = "()).featureMap().list(";

+	protected final String TEXT_97 = NL + "\t\treturn get";

+	protected final String TEXT_98 = "().list(";

+	protected final String TEXT_99 = "()).featureMap().get(";

+	protected final String TEXT_100 = "get";

+	protected final String TEXT_101 = "().get(";

+	protected final String TEXT_102 = NL + "\t}" + NL;

+	protected final String TEXT_103 = NL;

 

 	public InterfacegetGenFeatureoverride() {

 		//Here is the constructor

@@ -161,6 +162,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -183,35 +186,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -231,8 +237,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_102);

-		stringBuffer.append(TEXT_102);

+		stringBuffer.append(TEXT_103);

+		stringBuffer.append(TEXT_103);

 		return stringBuffer.toString();

 	}

 

@@ -250,6 +256,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -306,6 +313,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -357,6 +370,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -373,7 +387,7 @@
 		if (isInterface) {

 			stringBuffer.append(TEXT_2);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -387,6 +401,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -411,7 +426,7 @@
 			if (isJDK50) { //Class/getGenFeature.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -425,6 +440,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -459,17 +475,22 @@
 					|| genFeature.isListType() && genFeature.hasSettingDelegate())) {

 				stringBuffer.append(TEXT_10);

 			}

-			stringBuffer.append(TEXT_11);

+			if (useInterfaceOverrideAnnotation && !genClass.isMapEntry()

+					&& !genClass.hasCollidingGetAccessorOperation(genFeature)

+					&& !genFeature.isSuppressedGetVisibility()) {

+				stringBuffer.append(TEXT_11);

+			}

+			stringBuffer.append(TEXT_12);

 			stringBuffer.append(genFeature.getImportedType(genClass));

 			stringBuffer.append(TEXT_8);

 			stringBuffer.append(genFeature.getGetAccessor());

 			if (genClass.hasCollidingGetAccessorOperation(genFeature)) {

-				stringBuffer.append(TEXT_12);

+				stringBuffer.append(TEXT_13);

 			}

-			stringBuffer.append(TEXT_13);

+			stringBuffer.append(TEXT_14);

 			stringBuffer.append(TEXT_2);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -483,6 +504,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -497,303 +519,297 @@
 			}

 

 			if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {

-				stringBuffer.append(TEXT_14);

-				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_15);

-				}

 				stringBuffer.append(TEXT_15);

-				stringBuffer.append(genFeature.getObjectType(genClass));

+				if (!isJDK50 && genFeature.isPrimitiveType()) {

+					stringBuffer.append(TEXT_16);

+				}

 				stringBuffer.append(TEXT_16);

+				stringBuffer.append(genFeature.getObjectType(genClass));

+				stringBuffer.append(TEXT_17);

 				stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 				if (genClass.hasStaticFeatures()) {

-					stringBuffer.append(TEXT_17);

+					stringBuffer.append(TEXT_18);

 				}

-				stringBuffer.append(TEXT_18);

-				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

 				stringBuffer.append(TEXT_19);

-				stringBuffer.append(!genFeature.isEffectiveSuppressEMFTypes());

+				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

 				stringBuffer.append(TEXT_20);

+				stringBuffer.append(!genFeature.isEffectiveSuppressEMFTypes());

+				stringBuffer.append(TEXT_21);

 				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_21);

-					stringBuffer.append(genFeature.getPrimitiveValueFunction());

 					stringBuffer.append(TEXT_22);

-				}

-				stringBuffer.append(TEXT_23);

-			} else if (genModel.isReflectiveDelegation()) {

-				if (genFeature.hasGetterBody()) {

-					stringBuffer.append(TEXT_24);

-					stringBuffer.append(genFeature.getGetterBody(genModel.getIndentation(stringBuffer)));

-				} else {

-					stringBuffer.append(TEXT_14);

-					if (!isJDK50 && genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_15);

-					}

-					stringBuffer.append(TEXT_15);

-					stringBuffer.append(genFeature.getObjectType(genClass));

-					stringBuffer.append(TEXT_25);

-					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-					stringBuffer.append(TEXT_26);

-					if (!isJDK50 && genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_21);

-						stringBuffer.append(genFeature.getPrimitiveValueFunction());

-						stringBuffer.append(TEXT_22);

-					}

+					stringBuffer.append(genFeature.getPrimitiveValueFunction());

 					stringBuffer.append(TEXT_23);

 				}

-			} else if (genFeature.hasSettingDelegate()) {

-				stringBuffer.append(TEXT_14);

-				if (!isJDK50 && genFeature.isPrimitiveType()) {

+				stringBuffer.append(TEXT_24);

+			} else if (genModel.isReflectiveDelegation()) {

+				if (genFeature.hasGetterBody()) {

+					stringBuffer.append(TEXT_25);

+					stringBuffer.append(genFeature.getGetterBody(genModel.getIndentation(stringBuffer)));

+				} else {

 					stringBuffer.append(TEXT_15);

+					if (!isJDK50 && genFeature.isPrimitiveType()) {

+						stringBuffer.append(TEXT_16);

+					}

+					stringBuffer.append(TEXT_16);

+					stringBuffer.append(genFeature.getObjectType(genClass));

+					stringBuffer.append(TEXT_26);

+					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+					stringBuffer.append(TEXT_27);

+					if (!isJDK50 && genFeature.isPrimitiveType()) {

+						stringBuffer.append(TEXT_22);

+						stringBuffer.append(genFeature.getPrimitiveValueFunction());

+						stringBuffer.append(TEXT_23);

+					}

+					stringBuffer.append(TEXT_24);

 				}

+			} else if (genFeature.hasSettingDelegate()) {

 				stringBuffer.append(TEXT_15);

-				stringBuffer.append(genFeature.getObjectType(genClass));

-				stringBuffer.append(TEXT_20);

-				stringBuffer.append(genFeature.getUpperName());

-				stringBuffer.append(TEXT_27);

 				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_21);

-					stringBuffer.append(genFeature.getPrimitiveValueFunction());

-					stringBuffer.append(TEXT_22);

+					stringBuffer.append(TEXT_16);

 				}

-				stringBuffer.append(TEXT_23);

+				stringBuffer.append(TEXT_16);

+				stringBuffer.append(genFeature.getObjectType(genClass));

+				stringBuffer.append(TEXT_21);

+				stringBuffer.append(genFeature.getUpperName());

+				stringBuffer.append(TEXT_28);

+				if (!isJDK50 && genFeature.isPrimitiveType()) {

+					stringBuffer.append(TEXT_22);

+					stringBuffer.append(genFeature.getPrimitiveValueFunction());

+					stringBuffer.append(TEXT_23);

+				}

+				stringBuffer.append(TEXT_24);

 			} else if (!genFeature.isVolatile()) {

 				if (genFeature.isListType()) {

 					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_24);

+						stringBuffer.append(TEXT_25);

 						stringBuffer.append(genFeature.getImportedType(genClass));

 						stringBuffer.append(TEXT_8);

 						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_28);

-						stringBuffer.append(genFeature.getImportedType(genClass));

 						stringBuffer.append(TEXT_29);

+						stringBuffer.append(genFeature.getImportedType(genClass));

+						stringBuffer.append(TEXT_30);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_30);

+						stringBuffer.append(TEXT_31);

 					}

-					stringBuffer.append(TEXT_31);

-					stringBuffer.append(genFeature.getSafeName());

 					stringBuffer.append(TEXT_32);

+					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(TEXT_33);

 					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_33);

+						stringBuffer.append(TEXT_34);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_18);

+						stringBuffer.append(TEXT_19);

 						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_34);

-						stringBuffer.append(genClass.getListConstructor(genFeature));

-						stringBuffer.append(TEXT_30);

-					} else {

 						stringBuffer.append(TEXT_35);

-						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_34);

 						stringBuffer.append(genClass.getListConstructor(genFeature));

-						stringBuffer.append(TEXT_23);

+						stringBuffer.append(TEXT_31);

+					} else {

+						stringBuffer.append(TEXT_36);

+						stringBuffer.append(genFeature.getSafeName());

+						stringBuffer.append(TEXT_35);

+						stringBuffer.append(genClass.getListConstructor(genFeature));

+						stringBuffer.append(TEXT_24);

 					}

-					stringBuffer.append(TEXT_36);

+					stringBuffer.append(TEXT_37);

 					stringBuffer.append(genFeature.getSafeName());

 					stringBuffer

 							.append(genFeature.isMapType() && genFeature.isEffectiveSuppressEMFTypes() ? ".map()" : "");

-					stringBuffer.append(TEXT_23);

+					stringBuffer.append(TEXT_24);

 				} else if (genFeature.isContainer()) {

-					stringBuffer.append(TEXT_37);

+					stringBuffer.append(TEXT_38);

 					stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 					stringBuffer.append(positiveOffsetCorrection);

-					stringBuffer.append(TEXT_38);

+					stringBuffer.append(TEXT_39);

 					stringBuffer.append(genFeature.getImportedType(genClass));

-					stringBuffer.append(TEXT_20);

+					stringBuffer.append(TEXT_21);

 					if (genFeature.isResolveProxies()) {

-						stringBuffer.append(TEXT_39);

-					} else {

 						stringBuffer.append(TEXT_40);

+					} else {

+						stringBuffer.append(TEXT_41);

 					}

-					stringBuffer.append(TEXT_41);

+					stringBuffer.append(TEXT_42);

 				} else {

 					if (genFeature.isResolveProxies()) {

 						if (genModel.isVirtualDelegation()) {

-							stringBuffer.append(TEXT_24);

+							stringBuffer.append(TEXT_25);

 							stringBuffer.append(genFeature.getImportedType(genClass));

 							stringBuffer.append(TEXT_8);

 							stringBuffer.append(genFeature.getSafeName());

-							stringBuffer.append(TEXT_28);

-							stringBuffer.append(genFeature.getImportedType(genClass));

 							stringBuffer.append(TEXT_29);

+							stringBuffer.append(genFeature.getImportedType(genClass));

+							stringBuffer.append(TEXT_30);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

 							if (genFeature.hasEDefault()) {

-								stringBuffer.append(TEXT_18);

+								stringBuffer.append(TEXT_19);

 								stringBuffer.append(genFeature.getEDefault());

 							}

-							stringBuffer.append(TEXT_30);

+							stringBuffer.append(TEXT_31);

 						}

-						stringBuffer.append(TEXT_31);

+						stringBuffer.append(TEXT_32);

 						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_42);

-						stringBuffer.append(genFeature.getSafeNameAsEObject());

 						stringBuffer.append(TEXT_43);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

+						stringBuffer.append(genFeature.getSafeNameAsEObject());

 						stringBuffer.append(TEXT_44);

-						stringBuffer.append(genFeature.getCapName());

-						stringBuffer.append(TEXT_28);

 						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-						stringBuffer.append(TEXT_20);

-						stringBuffer.append(genFeature.getSafeName());

 						stringBuffer.append(TEXT_45);

+						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(TEXT_46);

+						stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), false));

+						stringBuffer.append(TEXT_47);

 						stringBuffer.append(genFeature.getSafeName());

 						stringBuffer.append(TEXT_46);

 						stringBuffer.append(genFeature.getNonEObjectInternalTypeCast(genClass));

-						stringBuffer.append(TEXT_47);

-						stringBuffer.append(genFeature.getCapName());

 						stringBuffer.append(TEXT_48);

-						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_49);

 						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(TEXT_49);

+						stringBuffer.append(genFeature.getSafeName());

 						stringBuffer.append(TEXT_50);

+						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(TEXT_51);

 						if (genFeature.isEffectiveContains()) {

-							stringBuffer.append(TEXT_51);

-							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

 							stringBuffer.append(TEXT_52);

-							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_28);

 							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-							stringBuffer.append(TEXT_20);

-							stringBuffer.append(genFeature.getSafeName());

-							stringBuffer.append(TEXT_23);

-							if (!genFeature.isBidirectional()) {

-								stringBuffer.append(TEXT_51);

-								stringBuffer.append(

-										genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

-								stringBuffer.append(TEXT_53);

-								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_54);

-								stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

-								stringBuffer.append(negativeOffsetCorrection);

-								stringBuffer.append(TEXT_55);

-							} else {

-								GenFeature reverseFeature = genFeature.getReverse();

-								GenClass targetClass = reverseFeature.getGenClass();

-								String reverseOffsetCorrection = targetClass.hasOffsetCorrection()

-										? " + " + genClass.getOffsetCorrectionField(genFeature)

-										: "";

-								stringBuffer.append(TEXT_51);

-								stringBuffer.append(

-										genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

-								stringBuffer.append(TEXT_56);

-								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_57);

-								stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

-								stringBuffer.append(reverseOffsetCorrection);

-								stringBuffer.append(TEXT_18);

-								stringBuffer.append(targetClass.getRawImportedInterfaceName());

-								stringBuffer.append(TEXT_58);

-							}

-							stringBuffer.append(TEXT_59);

+							stringBuffer.append(TEXT_53);

 							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_60);

+							stringBuffer.append(TEXT_46);

+							stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), false));

+							stringBuffer.append(TEXT_24);

 							if (!genFeature.isBidirectional()) {

-								stringBuffer.append(TEXT_61);

+								stringBuffer.append(TEXT_52);

+								stringBuffer.append(

+										genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

+								stringBuffer.append(TEXT_54);

 								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_62);

+								stringBuffer.append(TEXT_55);

 								stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 								stringBuffer.append(negativeOffsetCorrection);

-								stringBuffer.append(TEXT_63);

+								stringBuffer.append(TEXT_56);

 							} else {

 								GenFeature reverseFeature = genFeature.getReverse();

 								GenClass targetClass = reverseFeature.getGenClass();

 								String reverseOffsetCorrection = targetClass.hasOffsetCorrection()

 										? " + " + genClass.getOffsetCorrectionField(genFeature)

 										: "";

-								stringBuffer.append(TEXT_64);

+								stringBuffer.append(TEXT_52);

+								stringBuffer.append(

+										genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

+								stringBuffer.append(TEXT_57);

 								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_65);

+								stringBuffer.append(TEXT_58);

 								stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

 								stringBuffer.append(reverseOffsetCorrection);

-								stringBuffer.append(TEXT_18);

+								stringBuffer.append(TEXT_19);

 								stringBuffer.append(targetClass.getRawImportedInterfaceName());

-								stringBuffer.append(TEXT_66);

+								stringBuffer.append(TEXT_59);

 							}

-							stringBuffer.append(TEXT_67);

-						} else if (genModel.isVirtualDelegation()) {

+							stringBuffer.append(TEXT_60);

+							stringBuffer.append(genFeature.getCapName());

+							stringBuffer.append(TEXT_61);

+							if (!genFeature.isBidirectional()) {

+								stringBuffer.append(TEXT_62);

+								stringBuffer.append(genFeature.getCapName());

+								stringBuffer.append(TEXT_63);

+								stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

+								stringBuffer.append(negativeOffsetCorrection);

+								stringBuffer.append(TEXT_64);

+							} else {

+								GenFeature reverseFeature = genFeature.getReverse();

+								GenClass targetClass = reverseFeature.getGenClass();

+								String reverseOffsetCorrection = targetClass.hasOffsetCorrection()

+										? " + " + genClass.getOffsetCorrectionField(genFeature)

+										: "";

+								stringBuffer.append(TEXT_65);

+								stringBuffer.append(genFeature.getCapName());

+								stringBuffer.append(TEXT_66);

+								stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

+								stringBuffer.append(reverseOffsetCorrection);

+								stringBuffer.append(TEXT_19);

+								stringBuffer.append(targetClass.getRawImportedInterfaceName());

+								stringBuffer.append(TEXT_67);

+							}

 							stringBuffer.append(TEXT_68);

+						} else if (genModel.isVirtualDelegation()) {

+							stringBuffer.append(TEXT_69);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_18);

+							stringBuffer.append(TEXT_19);

 							stringBuffer.append(genFeature.getSafeName());

-							stringBuffer.append(TEXT_30);

+							stringBuffer.append(TEXT_31);

 						}

 						if (!genModel.isSuppressNotification()) {

-							stringBuffer.append(TEXT_69);

+							stringBuffer.append(TEXT_70);

 							stringBuffer

 									.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

-							stringBuffer.append(TEXT_70);

-							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

 							stringBuffer.append(TEXT_71);

+							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

+							stringBuffer.append(TEXT_72);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_72);

-							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_18);

-							stringBuffer.append(genFeature.getSafeName());

 							stringBuffer.append(TEXT_73);

+							stringBuffer.append(genFeature.getCapName());

+							stringBuffer.append(TEXT_19);

+							stringBuffer.append(genFeature.getSafeName());

+							stringBuffer.append(TEXT_74);

 						}

-						stringBuffer.append(TEXT_74);

+						stringBuffer.append(TEXT_75);

 					}

 					if (!genFeature.isResolveProxies() && genModel.isVirtualDelegation()

 							&& !genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_75);

+						stringBuffer.append(TEXT_76);

 						stringBuffer.append(genFeature.getImportedType(genClass));

-						stringBuffer.append(TEXT_29);

+						stringBuffer.append(TEXT_30);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

 						if (genFeature.hasEDefault()) {

-							stringBuffer.append(TEXT_18);

+							stringBuffer.append(TEXT_19);

 							stringBuffer.append(genFeature.getEDefault());

 						}

-						stringBuffer.append(TEXT_30);

+						stringBuffer.append(TEXT_31);

 					} else if (genClass.isFlag(genFeature)) {

 						if (genFeature.isBooleanType()) {

-							stringBuffer.append(TEXT_75);

-							stringBuffer.append(genClass.getFlagsField(genFeature));

 							stringBuffer.append(TEXT_76);

-							stringBuffer.append(genFeature.getUpperName());

+							stringBuffer.append(genClass.getFlagsField(genFeature));

 							stringBuffer.append(TEXT_77);

-						} else {

-							stringBuffer.append(TEXT_14);

 							stringBuffer.append(genFeature.getUpperName());

 							stringBuffer.append(TEXT_78);

-							stringBuffer.append(genClass.getFlagsField(genFeature));

-							stringBuffer.append(TEXT_76);

+						} else {

+							stringBuffer.append(TEXT_15);

 							stringBuffer.append(genFeature.getUpperName());

 							stringBuffer.append(TEXT_79);

+							stringBuffer.append(genClass.getFlagsField(genFeature));

+							stringBuffer.append(TEXT_77);

 							stringBuffer.append(genFeature.getUpperName());

 							stringBuffer.append(TEXT_80);

+							stringBuffer.append(genFeature.getUpperName());

+							stringBuffer.append(TEXT_81);

 						}

 					} else {

-						stringBuffer.append(TEXT_14);

+						stringBuffer.append(TEXT_15);

 						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_23);

+						stringBuffer.append(TEXT_24);

 					}

 				}

 			} else {//volatile

 				if (genFeature.isResolveProxies() && !genFeature.isListType()) {

-					stringBuffer.append(TEXT_24);

+					stringBuffer.append(TEXT_25);

 					stringBuffer.append(genFeature.getImportedType(genClass));

 					stringBuffer.append(TEXT_8);

 					stringBuffer.append(genFeature.getSafeName());

-					stringBuffer.append(TEXT_81);

-					stringBuffer.append(genFeature.getAccessorName());

 					stringBuffer.append(TEXT_82);

-					stringBuffer.append(genFeature.getSafeName());

-					stringBuffer.append(TEXT_42);

-					stringBuffer.append(genFeature.getSafeNameAsEObject());

+					stringBuffer.append(genFeature.getAccessorName());

 					stringBuffer.append(TEXT_83);

-					stringBuffer.append(genFeature.getNonEObjectInternalTypeCast(genClass));

+					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(TEXT_43);

+					stringBuffer.append(genFeature.getSafeNameAsEObject());

 					stringBuffer.append(TEXT_84);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-					stringBuffer.append(TEXT_20);

-					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(genFeature.getNonEObjectInternalTypeCast(genClass));

 					stringBuffer.append(TEXT_85);

+					stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), false));

+					stringBuffer.append(TEXT_86);

 					stringBuffer.append(genFeature.getSafeName());

-					stringBuffer.append(TEXT_23);

+					stringBuffer.append(TEXT_24);

 				} else if (genFeature.hasDelegateFeature()) {

 					GenFeature delegateFeature = genFeature.getDelegateFeature();

 					if (genFeature.isFeatureMapType()) {

@@ -801,106 +817,106 @@
 								? "<" + genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap") + ".Entry>"

 								: "";

 						if (delegateFeature.isWrappedFeatureMapType()) {

-							stringBuffer.append(TEXT_86);

-							stringBuffer.append(genFeature.getImportedEffectiveFeatureMapWrapperClass());

 							stringBuffer.append(TEXT_87);

-							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

+							stringBuffer.append(genFeature.getImportedEffectiveFeatureMapWrapperClass());

 							stringBuffer.append(TEXT_88);

 							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

 							stringBuffer.append(TEXT_89);

-							stringBuffer.append(delegateFeature.getAccessorName());

-							stringBuffer.append(TEXT_90);

-							stringBuffer.append(featureMapEntryTemplateArgument);

-							stringBuffer.append(TEXT_91);

-							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-							stringBuffer.append(TEXT_73);

-						} else {

-							stringBuffer.append(TEXT_75);

 							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

-							stringBuffer.append(TEXT_92);

+							stringBuffer.append(TEXT_90);

 							stringBuffer.append(delegateFeature.getAccessorName());

-							stringBuffer.append(TEXT_93);

-							stringBuffer.append(featureMapEntryTemplateArgument);

 							stringBuffer.append(TEXT_91);

+							stringBuffer.append(featureMapEntryTemplateArgument);

+							stringBuffer.append(TEXT_92);

 							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-							stringBuffer.append(TEXT_30);

+							stringBuffer.append(TEXT_74);

+						} else {

+							stringBuffer.append(TEXT_76);

+							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

+							stringBuffer.append(TEXT_93);

+							stringBuffer.append(delegateFeature.getAccessorName());

+							stringBuffer.append(TEXT_94);

+							stringBuffer.append(featureMapEntryTemplateArgument);

+							stringBuffer.append(TEXT_92);

+							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+							stringBuffer.append(TEXT_31);

 						}

 					} else if (genFeature.isListType()) {

 						if (delegateFeature.isWrappedFeatureMapType()) {

-							stringBuffer.append(TEXT_94);

-							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

-							stringBuffer.append(TEXT_89);

-							stringBuffer.append(delegateFeature.getAccessorName());

 							stringBuffer.append(TEXT_95);

-							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-							stringBuffer.append(TEXT_30);

-						} else {

-							stringBuffer.append(TEXT_96);

-							stringBuffer.append(delegateFeature.getAccessorName());

-							stringBuffer.append(TEXT_97);

-							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-							stringBuffer.append(TEXT_30);

-						}

-					} else {

-						if (delegateFeature.isWrappedFeatureMapType()) {

-							stringBuffer.append(TEXT_14);

-							if (!isJDK50 && genFeature.isPrimitiveType()) {

-								stringBuffer.append(TEXT_15);

-							}

-							if (genFeature.getTypeGenDataType() == null

-									|| !genFeature.getTypeGenDataType().isObjectType()) {

-								stringBuffer.append(TEXT_15);

-								stringBuffer.append(genFeature.getObjectType(genClass));

-								stringBuffer.append(TEXT_20);

-							}

-							stringBuffer.append(TEXT_87);

 							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

-							stringBuffer.append(TEXT_89);

+							stringBuffer.append(TEXT_90);

+							stringBuffer.append(delegateFeature.getAccessorName());

+							stringBuffer.append(TEXT_96);

+							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+							stringBuffer.append(TEXT_31);

+						} else {

+							stringBuffer.append(TEXT_97);

 							stringBuffer.append(delegateFeature.getAccessorName());

 							stringBuffer.append(TEXT_98);

 							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-							stringBuffer.append(TEXT_26);

+							stringBuffer.append(TEXT_31);

+						}

+					} else {

+						if (delegateFeature.isWrappedFeatureMapType()) {

+							stringBuffer.append(TEXT_15);

 							if (!isJDK50 && genFeature.isPrimitiveType()) {

-								stringBuffer.append(TEXT_21);

-								stringBuffer.append(genFeature.getPrimitiveValueFunction());

-								stringBuffer.append(TEXT_22);

-							}

-							stringBuffer.append(TEXT_23);

-						} else {

-							stringBuffer.append(TEXT_14);

-							if (!isJDK50 && genFeature.isPrimitiveType()) {

-								stringBuffer.append(TEXT_15);

+								stringBuffer.append(TEXT_16);

 							}

 							if (genFeature.getTypeGenDataType() == null

 									|| !genFeature.getTypeGenDataType().isObjectType()) {

-								stringBuffer.append(TEXT_15);

+								stringBuffer.append(TEXT_16);

 								stringBuffer.append(genFeature.getObjectType(genClass));

-								stringBuffer.append(TEXT_20);

-							}

-							stringBuffer.append(TEXT_99);

-							stringBuffer.append(delegateFeature.getAccessorName());

-							stringBuffer.append(TEXT_100);

-							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-							stringBuffer.append(TEXT_26);

-							if (!isJDK50 && genFeature.isPrimitiveType()) {

 								stringBuffer.append(TEXT_21);

-								stringBuffer.append(genFeature.getPrimitiveValueFunction());

-								stringBuffer.append(TEXT_22);

 							}

-							stringBuffer.append(TEXT_23);

+							stringBuffer.append(TEXT_88);

+							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

+							stringBuffer.append(TEXT_90);

+							stringBuffer.append(delegateFeature.getAccessorName());

+							stringBuffer.append(TEXT_99);

+							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+							stringBuffer.append(TEXT_27);

+							if (!isJDK50 && genFeature.isPrimitiveType()) {

+								stringBuffer.append(TEXT_22);

+								stringBuffer.append(genFeature.getPrimitiveValueFunction());

+								stringBuffer.append(TEXT_23);

+							}

+							stringBuffer.append(TEXT_24);

+						} else {

+							stringBuffer.append(TEXT_15);

+							if (!isJDK50 && genFeature.isPrimitiveType()) {

+								stringBuffer.append(TEXT_16);

+							}

+							if (genFeature.getTypeGenDataType() == null

+									|| !genFeature.getTypeGenDataType().isObjectType()) {

+								stringBuffer.append(TEXT_16);

+								stringBuffer.append(genFeature.getObjectType(genClass));

+								stringBuffer.append(TEXT_21);

+							}

+							stringBuffer.append(TEXT_100);

+							stringBuffer.append(delegateFeature.getAccessorName());

+							stringBuffer.append(TEXT_101);

+							stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+							stringBuffer.append(TEXT_27);

+							if (!isJDK50 && genFeature.isPrimitiveType()) {

+								stringBuffer.append(TEXT_22);

+								stringBuffer.append(genFeature.getPrimitiveValueFunction());

+								stringBuffer.append(TEXT_23);

+							}

+							stringBuffer.append(TEXT_24);

 						}

 					}

 				} else if (genClass.getGetAccessorOperation(genFeature) != null) {

-					stringBuffer.append(TEXT_24);

+					stringBuffer.append(TEXT_25);

 					stringBuffer.append(genClass.getGetAccessorOperation(genFeature)

 							.getBody(genModel.getIndentation(stringBuffer)));

 				} else if (genFeature.hasGetterBody()) {

-					stringBuffer.append(TEXT_24);

+					stringBuffer.append(TEXT_25);

 					stringBuffer.append(genFeature.getGetterBody(genModel.getIndentation(stringBuffer)));

 				} else {

 					stringBuffer.append(TEXT_2);

 					{

-						//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+						//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 						InternalPatternContext ictx = (InternalPatternContext) ctx;

 						new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -914,6 +930,7 @@
 						callParameters.put("isJDK50", isJDK50);

 						callParameters.put("isInterface", isInterface);

 						callParameters.put("isImplementation", isImplementation);

+						callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 						callParameters.put("isGWT", isGWT);

 						callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 						callParameters.put("singleWildcard", singleWildcard);

@@ -930,7 +947,7 @@
 					//Class/getGenFeature.todo.override.javajetinc

 				}

 			}

-			stringBuffer.append(TEXT_101);

+			stringBuffer.append(TEXT_102);

 		}

 		stringBuffer.append(TEXT_2);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeaturepreinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeaturepreinsert.java
index e23f81e..ecf3e07 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeaturepreinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacegetGenFeaturepreinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceimplementedGenOperationTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceimplementedGenOperationTODOoverride.java
index 48a8215..d1c09b4 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceimplementedGenOperationTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceimplementedGenOperationTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -62,6 +62,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -84,35 +86,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) genOperationParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -151,6 +156,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -207,6 +213,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -258,6 +270,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/Interfaceinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/Interfaceinsert.java
index 56bb981..506d474 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/Interfaceinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/Interfaceinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -58,6 +58,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -79,34 +81,37 @@
 					for (Object isJDK50Parameter : isJDK50List) {

 						for (Object isInterfaceParameter : isInterfaceList) {

 							for (Object isImplementationParameter : isImplementationList) {

-								for (Object isGWTParameter : isGWTList) {

-									for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-										for (Object singleWildcardParameter : singleWildcardList) {

-											for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-												for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-													for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-														for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+								for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+									for (Object isGWTParameter : isGWTList) {

+										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+											for (Object singleWildcardParameter : singleWildcardList) {

+												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-															this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-															this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-															this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-															this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-															this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-															this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-															this.isGWT = (java.lang.Boolean) isGWTParameter;

-															this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-															this.singleWildcard = (java.lang.String) singleWildcardParameter;

-															this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-															this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-															this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-															this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																this.isGWT = (java.lang.Boolean) isGWTParameter;

+																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-															if (preCondition(ctx)) {

-																ctx.setNode(

-																		new Node.Container(currentNode, getClass()));

-																orchestration(ctx);

+																if (preCondition(ctx)) {

+																	ctx.setNode(new Node.Container(currentNode,

+																			getClass()));

+																	orchestration(ctx);

+																}

+

 															}

-

 														}

 													}

 												}

@@ -143,6 +148,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -193,6 +199,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -243,6 +255,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/Interfaceinterfacejavadocoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/Interfaceinterfacejavadocoverride.java
index 02c5070..b0927c2 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/Interfaceinterfacejavadocoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/Interfaceinterfacejavadocoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -79,6 +79,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -100,34 +102,37 @@
 					for (Object isJDK50Parameter : isJDK50List) {

 						for (Object isInterfaceParameter : isInterfaceList) {

 							for (Object isImplementationParameter : isImplementationList) {

-								for (Object isGWTParameter : isGWTList) {

-									for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-										for (Object singleWildcardParameter : singleWildcardList) {

-											for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-												for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-													for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-														for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+								for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+									for (Object isGWTParameter : isGWTList) {

+										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+											for (Object singleWildcardParameter : singleWildcardList) {

+												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-															this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-															this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-															this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-															this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-															this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-															this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-															this.isGWT = (java.lang.Boolean) isGWTParameter;

-															this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-															this.singleWildcard = (java.lang.String) singleWildcardParameter;

-															this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-															this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-															this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-															this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																this.isGWT = (java.lang.Boolean) isGWTParameter;

+																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-															if (preCondition(ctx)) {

-																ctx.setNode(

-																		new Node.Container(currentNode, getClass()));

-																orchestration(ctx);

+																if (preCondition(ctx)) {

+																	ctx.setNode(new Node.Container(currentNode,

+																			getClass()));

+																	orchestration(ctx);

+																}

+

 															}

-

 														}

 													}

 												}

@@ -164,6 +169,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -214,6 +220,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -264,6 +276,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeatureTODOoverride.java
index 3997e79..1bc66c1 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -64,6 +64,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -86,35 +88,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -153,6 +158,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -209,6 +215,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -260,6 +272,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeatureannotationsinsert.java
index 4b50f24..0c82603 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeaturejavadocinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeaturejavadocinsert.java
index fdd9989..a5d585d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeaturejavadocinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeaturejavadocinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeaturejavadocoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeaturejavadocoverride.java
index 0b246e0..0b354c1 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeaturejavadocoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeaturejavadocoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -76,6 +76,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -98,35 +100,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -165,6 +170,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -221,6 +227,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -272,6 +284,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -295,7 +308,7 @@
 		stringBuffer.append(TEXT_5);

 		stringBuffer.append(TEXT_6);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -309,6 +322,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeatureoverride.java
index cbe7070..6eaa119 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceisSetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -36,37 +36,38 @@
 	protected final String TEXT_6 = NL + "\t@Deprecated";

 	protected final String TEXT_7 = NL + "\tboolean isSet";

 	protected final String TEXT_8 = "();" + NL;

-	protected final String TEXT_9 = NL + "\tpublic boolean isSet";

-	protected final String TEXT_10 = "_";

-	protected final String TEXT_11 = "()" + NL + "\t{";

-	protected final String TEXT_12 = NL + "\t\treturn eDynamicIsSet(";

-	protected final String TEXT_13 = " - ESTATIC_FEATURE_COUNT";

-	protected final String TEXT_14 = ", ";

-	protected final String TEXT_15 = ");";

-	protected final String TEXT_16 = NL + "\t\treturn eIsSet(";

-	protected final String TEXT_17 = NL + "\t\treturn ";

-	protected final String TEXT_18 = "__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);";

-	protected final String TEXT_19 = NL + "\t\t";

-	protected final String TEXT_20 = " ";

-	protected final String TEXT_21 = " = (";

-	protected final String TEXT_22 = ")eVirtualGet(";

-	protected final String TEXT_23 = " != null && ((";

-	protected final String TEXT_24 = ".Unsettable";

-	protected final String TEXT_25 = ")";

-	protected final String TEXT_26 = ").isSet();";

-	protected final String TEXT_27 = NL + "\t\treturn eVirtualIsSet(";

-	protected final String TEXT_28 = NL + "\t\treturn (";

-	protected final String TEXT_29 = " & ";

-	protected final String TEXT_30 = "_ESETFLAG) != 0;";

-	protected final String TEXT_31 = "ESet;";

-	protected final String TEXT_32 = NL + "\t\treturn !((";

-	protected final String TEXT_33 = ".Internal)((";

-	protected final String TEXT_34 = ".Internal.Wrapper)get";

-	protected final String TEXT_35 = "()).featureMap()).isEmpty(";

-	protected final String TEXT_36 = ".Internal)get";

-	protected final String TEXT_37 = "()).isEmpty(";

-	protected final String TEXT_38 = NL + "\t}" + NL;

-	protected final String TEXT_39 = NL;

+	protected final String TEXT_9 = NL + "\t@Override";

+	protected final String TEXT_10 = NL + "\tpublic boolean isSet";

+	protected final String TEXT_11 = "_";

+	protected final String TEXT_12 = "()" + NL + "\t{";

+	protected final String TEXT_13 = NL + "\t\treturn eDynamicIsSet(";

+	protected final String TEXT_14 = " - ESTATIC_FEATURE_COUNT";

+	protected final String TEXT_15 = ", ";

+	protected final String TEXT_16 = ");";

+	protected final String TEXT_17 = NL + "\t\treturn eIsSet(";

+	protected final String TEXT_18 = NL + "\t\treturn ";

+	protected final String TEXT_19 = "__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);";

+	protected final String TEXT_20 = NL + "\t\t";

+	protected final String TEXT_21 = " ";

+	protected final String TEXT_22 = " = (";

+	protected final String TEXT_23 = ")eVirtualGet(";

+	protected final String TEXT_24 = " != null && ((";

+	protected final String TEXT_25 = ".Unsettable";

+	protected final String TEXT_26 = ")";

+	protected final String TEXT_27 = ").isSet();";

+	protected final String TEXT_28 = NL + "\t\treturn eVirtualIsSet(";

+	protected final String TEXT_29 = NL + "\t\treturn (";

+	protected final String TEXT_30 = " & ";

+	protected final String TEXT_31 = "_ESETFLAG) != 0;";

+	protected final String TEXT_32 = "ESet;";

+	protected final String TEXT_33 = NL + "\t\treturn !((";

+	protected final String TEXT_34 = ".Internal)((";

+	protected final String TEXT_35 = ".Internal.Wrapper)get";

+	protected final String TEXT_36 = "()).featureMap()).isEmpty(";

+	protected final String TEXT_37 = ".Internal)get";

+	protected final String TEXT_38 = "()).isEmpty(";

+	protected final String TEXT_39 = NL + "\t}" + NL;

+	protected final String TEXT_40 = NL;

 

 	public InterfaceisSetGenFeatureoverride() {

 		//Here is the constructor

@@ -98,6 +99,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -120,35 +123,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -168,8 +174,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_39);

-		stringBuffer.append(TEXT_39);

+		stringBuffer.append(TEXT_40);

+		stringBuffer.append(TEXT_40);

 		return stringBuffer.toString();

 	}

 

@@ -187,6 +193,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -243,6 +250,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -294,6 +307,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -310,7 +324,7 @@
 		if (isInterface) {

 			stringBuffer.append(TEXT_2);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -324,6 +338,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -348,7 +363,7 @@
 			if (isJDK50) { //Class/isSetGenFeature.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -362,6 +377,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -385,99 +401,104 @@
 			stringBuffer.append(genFeature.getAccessorName());

 			stringBuffer.append(TEXT_8);

 		} else {

-			stringBuffer.append(TEXT_9);

+			if (useInterfaceOverrideAnnotation && !genClass.isMapEntry()

+					&& !genClass.hasCollidingIsSetAccessorOperation(genFeature)

+					&& !genFeature.isSuppressedIsSetVisibility()) {

+				stringBuffer.append(TEXT_9);

+			}

+			stringBuffer.append(TEXT_10);

 			stringBuffer.append(genFeature.getAccessorName());

 			if (genClass.hasCollidingIsSetAccessorOperation(genFeature)) {

-				stringBuffer.append(TEXT_10);

+				stringBuffer.append(TEXT_11);

 			}

-			stringBuffer.append(TEXT_11);

+			stringBuffer.append(TEXT_12);

 			if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {

-				stringBuffer.append(TEXT_12);

+				stringBuffer.append(TEXT_13);

 				stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 				if (genClass.hasStaticFeatures()) {

-					stringBuffer.append(TEXT_13);

+					stringBuffer.append(TEXT_14);

 				}

-				stringBuffer.append(TEXT_14);

-				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

 				stringBuffer.append(TEXT_15);

-			} else if (genModel.isReflectiveDelegation()) {

+				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

 				stringBuffer.append(TEXT_16);

-				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-				stringBuffer.append(TEXT_15);

-			} else if (genFeature.hasSettingDelegate()) {

+			} else if (genModel.isReflectiveDelegation()) {

 				stringBuffer.append(TEXT_17);

-				stringBuffer.append(genFeature.getUpperName());

+				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+				stringBuffer.append(TEXT_16);

+			} else if (genFeature.hasSettingDelegate()) {

 				stringBuffer.append(TEXT_18);

+				stringBuffer.append(genFeature.getUpperName());

+				stringBuffer.append(TEXT_19);

 			} else if (!genFeature.isVolatile()) {

 				if (genFeature.isListType()) {

 					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_19);

-						stringBuffer.append(genFeature.getImportedType(genClass));

 						stringBuffer.append(TEXT_20);

-						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_21);

 						stringBuffer.append(genFeature.getImportedType(genClass));

+						stringBuffer.append(TEXT_21);

+						stringBuffer.append(genFeature.getSafeName());

 						stringBuffer.append(TEXT_22);

+						stringBuffer.append(genFeature.getImportedType(genClass));

+						stringBuffer.append(TEXT_23);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_15);

+						stringBuffer.append(TEXT_16);

 					}

-					stringBuffer.append(TEXT_17);

+					stringBuffer.append(TEXT_18);

 					stringBuffer.append(genFeature.getSafeName());

-					stringBuffer.append(TEXT_23);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));

 					stringBuffer.append(TEXT_24);

-					stringBuffer.append(singleWildcard);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));

 					stringBuffer.append(TEXT_25);

-					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(singleWildcard);

 					stringBuffer.append(TEXT_26);

+					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(TEXT_27);

 				} else {

 					if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_27);

+						stringBuffer.append(TEXT_28);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_15);

+						stringBuffer.append(TEXT_16);

 					} else if (genClass.isESetFlag(genFeature)) {

-						stringBuffer.append(TEXT_28);

-						stringBuffer.append(genClass.getESetFlagsField(genFeature));

 						stringBuffer.append(TEXT_29);

-						stringBuffer.append(genFeature.getUpperName());

+						stringBuffer.append(genClass.getESetFlagsField(genFeature));

 						stringBuffer.append(TEXT_30);

-					} else {

-						stringBuffer.append(TEXT_17);

-						stringBuffer.append(genFeature.getUncapName());

+						stringBuffer.append(genFeature.getUpperName());

 						stringBuffer.append(TEXT_31);

+					} else {

+						stringBuffer.append(TEXT_18);

+						stringBuffer.append(genFeature.getUncapName());

+						stringBuffer.append(TEXT_32);

 					}

 				}

 			} else if (genFeature.hasDelegateFeature()) {

 				GenFeature delegateFeature = genFeature.getDelegateFeature();

 				if (delegateFeature.isWrappedFeatureMapType()) {

-					stringBuffer.append(TEXT_32);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

 					stringBuffer.append(TEXT_33);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

 					stringBuffer.append(TEXT_34);

-					stringBuffer.append(delegateFeature.getAccessorName());

-					stringBuffer.append(TEXT_35);

-					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-					stringBuffer.append(TEXT_15);

-				} else {

-					stringBuffer.append(TEXT_32);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

-					stringBuffer.append(TEXT_36);

+					stringBuffer.append(TEXT_35);

 					stringBuffer.append(delegateFeature.getAccessorName());

-					stringBuffer.append(TEXT_37);

+					stringBuffer.append(TEXT_36);

 					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-					stringBuffer.append(TEXT_15);

+					stringBuffer.append(TEXT_16);

+				} else {

+					stringBuffer.append(TEXT_33);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

+					stringBuffer.append(TEXT_37);

+					stringBuffer.append(delegateFeature.getAccessorName());

+					stringBuffer.append(TEXT_38);

+					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+					stringBuffer.append(TEXT_16);

 				}

 			} else if (genClass.getIsSetAccessorOperation(genFeature) != null) {

-				stringBuffer.append(TEXT_19);

+				stringBuffer.append(TEXT_20);

 				stringBuffer.append(

 						genClass.getIsSetAccessorOperation(genFeature).getBody(genModel.getIndentation(stringBuffer)));

 			} else {

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -491,6 +512,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -506,7 +528,7 @@
 

 				//Class/isSetGenFeature.todo.override.javajetinc

 			}

-			stringBuffer.append(TEXT_38);

+			stringBuffer.append(TEXT_39);

 		}

 		stringBuffer.append(TEXT_2);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacereflectiveDelegationoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacereflectiveDelegationoverride.java
index e2635b3..35ec0be 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacereflectiveDelegationoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacereflectiveDelegationoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -68,6 +68,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -89,34 +91,37 @@
 					for (Object isJDK50Parameter : isJDK50List) {

 						for (Object isInterfaceParameter : isInterfaceList) {

 							for (Object isImplementationParameter : isImplementationList) {

-								for (Object isGWTParameter : isGWTList) {

-									for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-										for (Object singleWildcardParameter : singleWildcardList) {

-											for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-												for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-													for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-														for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+								for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+									for (Object isGWTParameter : isGWTList) {

+										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+											for (Object singleWildcardParameter : singleWildcardList) {

+												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-															this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-															this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-															this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-															this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-															this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-															this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-															this.isGWT = (java.lang.Boolean) isGWTParameter;

-															this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-															this.singleWildcard = (java.lang.String) singleWildcardParameter;

-															this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-															this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-															this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-															this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																this.isGWT = (java.lang.Boolean) isGWTParameter;

+																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-															if (preCondition(ctx)) {

-																ctx.setNode(

-																		new Node.Container(currentNode, getClass()));

-																orchestration(ctx);

+																if (preCondition(ctx)) {

+																	ctx.setNode(new Node.Container(currentNode,

+																			getClass()));

+																	orchestration(ctx);

+																}

+

 															}

-

 														}

 													}

 												}

@@ -153,6 +158,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -203,6 +209,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -253,6 +265,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeatureTODOoverride.java
index 61923a6..4253a52 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -65,6 +65,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -88,36 +90,39 @@
 							for (Object isJDK50Parameter : isJDK50List) {

 								for (Object isInterfaceParameter : isInterfaceList) {

 									for (Object isImplementationParameter : isImplementationList) {

-										for (Object isGWTParameter : isGWTList) {

-											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-												for (Object singleWildcardParameter : singleWildcardList) {

-													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+										for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+											for (Object isGWTParameter : isGWTList) {

+												for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+													for (Object singleWildcardParameter : singleWildcardList) {

+														for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+															for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+																for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																	for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																	this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

-																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																	this.isGWT = (java.lang.Boolean) isGWTParameter;

-																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																		this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

+																		this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																		this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																		this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																		this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																		this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																		this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																		this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																		this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																		this.isGWT = (java.lang.Boolean) isGWTParameter;

+																		this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																		this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																		this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																		this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																		this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																		this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																	if (preCondition(ctx)) {

-																		ctx.setNode(new Node.Container(currentNode,

-																				getClass()));

-																		orchestration(ctx);

+																		if (preCondition(ctx)) {

+																			ctx.setNode(new Node.Container(currentNode,

+																					getClass()));

+																			orchestration(ctx);

+																		}

+

 																	}

-

 																}

 															}

 														}

@@ -158,6 +163,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -220,6 +226,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -272,6 +284,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeatureannotationsinsert.java
index 4299406..24a65ef 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturejavadocinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturejavadocinsert.java
index 821c850..26fc6b7 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturejavadocinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturejavadocinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturejavadocoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturejavadocoverride.java
index 0223ff2..39f88a9 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturejavadocoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturejavadocoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -75,6 +75,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -97,35 +99,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -164,6 +169,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -220,6 +226,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -271,6 +283,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -294,7 +307,7 @@
 		stringBuffer.append(TEXT_5);

 		stringBuffer.append(TEXT_6);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -308,6 +321,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeatureoverride.java
index 01c1d06..65c8178 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -37,33 +37,33 @@
 	protected final String TEXT_7 = NL + "\tvoid set";

 	protected final String TEXT_8 = "(";

 	protected final String TEXT_9 = " value);" + NL;

-	protected final String TEXT_10 = NL + "\tpublic void set";

-	protected final String TEXT_11 = "_";

-	protected final String TEXT_12 = " ";

-	protected final String TEXT_13 = ")" + NL + "\t{";

-	protected final String TEXT_14 = NL + "\t\teDynamicSet(";

-	protected final String TEXT_15 = " - ESTATIC_FEATURE_COUNT";

-	protected final String TEXT_16 = ", ";

-	protected final String TEXT_17 = "new ";

-	protected final String TEXT_18 = "new";

-	protected final String TEXT_19 = ")";

-	protected final String TEXT_20 = ");";

-	protected final String TEXT_21 = NL + "\t\teSet(";

-	protected final String TEXT_22 = NL + "\t\t";

-	protected final String TEXT_23 = "__ESETTING_DELEGATE.dynamicSet(this, null, 0, ";

-	protected final String TEXT_24 = NL + "\t\tif (new";

-	protected final String TEXT_25 = " != eInternalContainer() || (eContainerFeatureID() != ";

-	protected final String TEXT_26 = " && new";

-	protected final String TEXT_27 = " != null))" + NL + "\t\t{" + NL + "\t\t\tif (";

-	protected final String TEXT_28 = ".isAncestor(this, ";

-	protected final String TEXT_29 = "))" + NL + "\t\t\t\tthrow new ";

-	protected final String TEXT_30 = "(\"Recursive containment not allowed for \" + toString());";

-	protected final String TEXT_31 = NL + "\t\t\t";

-	protected final String TEXT_32 = " msgs = null;" + NL + "\t\t\tif (eInternalContainer() != null)" + NL

+	protected final String TEXT_10 = NL + "\t@Override";

+	protected final String TEXT_11 = NL + "\tpublic void set";

+	protected final String TEXT_12 = "_";

+	protected final String TEXT_13 = " ";

+	protected final String TEXT_14 = ")" + NL + "\t{";

+	protected final String TEXT_15 = NL + "\t\teDynamicSet(";

+	protected final String TEXT_16 = " - ESTATIC_FEATURE_COUNT";

+	protected final String TEXT_17 = ", ";

+	protected final String TEXT_18 = "new ";

+	protected final String TEXT_19 = "new";

+	protected final String TEXT_20 = ")";

+	protected final String TEXT_21 = ");";

+	protected final String TEXT_22 = NL + "\t\teSet(";

+	protected final String TEXT_23 = NL + "\t\t";

+	protected final String TEXT_24 = "__ESETTING_DELEGATE.dynamicSet(this, null, 0, ";

+	protected final String TEXT_25 = NL + "\t\tif (new";

+	protected final String TEXT_26 = " != eInternalContainer() || (eContainerFeatureID() != ";

+	protected final String TEXT_27 = " && new";

+	protected final String TEXT_28 = " != null))" + NL + "\t\t{" + NL + "\t\t\tif (";

+	protected final String TEXT_29 = ".isAncestor(this, ";

+	protected final String TEXT_30 = "))" + NL + "\t\t\t\tthrow new ";

+	protected final String TEXT_31 = "(\"Recursive containment not allowed for \" + toString());";

+	protected final String TEXT_32 = NL + "\t\t\t";

+	protected final String TEXT_33 = " msgs = null;" + NL + "\t\t\tif (eInternalContainer() != null)" + NL

 			+ "\t\t\t\tmsgs = eBasicRemoveFromContainer(msgs);" + NL + "\t\t\tif (new";

-	protected final String TEXT_33 = " != null)" + NL + "\t\t\t\tmsgs = ((";

-	protected final String TEXT_34 = ")new";

-	protected final String TEXT_35 = ").eInverseAdd(this, ";

+	protected final String TEXT_34 = " != null)" + NL + "\t\t\t\tmsgs = ";

+	protected final String TEXT_35 = ".eInverseAdd(this, ";

 	protected final String TEXT_36 = ".class, msgs);" + NL + "\t\t\tmsgs = basicSet";

 	protected final String TEXT_37 = ", msgs);" + NL + "\t\t\tif (msgs != null) msgs.dispatch();" + NL + "\t\t}";

 	protected final String TEXT_38 = NL + "\t\telse if (eNotificationRequired())" + NL + "\t\t\teNotify(new ";

@@ -77,12 +77,12 @@
 	protected final String TEXT_46 = ")" + NL + "\t\t{" + NL + "\t\t\t";

 	protected final String TEXT_47 = " msgs = null;" + NL + "\t\t\tif (";

 	protected final String TEXT_48 = " != null)";

-	protected final String TEXT_49 = NL + "\t\t\t\tmsgs = ((";

-	protected final String TEXT_50 = ").eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

+	protected final String TEXT_49 = NL + "\t\t\t\tmsgs = ";

+	protected final String TEXT_50 = ".eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

 	protected final String TEXT_51 = ", null, msgs);" + NL + "\t\t\tif (new";

-	protected final String TEXT_52 = ").eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ";

+	protected final String TEXT_52 = ".eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ";

 	protected final String TEXT_53 = ", null, msgs);";

-	protected final String TEXT_54 = ").eInverseRemove(this, ";

+	protected final String TEXT_54 = ".eInverseRemove(this, ";

 	protected final String TEXT_55 = ".class, msgs);" + NL + "\t\t\tif (new";

 	protected final String TEXT_56 = ".class, msgs);";

 	protected final String TEXT_57 = NL + "\t\t\tmsgs = basicSet";

@@ -175,6 +175,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -197,35 +199,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -264,6 +269,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -320,6 +326,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -371,6 +383,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -387,7 +400,7 @@
 		if (isInterface) {

 			stringBuffer.append(TEXT_2);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -401,6 +414,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -425,7 +439,7 @@
 			if (isJDK50) { //Class/setGenFeature.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -439,6 +453,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -465,20 +480,25 @@
 			stringBuffer.append(TEXT_9);

 		} else {

 			GenOperation setAccessorOperation = genClass.getSetAccessorOperation(genFeature);

-			stringBuffer.append(TEXT_10);

+			if (useInterfaceOverrideAnnotation && !genClass.isMapEntry()

+					&& !genClass.hasCollidingSetAccessorOperation(genFeature)

+					&& !genFeature.isSuppressedSetVisibility()) {

+				stringBuffer.append(TEXT_10);

+			}

+			stringBuffer.append(TEXT_11);

 			stringBuffer.append(genFeature.getAccessorName());

 			if (genClass.hasCollidingSetAccessorOperation(genFeature)) {

-				stringBuffer.append(TEXT_11);

+				stringBuffer.append(TEXT_12);

 			}

 			stringBuffer.append(TEXT_8);

 			stringBuffer.append(genFeature.getImportedType(genClass));

-			stringBuffer.append(TEXT_12);

+			stringBuffer.append(TEXT_13);

 			stringBuffer.append(setAccessorOperation == null ? "new" + genFeature.getCapName()

 					: setAccessorOperation.getGenParameters().get(0).getName());

-			stringBuffer.append(TEXT_13);

+			stringBuffer.append(TEXT_14);

 			stringBuffer.append(TEXT_2);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.pre.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.pre.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -493,6 +513,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -507,55 +528,117 @@
 			}

 

 			if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {

-				stringBuffer.append(TEXT_14);

+				stringBuffer.append(TEXT_2);

+				{

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.dynamicSetGenFeature.pre.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+

+					InternalPatternContext ictx = (InternalPatternContext) ctx;

+					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

+					stringBuffer.setLength(0);

+

+					final Map<String, Object> callParameters = new HashMap<String, Object>();

+					callParameters.put("setAccessorOperation", setAccessorOperation);

+					callParameters.put("genFeature", genFeature);

+					callParameters.put("genClass", genClass);

+					callParameters.put("genPackage", genPackage);

+					callParameters.put("genModel", genModel);

+					callParameters.put("isJDK50", isJDK50);

+					callParameters.put("isInterface", isInterface);

+					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

+					callParameters.put("isGWT", isGWT);

+					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

+					callParameters.put("singleWildcard", singleWildcard);

+					callParameters.put("negativeOffsetCorrection", negativeOffsetCorrection);

+					callParameters.put("positiveOffsetCorrection", positiveOffsetCorrection);

+					callParameters.put("negativeOperationOffsetCorrection", negativeOperationOffsetCorrection);

+					callParameters.put("positiveOperationOffsetCorrection", positiveOperationOffsetCorrection);

+					CallHelper.executeWithParameterInjection(

+							"platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#_eTdDcCSWEemxeP6B0lLOpA",

+							new ExecutionContext((InternalPatternContext) ctx), callParameters);

+					stringBuffer.setLength(0);

+				}

+

+				stringBuffer.append(TEXT_15);

 				stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 				if (genClass.hasStaticFeatures()) {

-					stringBuffer.append(TEXT_15);

+					stringBuffer.append(TEXT_16);

 				}

-				stringBuffer.append(TEXT_16);

+				stringBuffer.append(TEXT_17);

 				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-				stringBuffer.append(TEXT_16);

+				stringBuffer.append(TEXT_17);

 				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_17);

+					stringBuffer.append(TEXT_18);

 					stringBuffer.append(genFeature.getObjectType(genClass));

 					stringBuffer.append(TEXT_8);

 				}

-				stringBuffer.append(TEXT_18);

+				stringBuffer.append(TEXT_19);

 				stringBuffer.append(genFeature.getCapName());

 				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_19);

+					stringBuffer.append(TEXT_20);

 				}

-				stringBuffer.append(TEXT_20);

-			} else if (genModel.isReflectiveDelegation()) {

 				stringBuffer.append(TEXT_21);

-				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-				stringBuffer.append(TEXT_16);

-				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_17);

-					stringBuffer.append(genFeature.getObjectType(genClass));

-					stringBuffer.append(TEXT_8);

+				stringBuffer.append(TEXT_2);

+				{

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.dynamicSetGenFeature.post.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+

+					InternalPatternContext ictx = (InternalPatternContext) ctx;

+					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

+					stringBuffer.setLength(0);

+

+					final Map<String, Object> callParameters = new HashMap<String, Object>();

+					callParameters.put("setAccessorOperation", setAccessorOperation);

+					callParameters.put("genFeature", genFeature);

+					callParameters.put("genClass", genClass);

+					callParameters.put("genPackage", genPackage);

+					callParameters.put("genModel", genModel);

+					callParameters.put("isJDK50", isJDK50);

+					callParameters.put("isInterface", isInterface);

+					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

+					callParameters.put("isGWT", isGWT);

+					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

+					callParameters.put("singleWildcard", singleWildcard);

+					callParameters.put("negativeOffsetCorrection", negativeOffsetCorrection);

+					callParameters.put("positiveOffsetCorrection", positiveOffsetCorrection);

+					callParameters.put("negativeOperationOffsetCorrection", negativeOperationOffsetCorrection);

+					callParameters.put("positiveOperationOffsetCorrection", positiveOperationOffsetCorrection);

+					CallHelper.executeWithParameterInjection(

+							"platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#_eZahgCSWEemxeP6B0lLOpA",

+							new ExecutionContext((InternalPatternContext) ctx), callParameters);

+					stringBuffer.setLength(0);

 				}

-				stringBuffer.append(TEXT_18);

-				stringBuffer.append(genFeature.getCapName());

-				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_19);

-				}

-				stringBuffer.append(TEXT_20);

-			} else if (genFeature.hasSettingDelegate()) {

+

+			} else if (genModel.isReflectiveDelegation()) {

 				stringBuffer.append(TEXT_22);

-				stringBuffer.append(genFeature.getUpperName());

-				stringBuffer.append(TEXT_23);

+				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+				stringBuffer.append(TEXT_17);

 				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_17);

+					stringBuffer.append(TEXT_18);

 					stringBuffer.append(genFeature.getObjectType(genClass));

 					stringBuffer.append(TEXT_8);

 				}

-				stringBuffer.append(TEXT_18);

+				stringBuffer.append(TEXT_19);

 				stringBuffer.append(genFeature.getCapName());

 				if (!isJDK50 && genFeature.isPrimitiveType()) {

-					stringBuffer.append(TEXT_19);

+					stringBuffer.append(TEXT_20);

 				}

-				stringBuffer.append(TEXT_20);

+				stringBuffer.append(TEXT_21);

+			} else if (genFeature.hasSettingDelegate()) {

+				stringBuffer.append(TEXT_23);

+				stringBuffer.append(genFeature.getUpperName());

+				stringBuffer.append(TEXT_24);

+				if (!isJDK50 && genFeature.isPrimitiveType()) {

+					stringBuffer.append(TEXT_18);

+					stringBuffer.append(genFeature.getObjectType(genClass));

+					stringBuffer.append(TEXT_8);

+				}

+				stringBuffer.append(TEXT_19);

+				stringBuffer.append(genFeature.getCapName());

+				if (!isJDK50 && genFeature.isPrimitiveType()) {

+					stringBuffer.append(TEXT_20);

+				}

+				stringBuffer.append(TEXT_21);

 			} else if (!genFeature.isVolatile()) {

 				if (genFeature.isContainer()) {

 					GenFeature reverseFeature = genFeature.getReverse();

@@ -563,41 +646,39 @@
 					String reverseOffsetCorrection = targetClass.hasOffsetCorrection()

 							? " + " + genClass.getOffsetCorrectionField(genFeature)

 							: "";

-					stringBuffer.append(TEXT_24);

-					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_25);

+					stringBuffer.append(genFeature.getCapName());

+					stringBuffer.append(TEXT_26);

 					stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 					stringBuffer.append(positiveOffsetCorrection);

-					stringBuffer.append(TEXT_26);

-					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_27);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.EcoreUtil"));

+					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_28);

-					stringBuffer.append(genFeature.getEObjectCast());

-					stringBuffer.append(TEXT_18);

-					stringBuffer.append(genFeature.getCapName());

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.EcoreUtil"));

 					stringBuffer.append(TEXT_29);

-					stringBuffer.append(genModel.getImportedName("java.lang.IllegalArgumentException"));

+					stringBuffer.append(genFeature.getEObjectCast());

+					stringBuffer.append(TEXT_19);

+					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_30);

-					stringBuffer.append(genModel.getNonNLS());

+					stringBuffer.append(genModel.getImportedName("java.lang.IllegalArgumentException"));

 					stringBuffer.append(TEXT_31);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

+					stringBuffer.append(genModel.getNonNLS());

 					stringBuffer.append(TEXT_32);

-					stringBuffer.append(genFeature.getCapName());

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

 					stringBuffer.append(TEXT_33);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-					stringBuffer.append(TEXT_34);

 					stringBuffer.append(genFeature.getCapName());

+					stringBuffer.append(TEXT_34);

+					stringBuffer.append(genFeature.getAsInternalEObject("new" + genFeature.getCapName(), true));

 					stringBuffer.append(TEXT_35);

 					stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

 					stringBuffer.append(reverseOffsetCorrection);

-					stringBuffer.append(TEXT_16);

+					stringBuffer.append(TEXT_17);

 					stringBuffer.append(targetClass.getRawImportedInterfaceName());

 					stringBuffer.append(TEXT_36);

 					stringBuffer.append(genFeature.getAccessorName());

 					stringBuffer.append(TEXT_8);

 					stringBuffer.append(genFeature.getInternalTypeCast());

-					stringBuffer.append(TEXT_18);

+					stringBuffer.append(TEXT_19);

 					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_37);

 					if (!genModel.isSuppressNotification()) {

@@ -616,18 +697,18 @@
 					}

 				} else if (genFeature.isBidirectional() || genFeature.isEffectiveContains()) {

 					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_22);

+						stringBuffer.append(TEXT_23);

 						stringBuffer.append(genFeature.getImportedType(genClass));

-						stringBuffer.append(TEXT_12);

+						stringBuffer.append(TEXT_13);

 						stringBuffer.append(genFeature.getSafeName());

 						stringBuffer.append(TEXT_43);

 						stringBuffer.append(genFeature.getImportedType(genClass));

 						stringBuffer.append(TEXT_44);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_20);

+						stringBuffer.append(TEXT_21);

 					}

-					stringBuffer.append(TEXT_24);

+					stringBuffer.append(TEXT_25);

 					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_45);

 					stringBuffer.append(genFeature.getSafeName());

@@ -638,18 +719,14 @@
 					stringBuffer.append(TEXT_48);

 					if (!genFeature.isBidirectional()) {

 						stringBuffer.append(TEXT_49);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-						stringBuffer.append(TEXT_19);

-						stringBuffer.append(genFeature.getSafeName());

+						stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), true));

 						stringBuffer.append(TEXT_50);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(negativeOffsetCorrection);

 						stringBuffer.append(TEXT_51);

 						stringBuffer.append(genFeature.getCapName());

-						stringBuffer.append(TEXT_33);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

 						stringBuffer.append(TEXT_34);

-						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(genFeature.getAsInternalEObject("new" + genFeature.getCapName(), true));

 						stringBuffer.append(TEXT_52);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(negativeOffsetCorrection);

@@ -661,24 +738,20 @@
 								? " + " + genClass.getOffsetCorrectionField(genFeature)

 								: "";

 						stringBuffer.append(TEXT_49);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-						stringBuffer.append(TEXT_19);

-						stringBuffer.append(genFeature.getSafeName());

+						stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), true));

 						stringBuffer.append(TEXT_54);

 						stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

 						stringBuffer.append(reverseOffsetCorrection);

-						stringBuffer.append(TEXT_16);

+						stringBuffer.append(TEXT_17);

 						stringBuffer.append(targetClass.getRawImportedInterfaceName());

 						stringBuffer.append(TEXT_55);

 						stringBuffer.append(genFeature.getCapName());

-						stringBuffer.append(TEXT_33);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

 						stringBuffer.append(TEXT_34);

-						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(genFeature.getAsInternalEObject("new" + genFeature.getCapName(), true));

 						stringBuffer.append(TEXT_35);

 						stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

 						stringBuffer.append(reverseOffsetCorrection);

-						stringBuffer.append(TEXT_16);

+						stringBuffer.append(TEXT_17);

 						stringBuffer.append(targetClass.getRawImportedInterfaceName());

 						stringBuffer.append(TEXT_56);

 					}

@@ -686,7 +759,7 @@
 					stringBuffer.append(genFeature.getAccessorName());

 					stringBuffer.append(TEXT_8);

 					stringBuffer.append(genFeature.getInternalTypeCast());

-					stringBuffer.append(TEXT_18);

+					stringBuffer.append(TEXT_19);

 					stringBuffer.append(genFeature.getCapName());

 					stringBuffer.append(TEXT_37);

 					if (genFeature.isUnsettable()) {

@@ -697,7 +770,7 @@
 							stringBuffer.append(TEXT_60);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_20);

+							stringBuffer.append(TEXT_21);

 						} else if (genClass.isESetFlag(genFeature)) {

 							if (!genModel.isSuppressNotification()) {

 								stringBuffer.append(TEXT_59);

@@ -708,7 +781,7 @@
 								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_63);

 							}

-							stringBuffer.append(TEXT_31);

+							stringBuffer.append(TEXT_32);

 							stringBuffer.append(genClass.getESetFlagsField(genFeature));

 							stringBuffer.append(TEXT_64);

 							stringBuffer.append(genFeature.getUpperName());

@@ -721,7 +794,7 @@
 								stringBuffer.append(genFeature.getUncapName());

 								stringBuffer.append(TEXT_67);

 							}

-							stringBuffer.append(TEXT_31);

+							stringBuffer.append(TEXT_32);

 							stringBuffer.append(genFeature.getUncapName());

 							stringBuffer.append(TEXT_68);

 						}

@@ -764,7 +837,7 @@
 					if (genClass.isFlag(genFeature)) {

 						if (!genModel.isSuppressNotification()) {

 							if (genFeature.isBooleanType()) {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getImportedType(genClass));

 								stringBuffer.append(TEXT_73);

 								stringBuffer.append(genFeature.getCapName());

@@ -774,7 +847,7 @@
 								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_74);

 							} else {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getImportedType(genClass));

 								stringBuffer.append(TEXT_73);

 								stringBuffer.append(genFeature.getCapName());

@@ -790,7 +863,7 @@
 							}

 						}

 						if (genFeature.isBooleanType()) {

-							stringBuffer.append(TEXT_24);

+							stringBuffer.append(TEXT_25);

 							stringBuffer.append(genFeature.getCapName());

 							stringBuffer.append(TEXT_79);

 							stringBuffer.append(genClass.getFlagsField(genFeature));

@@ -802,7 +875,7 @@
 							stringBuffer.append(genFeature.getUpperName());

 							stringBuffer.append(TEXT_82);

 						} else {

-							stringBuffer.append(TEXT_24);

+							stringBuffer.append(TEXT_25);

 							stringBuffer.append(genFeature.getCapName());

 							stringBuffer.append(TEXT_83);

 							stringBuffer.append(genFeature.getCapName());

@@ -816,14 +889,14 @@
 							stringBuffer.append(genFeature.getUpperName());

 							stringBuffer.append(TEXT_86);

 							if (isJDK50) {

-								stringBuffer.append(TEXT_18);

+								stringBuffer.append(TEXT_19);

 								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_87);

 							} else {

 								stringBuffer.append(genFeature.getImportedType(genClass));

 								stringBuffer.append(TEXT_88);

 								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_19);

+								stringBuffer.append(TEXT_20);

 							}

 							stringBuffer.append(TEXT_89);

 							stringBuffer.append(genFeature.getUpperName());

@@ -832,7 +905,7 @@
 					} else {

 						if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {

 							if (!genModel.isSuppressNotification()) {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getImportedType(genClass));

 								stringBuffer.append(TEXT_73);

 								stringBuffer.append(genFeature.getCapName());

@@ -843,9 +916,9 @@
 						}

 						if (genFeature.isEnumType()) {

 							if (genModel.isVirtualDelegation()) {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getImportedType(genClass));

-								stringBuffer.append(TEXT_12);

+								stringBuffer.append(TEXT_13);

 								stringBuffer.append(genFeature.getSafeName());

 								stringBuffer.append(TEXT_92);

 								stringBuffer.append(genFeature.getCapName());

@@ -855,7 +928,7 @@
 								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_91);

 							} else {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getSafeName());

 								stringBuffer.append(TEXT_92);

 								stringBuffer.append(genFeature.getCapName());

@@ -867,21 +940,21 @@
 							}

 						} else {

 							if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getImportedType(genClass));

-								stringBuffer.append(TEXT_12);

+								stringBuffer.append(TEXT_13);

 								stringBuffer.append(genFeature.getSafeName());

 								stringBuffer.append(TEXT_75);

 								stringBuffer.append(genFeature.getInternalTypeCast());

-								stringBuffer.append(TEXT_18);

+								stringBuffer.append(TEXT_19);

 								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_91);

 							} else {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getSafeName());

 								stringBuffer.append(TEXT_75);

 								stringBuffer.append(genFeature.getInternalTypeCast());

-								stringBuffer.append(TEXT_18);

+								stringBuffer.append(TEXT_19);

 								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_91);

 							}

@@ -892,9 +965,9 @@
 							stringBuffer.append(TEXT_96);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_16);

+							stringBuffer.append(TEXT_17);

 							stringBuffer.append(genFeature.getSafeName());

-							stringBuffer.append(TEXT_20);

+							stringBuffer.append(TEXT_21);

 						}

 					}

 					if (genFeature.isUnsettable()) {

@@ -912,7 +985,7 @@
 								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_63);

 							}

-							stringBuffer.append(TEXT_22);

+							stringBuffer.append(TEXT_23);

 							stringBuffer.append(genClass.getESetFlagsField(genFeature));

 							stringBuffer.append(TEXT_64);

 							stringBuffer.append(genFeature.getUpperName());

@@ -925,7 +998,7 @@
 								stringBuffer.append(genFeature.getUncapName());

 								stringBuffer.append(TEXT_67);

 							}

-							stringBuffer.append(TEXT_22);

+							stringBuffer.append(TEXT_23);

 							stringBuffer.append(genFeature.getUncapName());

 							stringBuffer.append(TEXT_68);

 						}

@@ -938,7 +1011,7 @@
 							stringBuffer.append(TEXT_40);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_16);

+							stringBuffer.append(TEXT_17);

 							if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

 								stringBuffer.append(TEXT_101);

 								stringBuffer.append(genFeature.getEDefault());

@@ -948,14 +1021,14 @@
 								stringBuffer.append(TEXT_103);

 								stringBuffer.append(genFeature.getCapName());

 							}

-							stringBuffer.append(TEXT_16);

+							stringBuffer.append(TEXT_17);

 							if (genClass.isFlag(genFeature)) {

-								stringBuffer.append(TEXT_18);

+								stringBuffer.append(TEXT_19);

 								stringBuffer.append(genFeature.getCapName());

 							} else {

 								stringBuffer.append(genFeature.getSafeName());

 							}

-							stringBuffer.append(TEXT_16);

+							stringBuffer.append(TEXT_17);

 							if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

 								stringBuffer.append(TEXT_104);

 							} else {

@@ -975,7 +1048,7 @@
 							stringBuffer.append(TEXT_40);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_16);

+							stringBuffer.append(TEXT_17);

 							if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

 								stringBuffer.append(TEXT_103);

 								stringBuffer.append(genFeature.getCapName());

@@ -987,9 +1060,9 @@
 								stringBuffer.append(TEXT_103);

 								stringBuffer.append(genFeature.getCapName());

 							}

-							stringBuffer.append(TEXT_16);

+							stringBuffer.append(TEXT_17);

 							if (genClass.isFlag(genFeature)) {

-								stringBuffer.append(TEXT_18);

+								stringBuffer.append(TEXT_19);

 								stringBuffer.append(genFeature.getCapName());

 							} else {

 								stringBuffer.append(genFeature.getSafeName());

@@ -1000,7 +1073,7 @@
 				}

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.post.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.post.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -1015,6 +1088,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -1039,18 +1113,18 @@
 					stringBuffer.append(delegateFeature.getAccessorName());

 					stringBuffer.append(TEXT_111);

 					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-					stringBuffer.append(TEXT_16);

+					stringBuffer.append(TEXT_17);

 					if (!isJDK50 && genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_17);

+						stringBuffer.append(TEXT_18);

 						stringBuffer.append(genFeature.getObjectType(genClass));

 						stringBuffer.append(TEXT_8);

 					}

-					stringBuffer.append(TEXT_18);

+					stringBuffer.append(TEXT_19);

 					stringBuffer.append(genFeature.getCapName());

 					if (!isJDK50 && genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_19);

+						stringBuffer.append(TEXT_20);

 					}

-					stringBuffer.append(TEXT_20);

+					stringBuffer.append(TEXT_21);

 				} else {

 					stringBuffer.append(TEXT_108);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

@@ -1058,26 +1132,26 @@
 					stringBuffer.append(delegateFeature.getAccessorName());

 					stringBuffer.append(TEXT_113);

 					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-					stringBuffer.append(TEXT_16);

+					stringBuffer.append(TEXT_17);

 					if (!isJDK50 && genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_17);

+						stringBuffer.append(TEXT_18);

 						stringBuffer.append(genFeature.getObjectType(genClass));

 						stringBuffer.append(TEXT_8);

 					}

-					stringBuffer.append(TEXT_18);

+					stringBuffer.append(TEXT_19);

 					stringBuffer.append(genFeature.getCapName());

 					if (!isJDK50 && genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_19);

+						stringBuffer.append(TEXT_20);

 					}

-					stringBuffer.append(TEXT_20);

+					stringBuffer.append(TEXT_21);

 				}

 			} else if (setAccessorOperation != null) {

-				stringBuffer.append(TEXT_22);

+				stringBuffer.append(TEXT_23);

 				stringBuffer.append(setAccessorOperation.getBody(genModel.getIndentation(stringBuffer)));

 			} else {

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.TODO.override" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.TODO.override" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -1092,6 +1166,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturepostinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturepostinsert.java
index c4b10cb..203339f 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturepostinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturepostinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -62,6 +62,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -85,36 +87,39 @@
 							for (Object isJDK50Parameter : isJDK50List) {

 								for (Object isInterfaceParameter : isInterfaceList) {

 									for (Object isImplementationParameter : isImplementationList) {

-										for (Object isGWTParameter : isGWTList) {

-											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-												for (Object singleWildcardParameter : singleWildcardList) {

-													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+										for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+											for (Object isGWTParameter : isGWTList) {

+												for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+													for (Object singleWildcardParameter : singleWildcardList) {

+														for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+															for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+																for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																	for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																	this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

-																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																	this.isGWT = (java.lang.Boolean) isGWTParameter;

-																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																		this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

+																		this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																		this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																		this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																		this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																		this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																		this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																		this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																		this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																		this.isGWT = (java.lang.Boolean) isGWTParameter;

+																		this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																		this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																		this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																		this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																		this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																		this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																	if (preCondition(ctx)) {

-																		ctx.setNode(new Node.Container(currentNode,

-																				getClass()));

-																		orchestration(ctx);

+																		if (preCondition(ctx)) {

+																			ctx.setNode(new Node.Container(currentNode,

+																					getClass()));

+																			orchestration(ctx);

+																		}

+

 																	}

-

 																}

 															}

 														}

@@ -155,6 +160,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -217,6 +223,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -269,6 +281,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturepreinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturepreinsert.java
index 7307a83..badd41a 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturepreinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfacesetGenFeaturepreinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -62,6 +62,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -85,36 +87,39 @@
 							for (Object isJDK50Parameter : isJDK50List) {

 								for (Object isInterfaceParameter : isInterfaceList) {

 									for (Object isImplementationParameter : isImplementationList) {

-										for (Object isGWTParameter : isGWTList) {

-											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-												for (Object singleWildcardParameter : singleWildcardList) {

-													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+										for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+											for (Object isGWTParameter : isGWTList) {

+												for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+													for (Object singleWildcardParameter : singleWildcardList) {

+														for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+															for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+																for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																	for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																	this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

-																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																	this.isGWT = (java.lang.Boolean) isGWTParameter;

-																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																		this.setAccessorOperation = (org.eclipse.emf.codegen.ecore.genmodel.GenOperation) setAccessorOperationParameter;

+																		this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																		this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																		this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																		this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																		this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																		this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																		this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																		this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																		this.isGWT = (java.lang.Boolean) isGWTParameter;

+																		this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																		this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																		this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																		this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																		this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																		this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																	if (preCondition(ctx)) {

-																		ctx.setNode(new Node.Container(currentNode,

-																				getClass()));

-																		orchestration(ctx);

+																		if (preCondition(ctx)) {

+																			ctx.setNode(new Node.Container(currentNode,

+																					getClass()));

+																			orchestration(ctx);

+																		}

+

 																	}

-

 																}

 															}

 														}

@@ -155,6 +160,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -217,6 +223,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -269,6 +281,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeatureTODOoverride.java
index d440861..d3196de 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -63,6 +63,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -85,35 +87,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -152,6 +157,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -208,6 +214,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -259,6 +271,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeatureannotationsinsert.java
index 9d3ba70..d7a4c01 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeaturejavadocinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeaturejavadocinsert.java
index db16b82..99112d2 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeaturejavadocinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeaturejavadocinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -60,6 +60,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -82,35 +84,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -149,6 +154,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -205,6 +211,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -256,6 +268,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeaturejavadocoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeaturejavadocoverride.java
index b2e2112..594cde7 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeaturejavadocoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeaturejavadocoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -74,6 +74,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -96,35 +98,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -163,6 +168,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -219,6 +225,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -270,6 +282,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -293,7 +306,7 @@
 		stringBuffer.append(TEXT_5);

 		stringBuffer.append(TEXT_6);

 		{

-			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+			//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 			InternalPatternContext ictx = (InternalPatternContext) ctx;

 			new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -307,6 +320,7 @@
 			callParameters.put("isJDK50", isJDK50);

 			callParameters.put("isInterface", isInterface);

 			callParameters.put("isImplementation", isImplementation);

+			callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 			callParameters.put("isGWT", isGWT);

 			callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 			callParameters.put("singleWildcard", singleWildcard);

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeatureoverride.java
index 2744d0e..51472e8 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/Interface/InterfaceunsetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.Interface;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -36,88 +36,89 @@
 	protected final String TEXT_6 = NL + "\t@Deprecated";

 	protected final String TEXT_7 = NL + "\tvoid unset";

 	protected final String TEXT_8 = "();" + NL;

-	protected final String TEXT_9 = NL + "\tpublic void unset";

-	protected final String TEXT_10 = "_";

-	protected final String TEXT_11 = "()" + NL + "\t{";

-	protected final String TEXT_12 = NL + "\t\teDynamicUnset(";

-	protected final String TEXT_13 = " - ESTATIC_FEATURE_COUNT";

-	protected final String TEXT_14 = ", ";

-	protected final String TEXT_15 = ");";

-	protected final String TEXT_16 = NL + "\t\teUnset(";

-	protected final String TEXT_17 = NL + "\t\t";

-	protected final String TEXT_18 = "__ESETTING_DELEGATE.dynamicUnset(this, null, 0);";

-	protected final String TEXT_19 = " ";

-	protected final String TEXT_20 = " = (";

-	protected final String TEXT_21 = ")eVirtualGet(";

-	protected final String TEXT_22 = NL + "\t\tif (";

-	protected final String TEXT_23 = " != null) ((";

-	protected final String TEXT_24 = ".Unsettable";

-	protected final String TEXT_25 = ")";

-	protected final String TEXT_26 = ").unset();";

-	protected final String TEXT_27 = " != null)" + NL + "\t\t{" + NL + "\t\t\t";

-	protected final String TEXT_28 = " msgs = null;";

-	protected final String TEXT_29 = NL + "\t\t\tmsgs = ((";

-	protected final String TEXT_30 = ").eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

-	protected final String TEXT_31 = ", null, msgs);";

-	protected final String TEXT_32 = ").eInverseRemove(this, ";

-	protected final String TEXT_33 = ".class, msgs);";

-	protected final String TEXT_34 = NL + "\t\t\tmsgs = basicUnset";

-	protected final String TEXT_35 = "(msgs);" + NL + "\t\t\tif (msgs != null) msgs.dispatch();" + NL + "\t\t}" + NL

+	protected final String TEXT_9 = NL + "\t@Override";

+	protected final String TEXT_10 = NL + "\tpublic void unset";

+	protected final String TEXT_11 = "_";

+	protected final String TEXT_12 = "()" + NL + "\t{";

+	protected final String TEXT_13 = NL + "\t\teDynamicUnset(";

+	protected final String TEXT_14 = " - ESTATIC_FEATURE_COUNT";

+	protected final String TEXT_15 = ", ";

+	protected final String TEXT_16 = ");";

+	protected final String TEXT_17 = NL + "\t\teUnset(";

+	protected final String TEXT_18 = NL + "\t\t";

+	protected final String TEXT_19 = "__ESETTING_DELEGATE.dynamicUnset(this, null, 0);";

+	protected final String TEXT_20 = " ";

+	protected final String TEXT_21 = " = (";

+	protected final String TEXT_22 = ")eVirtualGet(";

+	protected final String TEXT_23 = NL + "\t\tif (";

+	protected final String TEXT_24 = " != null) ((";

+	protected final String TEXT_25 = ".Unsettable";

+	protected final String TEXT_26 = ")";

+	protected final String TEXT_27 = ").unset();";

+	protected final String TEXT_28 = " != null)" + NL + "\t\t{" + NL + "\t\t\t";

+	protected final String TEXT_29 = " msgs = null;";

+	protected final String TEXT_30 = NL + "\t\t\tmsgs = ";

+	protected final String TEXT_31 = ".eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ";

+	protected final String TEXT_32 = ", null, msgs);";

+	protected final String TEXT_33 = ".eInverseRemove(this, ";

+	protected final String TEXT_34 = ".class, msgs);";

+	protected final String TEXT_35 = NL + "\t\t\tmsgs = basicUnset";

+	protected final String TEXT_36 = "(msgs);" + NL + "\t\t\tif (msgs != null) msgs.dispatch();" + NL + "\t\t}" + NL

 			+ "\t\telse" + NL + "\t\t{";

-	protected final String TEXT_36 = NL + "\t\t\tboolean old";

-	protected final String TEXT_37 = "ESet = eVirtualIsSet(";

-	protected final String TEXT_38 = "ESet = (";

-	protected final String TEXT_39 = " & ";

-	protected final String TEXT_40 = "_ESETFLAG) != 0;";

-	protected final String TEXT_41 = NL + "\t\t\t";

-	protected final String TEXT_42 = " &= ~";

-	protected final String TEXT_43 = "_ESETFLAG;";

-	protected final String TEXT_44 = "ESet = ";

-	protected final String TEXT_45 = "ESet;";

-	protected final String TEXT_46 = "ESet = false;";

-	protected final String TEXT_47 = NL + "\t\t\tif (eNotificationRequired())" + NL + "\t\t\t\teNotify(new ";

-	protected final String TEXT_48 = "(this, ";

-	protected final String TEXT_49 = ".UNSET, ";

-	protected final String TEXT_50 = ", null, null, old";

-	protected final String TEXT_51 = "ESet));";

-	protected final String TEXT_52 = NL + "\t\t}";

-	protected final String TEXT_53 = " old";

-	protected final String TEXT_54 = "_EFLAG) != 0;";

-	protected final String TEXT_55 = " = ";

-	protected final String TEXT_56 = "_EFLAG_VALUES[(";

-	protected final String TEXT_57 = "_EFLAG) >>> ";

-	protected final String TEXT_58 = "_EFLAG_OFFSET];";

-	protected final String TEXT_59 = NL + "\t\tObject old";

-	protected final String TEXT_60 = " = eVirtualUnset(";

-	protected final String TEXT_61 = ";";

-	protected final String TEXT_62 = NL + "\t\tboolean isSetChange = old";

-	protected final String TEXT_63 = " != EVIRTUAL_NO_VALUE;";

-	protected final String TEXT_64 = NL + "\t\tboolean old";

-	protected final String TEXT_65 = " = null;";

-	protected final String TEXT_66 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t\teNotify(new ";

-	protected final String TEXT_67 = "isSetChange ? old";

-	protected final String TEXT_68 = " : null";

-	protected final String TEXT_69 = "old";

-	protected final String TEXT_70 = ", null, ";

-	protected final String TEXT_71 = "isSetChange";

-	protected final String TEXT_72 = "ESet";

-	protected final String TEXT_73 = "));";

-	protected final String TEXT_74 = ") ";

-	protected final String TEXT_75 = " |= ";

-	protected final String TEXT_76 = "_EFLAG; else ";

-	protected final String TEXT_77 = "_EFLAG;";

-	protected final String TEXT_78 = " & ~";

-	protected final String TEXT_79 = "_EFLAG | ";

-	protected final String TEXT_80 = "_EFLAG_DEFAULT;";

-	protected final String TEXT_81 = " : ";

-	protected final String TEXT_82 = NL + "\t\t((";

-	protected final String TEXT_83 = ".Internal)((";

-	protected final String TEXT_84 = ".Internal.Wrapper)get";

-	protected final String TEXT_85 = "()).featureMap()).clear(";

-	protected final String TEXT_86 = ".Internal)get";

-	protected final String TEXT_87 = "()).clear(";

-	protected final String TEXT_88 = NL + "\t}" + NL;

-	protected final String TEXT_89 = NL;

+	protected final String TEXT_37 = NL + "\t\t\tboolean old";

+	protected final String TEXT_38 = "ESet = eVirtualIsSet(";

+	protected final String TEXT_39 = "ESet = (";

+	protected final String TEXT_40 = " & ";

+	protected final String TEXT_41 = "_ESETFLAG) != 0;";

+	protected final String TEXT_42 = NL + "\t\t\t";

+	protected final String TEXT_43 = " &= ~";

+	protected final String TEXT_44 = "_ESETFLAG;";

+	protected final String TEXT_45 = "ESet = ";

+	protected final String TEXT_46 = "ESet;";

+	protected final String TEXT_47 = "ESet = false;";

+	protected final String TEXT_48 = NL + "\t\t\tif (eNotificationRequired())" + NL + "\t\t\t\teNotify(new ";

+	protected final String TEXT_49 = "(this, ";

+	protected final String TEXT_50 = ".UNSET, ";

+	protected final String TEXT_51 = ", null, null, old";

+	protected final String TEXT_52 = "ESet));";

+	protected final String TEXT_53 = NL + "\t\t}";

+	protected final String TEXT_54 = " old";

+	protected final String TEXT_55 = "_EFLAG) != 0;";

+	protected final String TEXT_56 = " = ";

+	protected final String TEXT_57 = "_EFLAG_VALUES[(";

+	protected final String TEXT_58 = "_EFLAG) >>> ";

+	protected final String TEXT_59 = "_EFLAG_OFFSET];";

+	protected final String TEXT_60 = NL + "\t\tObject old";

+	protected final String TEXT_61 = " = eVirtualUnset(";

+	protected final String TEXT_62 = ";";

+	protected final String TEXT_63 = NL + "\t\tboolean isSetChange = old";

+	protected final String TEXT_64 = " != EVIRTUAL_NO_VALUE;";

+	protected final String TEXT_65 = NL + "\t\tboolean old";

+	protected final String TEXT_66 = " = null;";

+	protected final String TEXT_67 = NL + "\t\tif (eNotificationRequired())" + NL + "\t\t\teNotify(new ";

+	protected final String TEXT_68 = "isSetChange ? old";

+	protected final String TEXT_69 = " : null";

+	protected final String TEXT_70 = "old";

+	protected final String TEXT_71 = ", null, ";

+	protected final String TEXT_72 = "isSetChange";

+	protected final String TEXT_73 = "ESet";

+	protected final String TEXT_74 = "));";

+	protected final String TEXT_75 = ") ";

+	protected final String TEXT_76 = " |= ";

+	protected final String TEXT_77 = "_EFLAG; else ";

+	protected final String TEXT_78 = "_EFLAG;";

+	protected final String TEXT_79 = " & ~";

+	protected final String TEXT_80 = "_EFLAG | ";

+	protected final String TEXT_81 = "_EFLAG_DEFAULT;";

+	protected final String TEXT_82 = " : ";

+	protected final String TEXT_83 = NL + "\t\t((";

+	protected final String TEXT_84 = ".Internal)((";

+	protected final String TEXT_85 = ".Internal.Wrapper)get";

+	protected final String TEXT_86 = "()).featureMap()).clear(";

+	protected final String TEXT_87 = ".Internal)get";

+	protected final String TEXT_88 = "()).clear(";

+	protected final String TEXT_89 = NL + "\t}" + NL;

+	protected final String TEXT_90 = NL;

 

 	public InterfaceunsetGenFeatureoverride() {

 		//Here is the constructor

@@ -149,6 +150,8 @@
 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isImplementationList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

+		List<Object> useInterfaceOverrideAnnotationList = null;

+		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> isGWTList = null;

 		//this pattern can only be called by another (i.e. it's not an entry point in execution)

 		List<Object> publicStaticFinalFlagList = null;

@@ -171,35 +174,38 @@
 						for (Object isJDK50Parameter : isJDK50List) {

 							for (Object isInterfaceParameter : isInterfaceList) {

 								for (Object isImplementationParameter : isImplementationList) {

-									for (Object isGWTParameter : isGWTList) {

-										for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

-											for (Object singleWildcardParameter : singleWildcardList) {

-												for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

-													for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

-														for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

-															for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

+									for (Object useInterfaceOverrideAnnotationParameter : useInterfaceOverrideAnnotationList) {

+										for (Object isGWTParameter : isGWTList) {

+											for (Object publicStaticFinalFlagParameter : publicStaticFinalFlagList) {

+												for (Object singleWildcardParameter : singleWildcardList) {

+													for (Object negativeOffsetCorrectionParameter : negativeOffsetCorrectionList) {

+														for (Object positiveOffsetCorrectionParameter : positiveOffsetCorrectionList) {

+															for (Object negativeOperationOffsetCorrectionParameter : negativeOperationOffsetCorrectionList) {

+																for (Object positiveOperationOffsetCorrectionParameter : positiveOperationOffsetCorrectionList) {

 

-																this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

-																this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

-																this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

-																this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

-																this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

-																this.isInterface = (java.lang.Boolean) isInterfaceParameter;

-																this.isImplementation = (java.lang.Boolean) isImplementationParameter;

-																this.isGWT = (java.lang.Boolean) isGWTParameter;

-																this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

-																this.singleWildcard = (java.lang.String) singleWildcardParameter;

-																this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

-																this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

-																this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

-																this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

+																	this.genFeature = (org.eclipse.emf.codegen.ecore.genmodel.GenFeature) genFeatureParameter;

+																	this.genClass = (org.eclipse.emf.codegen.ecore.genmodel.GenClass) genClassParameter;

+																	this.genPackage = (org.eclipse.emf.codegen.ecore.genmodel.GenPackage) genPackageParameter;

+																	this.genModel = (org.eclipse.emf.codegen.ecore.genmodel.GenModel) genModelParameter;

+																	this.isJDK50 = (java.lang.Boolean) isJDK50Parameter;

+																	this.isInterface = (java.lang.Boolean) isInterfaceParameter;

+																	this.isImplementation = (java.lang.Boolean) isImplementationParameter;

+																	this.useInterfaceOverrideAnnotation = (java.lang.Boolean) useInterfaceOverrideAnnotationParameter;

+																	this.isGWT = (java.lang.Boolean) isGWTParameter;

+																	this.publicStaticFinalFlag = (java.lang.String) publicStaticFinalFlagParameter;

+																	this.singleWildcard = (java.lang.String) singleWildcardParameter;

+																	this.negativeOffsetCorrection = (java.lang.String) negativeOffsetCorrectionParameter;

+																	this.positiveOffsetCorrection = (java.lang.String) positiveOffsetCorrectionParameter;

+																	this.negativeOperationOffsetCorrection = (java.lang.String) negativeOperationOffsetCorrectionParameter;

+																	this.positiveOperationOffsetCorrection = (java.lang.String) positiveOperationOffsetCorrectionParameter;

 

-																if (preCondition(ctx)) {

-																	ctx.setNode(new Node.Container(currentNode,

-																			getClass()));

-																	orchestration(ctx);

+																	if (preCondition(ctx)) {

+																		ctx.setNode(new Node.Container(currentNode,

+																				getClass()));

+																		orchestration(ctx);

+																	}

+

 																}

-

 															}

 														}

 													}

@@ -219,8 +225,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_89);

-		stringBuffer.append(TEXT_89);

+		stringBuffer.append(TEXT_90);

+		stringBuffer.append(TEXT_90);

 		return stringBuffer.toString();

 	}

 

@@ -238,6 +244,7 @@
 			parameterValues.put("isJDK50", this.isJDK50);

 			parameterValues.put("isInterface", this.isInterface);

 			parameterValues.put("isImplementation", this.isImplementation);

+			parameterValues.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 			parameterValues.put("isGWT", this.isGWT);

 			parameterValues.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 			parameterValues.put("singleWildcard", this.singleWildcard);

@@ -294,6 +301,12 @@
 		this.isImplementation = object;

 	}

 

+	protected java.lang.Boolean useInterfaceOverrideAnnotation = null;

+

+	public void set_useInterfaceOverrideAnnotation(java.lang.Boolean object) {

+		this.useInterfaceOverrideAnnotation = object;

+	}

+

 	protected java.lang.Boolean isGWT = null;

 

 	public void set_isGWT(java.lang.Boolean object) {

@@ -345,6 +358,7 @@
 		parameters.put("isJDK50", this.isJDK50);

 		parameters.put("isInterface", this.isInterface);

 		parameters.put("isImplementation", this.isImplementation);

+		parameters.put("useInterfaceOverrideAnnotation", this.useInterfaceOverrideAnnotation);

 		parameters.put("isGWT", this.isGWT);

 		parameters.put("publicStaticFinalFlag", this.publicStaticFinalFlag);

 		parameters.put("singleWildcard", this.singleWildcard);

@@ -361,7 +375,7 @@
 		if (isInterface) {

 			stringBuffer.append(TEXT_2);

 			{

-				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+				//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 				InternalPatternContext ictx = (InternalPatternContext) ctx;

 				new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -375,6 +389,7 @@
 				callParameters.put("isJDK50", isJDK50);

 				callParameters.put("isInterface", isInterface);

 				callParameters.put("isImplementation", isImplementation);

+				callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 				callParameters.put("isGWT", isGWT);

 				callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 				callParameters.put("singleWildcard", singleWildcard);

@@ -399,7 +414,7 @@
 			if (isJDK50) { //Class/unsetGenFeature.annotations.insert.javajetinc

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -413,6 +428,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -436,366 +452,367 @@
 			stringBuffer.append(genFeature.getAccessorName());

 			stringBuffer.append(TEXT_8);

 		} else {

-			stringBuffer.append(TEXT_9);

+			if (useInterfaceOverrideAnnotation && !genClass.isMapEntry()

+					&& !genClass.hasCollidingUnsetAccessorOperation(genFeature)

+					&& !genFeature.isSuppressedUnsetVisibility()) {

+				stringBuffer.append(TEXT_9);

+			}

+			stringBuffer.append(TEXT_10);

 			stringBuffer.append(genFeature.getAccessorName());

 			if (genClass.hasCollidingUnsetAccessorOperation(genFeature)) {

-				stringBuffer.append(TEXT_10);

+				stringBuffer.append(TEXT_11);

 			}

-			stringBuffer.append(TEXT_11);

+			stringBuffer.append(TEXT_12);

 			if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {

-				stringBuffer.append(TEXT_12);

+				stringBuffer.append(TEXT_13);

 				stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 				if (genClass.hasStaticFeatures()) {

-					stringBuffer.append(TEXT_13);

+					stringBuffer.append(TEXT_14);

 				}

-				stringBuffer.append(TEXT_14);

-				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

 				stringBuffer.append(TEXT_15);

-			} else if (genModel.isReflectiveDelegation()) {

+				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

 				stringBuffer.append(TEXT_16);

-				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-				stringBuffer.append(TEXT_15);

-			} else if (genFeature.hasSettingDelegate()) {

+			} else if (genModel.isReflectiveDelegation()) {

 				stringBuffer.append(TEXT_17);

-				stringBuffer.append(genFeature.getUpperName());

+				stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+				stringBuffer.append(TEXT_16);

+			} else if (genFeature.hasSettingDelegate()) {

 				stringBuffer.append(TEXT_18);

+				stringBuffer.append(genFeature.getUpperName());

+				stringBuffer.append(TEXT_19);

 			} else if (!genFeature.isVolatile()) {

 				if (genFeature.isListType()) {

 					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_17);

+						stringBuffer.append(TEXT_18);

 						stringBuffer.append(genFeature.getImportedType(genClass));

-						stringBuffer.append(TEXT_19);

-						stringBuffer.append(genFeature.getSafeName());

 						stringBuffer.append(TEXT_20);

-						stringBuffer.append(genFeature.getImportedType(genClass));

+						stringBuffer.append(genFeature.getSafeName());

 						stringBuffer.append(TEXT_21);

+						stringBuffer.append(genFeature.getImportedType(genClass));

+						stringBuffer.append(TEXT_22);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_15);

+						stringBuffer.append(TEXT_16);

 					}

-					stringBuffer.append(TEXT_22);

-					stringBuffer.append(genFeature.getSafeName());

 					stringBuffer.append(TEXT_23);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));

-					stringBuffer.append(TEXT_24);

-					stringBuffer.append(singleWildcard);

-					stringBuffer.append(TEXT_25);

 					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(TEXT_24);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));

+					stringBuffer.append(TEXT_25);

+					stringBuffer.append(singleWildcard);

 					stringBuffer.append(TEXT_26);

-				} else if (genFeature.isBidirectional() || genFeature.isEffectiveContains()) {

-					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_17);

-						stringBuffer.append(genFeature.getImportedType(genClass));

-						stringBuffer.append(TEXT_19);

-						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_20);

-						stringBuffer.append(genFeature.getImportedType(genClass));

-						stringBuffer.append(TEXT_21);

-						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

-						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_15);

-					}

-					stringBuffer.append(TEXT_22);

 					stringBuffer.append(genFeature.getSafeName());

 					stringBuffer.append(TEXT_27);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

-					stringBuffer.append(TEXT_28);

-					if (!genFeature.isBidirectional()) {

-						stringBuffer.append(TEXT_29);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-						stringBuffer.append(TEXT_25);

+				} else if (genFeature.isBidirectional() || genFeature.isEffectiveContains()) {

+					if (genModel.isVirtualDelegation()) {

+						stringBuffer.append(TEXT_18);

+						stringBuffer.append(genFeature.getImportedType(genClass));

+						stringBuffer.append(TEXT_20);

 						stringBuffer.append(genFeature.getSafeName());

+						stringBuffer.append(TEXT_21);

+						stringBuffer.append(genFeature.getImportedType(genClass));

+						stringBuffer.append(TEXT_22);

+						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

+						stringBuffer.append(positiveOffsetCorrection);

+						stringBuffer.append(TEXT_16);

+					}

+					stringBuffer.append(TEXT_23);

+					stringBuffer.append(genFeature.getSafeName());

+					stringBuffer.append(TEXT_28);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain"));

+					stringBuffer.append(TEXT_29);

+					if (!genFeature.isBidirectional()) {

 						stringBuffer.append(TEXT_30);

+						stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), true));

+						stringBuffer.append(TEXT_31);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(negativeOffsetCorrection);

-						stringBuffer.append(TEXT_31);

+						stringBuffer.append(TEXT_32);

 					} else {

 						GenFeature reverseFeature = genFeature.getReverse();

 						GenClass targetClass = reverseFeature.getGenClass();

 						String reverseOffsetCorrection = targetClass.hasOffsetCorrection()

 								? " + " + genClass.getOffsetCorrectionField(genFeature)

 								: "";

-						stringBuffer.append(TEXT_29);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));

-						stringBuffer.append(TEXT_25);

-						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_32);

+						stringBuffer.append(TEXT_30);

+						stringBuffer.append(genFeature.getAsInternalEObject(genFeature.getSafeName(), true));

+						stringBuffer.append(TEXT_33);

 						stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));

 						stringBuffer.append(reverseOffsetCorrection);

-						stringBuffer.append(TEXT_14);

+						stringBuffer.append(TEXT_15);

 						stringBuffer.append(targetClass.getRawImportedInterfaceName());

-						stringBuffer.append(TEXT_33);

+						stringBuffer.append(TEXT_34);

 					}

-					stringBuffer.append(TEXT_34);

-					stringBuffer.append(genFeature.getAccessorName());

 					stringBuffer.append(TEXT_35);

+					stringBuffer.append(genFeature.getAccessorName());

+					stringBuffer.append(TEXT_36);

 					if (genModel.isVirtualDelegation()) {

-						stringBuffer.append(TEXT_36);

-						stringBuffer.append(genFeature.getCapName());

 						stringBuffer.append(TEXT_37);

+						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(TEXT_38);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_15);

+						stringBuffer.append(TEXT_16);

 					} else if (genClass.isESetFlag(genFeature)) {

 						if (!genModel.isSuppressNotification()) {

-							stringBuffer.append(TEXT_36);

+							stringBuffer.append(TEXT_37);

 							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_38);

-							stringBuffer.append(genClass.getESetFlagsField(genFeature));

 							stringBuffer.append(TEXT_39);

-							stringBuffer.append(genFeature.getUpperName());

+							stringBuffer.append(genClass.getESetFlagsField(genFeature));

 							stringBuffer.append(TEXT_40);

+							stringBuffer.append(genFeature.getUpperName());

+							stringBuffer.append(TEXT_41);

 						}

-						stringBuffer.append(TEXT_41);

-						stringBuffer.append(genClass.getESetFlagsField(genFeature));

 						stringBuffer.append(TEXT_42);

-						stringBuffer.append(genFeature.getUpperName());

+						stringBuffer.append(genClass.getESetFlagsField(genFeature));

 						stringBuffer.append(TEXT_43);

+						stringBuffer.append(genFeature.getUpperName());

+						stringBuffer.append(TEXT_44);

 					} else {

 						if (!genModel.isSuppressNotification()) {

-							stringBuffer.append(TEXT_36);

+							stringBuffer.append(TEXT_37);

 							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_44);

-							stringBuffer.append(genFeature.getUncapName());

 							stringBuffer.append(TEXT_45);

+							stringBuffer.append(genFeature.getUncapName());

+							stringBuffer.append(TEXT_46);

 						}

-						stringBuffer.append(TEXT_41);

+						stringBuffer.append(TEXT_42);

 						stringBuffer.append(genFeature.getUncapName());

-						stringBuffer.append(TEXT_46);

+						stringBuffer.append(TEXT_47);

 					}

 					if (!genModel.isSuppressNotification()) {

-						stringBuffer.append(TEXT_47);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

 						stringBuffer.append(TEXT_48);

-						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

+						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

 						stringBuffer.append(TEXT_49);

+						stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

+						stringBuffer.append(TEXT_50);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_50);

-						stringBuffer.append(genFeature.getCapName());

 						stringBuffer.append(TEXT_51);

+						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(TEXT_52);

 					}

-					stringBuffer.append(TEXT_52);

+					stringBuffer.append(TEXT_53);

 				} else {

 					if (genClass.isFlag(genFeature)) {

 						if (!genModel.isSuppressNotification()) {

 							if (genFeature.isBooleanType()) {

-								stringBuffer.append(TEXT_17);

+								stringBuffer.append(TEXT_18);

 								stringBuffer.append(genFeature.getImportedType(genClass));

-								stringBuffer.append(TEXT_53);

-								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_20);

-								stringBuffer.append(genClass.getFlagsField(genFeature));

-								stringBuffer.append(TEXT_39);

-								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_54);

-							} else {

-								stringBuffer.append(TEXT_17);

-								stringBuffer.append(genFeature.getImportedType(genClass));

-								stringBuffer.append(TEXT_53);

 								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_55);

-								stringBuffer.append(genFeature.getUpperName());

-								stringBuffer.append(TEXT_56);

+								stringBuffer.append(TEXT_21);

 								stringBuffer.append(genClass.getFlagsField(genFeature));

-								stringBuffer.append(TEXT_39);

+								stringBuffer.append(TEXT_40);

+								stringBuffer.append(genFeature.getUpperName());

+								stringBuffer.append(TEXT_55);

+							} else {

+								stringBuffer.append(TEXT_18);

+								stringBuffer.append(genFeature.getImportedType(genClass));

+								stringBuffer.append(TEXT_54);

+								stringBuffer.append(genFeature.getCapName());

+								stringBuffer.append(TEXT_56);

 								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_57);

+								stringBuffer.append(genClass.getFlagsField(genFeature));

+								stringBuffer.append(TEXT_40);

 								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_58);

+								stringBuffer.append(genFeature.getUpperName());

+								stringBuffer.append(TEXT_59);

 							}

 						}

 					} else if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

-						stringBuffer.append(TEXT_59);

-						stringBuffer.append(genFeature.getCapName());

 						stringBuffer.append(TEXT_60);

+						stringBuffer.append(genFeature.getCapName());

+						stringBuffer.append(TEXT_61);

 						stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 						stringBuffer.append(positiveOffsetCorrection);

-						stringBuffer.append(TEXT_15);

+						stringBuffer.append(TEXT_16);

 					} else {

 						if (!genModel.isSuppressNotification()) {

-							stringBuffer.append(TEXT_17);

+							stringBuffer.append(TEXT_18);

 							stringBuffer.append(genFeature.getImportedType(genClass));

-							stringBuffer.append(TEXT_53);

+							stringBuffer.append(TEXT_54);

 							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_55);

+							stringBuffer.append(TEXT_56);

 							stringBuffer.append(genFeature.getSafeName());

-							stringBuffer.append(TEXT_61);

+							stringBuffer.append(TEXT_62);

 						}

 					}

 					if (!genModel.isSuppressNotification()) {

 						if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

-							stringBuffer.append(TEXT_62);

-							stringBuffer.append(genFeature.getCapName());

 							stringBuffer.append(TEXT_63);

+							stringBuffer.append(genFeature.getCapName());

+							stringBuffer.append(TEXT_64);

 						} else if (genClass.isESetFlag(genFeature)) {

-							stringBuffer.append(TEXT_64);

+							stringBuffer.append(TEXT_65);

 							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_38);

-							stringBuffer.append(genClass.getESetFlagsField(genFeature));

 							stringBuffer.append(TEXT_39);

-							stringBuffer.append(genFeature.getUpperName());

+							stringBuffer.append(genClass.getESetFlagsField(genFeature));

 							stringBuffer.append(TEXT_40);

+							stringBuffer.append(genFeature.getUpperName());

+							stringBuffer.append(TEXT_41);

 						} else {

-							stringBuffer.append(TEXT_64);

+							stringBuffer.append(TEXT_65);

 							stringBuffer.append(genFeature.getCapName());

-							stringBuffer.append(TEXT_44);

-							stringBuffer.append(genFeature.getUncapName());

 							stringBuffer.append(TEXT_45);

+							stringBuffer.append(genFeature.getUncapName());

+							stringBuffer.append(TEXT_46);

 						}

 					}

 					if (genFeature.isReferenceType()) {

-						stringBuffer.append(TEXT_17);

+						stringBuffer.append(TEXT_18);

 						stringBuffer.append(genFeature.getSafeName());

-						stringBuffer.append(TEXT_65);

+						stringBuffer.append(TEXT_66);

 						if (!genModel.isVirtualDelegation()) {

 							if (genClass.isESetFlag(genFeature)) {

-								stringBuffer.append(TEXT_17);

+								stringBuffer.append(TEXT_18);

 								stringBuffer.append(genClass.getESetFlagsField(genFeature));

-								stringBuffer.append(TEXT_42);

-								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_43);

+								stringBuffer.append(genFeature.getUpperName());

+								stringBuffer.append(TEXT_44);

 							} else {

-								stringBuffer.append(TEXT_17);

+								stringBuffer.append(TEXT_18);

 								stringBuffer.append(genFeature.getUncapName());

-								stringBuffer.append(TEXT_46);

+								stringBuffer.append(TEXT_47);

 							}

 						}

 						if (!genModel.isSuppressNotification()) {

-							stringBuffer.append(TEXT_66);

+							stringBuffer.append(TEXT_67);

 							stringBuffer

 									.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

-							stringBuffer.append(TEXT_48);

-							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

 							stringBuffer.append(TEXT_49);

+							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

+							stringBuffer.append(TEXT_50);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_14);

+							stringBuffer.append(TEXT_15);

 							if (genModel.isVirtualDelegation()) {

-								stringBuffer.append(TEXT_67);

-								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_68);

-							} else {

+								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_69);

+							} else {

+								stringBuffer.append(TEXT_70);

 								stringBuffer.append(genFeature.getCapName());

 							}

-							stringBuffer.append(TEXT_70);

+							stringBuffer.append(TEXT_71);

 							if (genModel.isVirtualDelegation()) {

-								stringBuffer.append(TEXT_71);

-							} else {

-								stringBuffer.append(TEXT_69);

-								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_72);

+							} else {

+								stringBuffer.append(TEXT_70);

+								stringBuffer.append(genFeature.getCapName());

+								stringBuffer.append(TEXT_73);

 							}

-							stringBuffer.append(TEXT_73);

+							stringBuffer.append(TEXT_74);

 						}

 					} else {

 						if (genClass.isFlag(genFeature)) {

 							if (genFeature.isBooleanType()) {

-								stringBuffer.append(TEXT_22);

+								stringBuffer.append(TEXT_23);

 								stringBuffer.append(genFeature.getEDefault());

-								stringBuffer.append(TEXT_74);

-								stringBuffer.append(genClass.getFlagsField(genFeature));

 								stringBuffer.append(TEXT_75);

-								stringBuffer.append(genFeature.getUpperName());

-								stringBuffer.append(TEXT_76);

 								stringBuffer.append(genClass.getFlagsField(genFeature));

-								stringBuffer.append(TEXT_42);

+								stringBuffer.append(TEXT_76);

 								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_77);

-							} else {

-								stringBuffer.append(TEXT_17);

 								stringBuffer.append(genClass.getFlagsField(genFeature));

-								stringBuffer.append(TEXT_55);

-								stringBuffer.append(genClass.getFlagsField(genFeature));

-								stringBuffer.append(TEXT_78);

+								stringBuffer.append(TEXT_43);

 								stringBuffer.append(genFeature.getUpperName());

+								stringBuffer.append(TEXT_78);

+							} else {

+								stringBuffer.append(TEXT_18);

+								stringBuffer.append(genClass.getFlagsField(genFeature));

+								stringBuffer.append(TEXT_56);

+								stringBuffer.append(genClass.getFlagsField(genFeature));

 								stringBuffer.append(TEXT_79);

 								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_80);

+								stringBuffer.append(genFeature.getUpperName());

+								stringBuffer.append(TEXT_81);

 							}

 						} else if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {

-							stringBuffer.append(TEXT_17);

+							stringBuffer.append(TEXT_18);

 							stringBuffer.append(genFeature.getSafeName());

-							stringBuffer.append(TEXT_55);

+							stringBuffer.append(TEXT_56);

 							stringBuffer.append(genFeature.getEDefault());

-							stringBuffer.append(TEXT_61);

+							stringBuffer.append(TEXT_62);

 						}

 						if (!genModel.isVirtualDelegation() || genFeature.isPrimitiveType()) {

 							if (genClass.isESetFlag(genFeature)) {

-								stringBuffer.append(TEXT_17);

+								stringBuffer.append(TEXT_18);

 								stringBuffer.append(genClass.getESetFlagsField(genFeature));

-								stringBuffer.append(TEXT_42);

-								stringBuffer.append(genFeature.getUpperName());

 								stringBuffer.append(TEXT_43);

+								stringBuffer.append(genFeature.getUpperName());

+								stringBuffer.append(TEXT_44);

 							} else {

-								stringBuffer.append(TEXT_17);

+								stringBuffer.append(TEXT_18);

 								stringBuffer.append(genFeature.getUncapName());

-								stringBuffer.append(TEXT_46);

+								stringBuffer.append(TEXT_47);

 							}

 						}

 						if (!genModel.isSuppressNotification()) {

-							stringBuffer.append(TEXT_66);

+							stringBuffer.append(TEXT_67);

 							stringBuffer

 									.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));

-							stringBuffer.append(TEXT_48);

-							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

 							stringBuffer.append(TEXT_49);

+							stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));

+							stringBuffer.append(TEXT_50);

 							stringBuffer.append(genClass.getQualifiedFeatureID(genFeature));

 							stringBuffer.append(positiveOffsetCorrection);

-							stringBuffer.append(TEXT_14);

+							stringBuffer.append(TEXT_15);

 							if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

-								stringBuffer.append(TEXT_67);

+								stringBuffer.append(TEXT_68);

 								stringBuffer.append(genFeature.getCapName());

-								stringBuffer.append(TEXT_81);

+								stringBuffer.append(TEXT_82);

 								stringBuffer.append(genFeature.getEDefault());

 							} else {

-								stringBuffer.append(TEXT_69);

+								stringBuffer.append(TEXT_70);

 								stringBuffer.append(genFeature.getCapName());

 							}

-							stringBuffer.append(TEXT_14);

+							stringBuffer.append(TEXT_15);

 							stringBuffer.append(genFeature.getEDefault());

-							stringBuffer.append(TEXT_14);

+							stringBuffer.append(TEXT_15);

 							if (genModel.isVirtualDelegation() && !genFeature.isPrimitiveType()) {

-								stringBuffer.append(TEXT_71);

-							} else {

-								stringBuffer.append(TEXT_69);

-								stringBuffer.append(genFeature.getCapName());

 								stringBuffer.append(TEXT_72);

+							} else {

+								stringBuffer.append(TEXT_70);

+								stringBuffer.append(genFeature.getCapName());

+								stringBuffer.append(TEXT_73);

 							}

-							stringBuffer.append(TEXT_73);

+							stringBuffer.append(TEXT_74);

 						}

 					}

 				}

 			} else if (genFeature.hasDelegateFeature()) {

 				GenFeature delegateFeature = genFeature.getDelegateFeature();

 				if (delegateFeature.isWrappedFeatureMapType()) {

-					stringBuffer.append(TEXT_82);

-					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

 					stringBuffer.append(TEXT_83);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

 					stringBuffer.append(TEXT_84);

-					stringBuffer.append(delegateFeature.getAccessorName());

-					stringBuffer.append(TEXT_85);

-					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-					stringBuffer.append(TEXT_15);

-				} else {

-					stringBuffer.append(TEXT_82);

 					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

-					stringBuffer.append(TEXT_86);

+					stringBuffer.append(TEXT_85);

 					stringBuffer.append(delegateFeature.getAccessorName());

-					stringBuffer.append(TEXT_87);

+					stringBuffer.append(TEXT_86);

 					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

-					stringBuffer.append(TEXT_15);

+					stringBuffer.append(TEXT_16);

+				} else {

+					stringBuffer.append(TEXT_83);

+					stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap"));

+					stringBuffer.append(TEXT_87);

+					stringBuffer.append(delegateFeature.getAccessorName());

+					stringBuffer.append(TEXT_88);

+					stringBuffer.append(genFeature.getQualifiedFeatureAccessor());

+					stringBuffer.append(TEXT_16);

 				}

 			} else if (genClass.getUnsetAccessorOperation(genFeature) != null) {

-				stringBuffer.append(TEXT_17);

+				stringBuffer.append(TEXT_18);

 				stringBuffer.append(

 						genClass.getUnsetAccessorOperation(genFeature).getBody(genModel.getIndentation(stringBuffer)));

 			} else {

 				stringBuffer.append(TEXT_2);

 				{

-					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

+					//<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>

 

 					InternalPatternContext ictx = (InternalPatternContext) ctx;

 					new Node.DataLeaf(ictx.getNode(), getClass(), null, stringBuffer.toString());

@@ -809,6 +826,7 @@
 					callParameters.put("isJDK50", isJDK50);

 					callParameters.put("isInterface", isInterface);

 					callParameters.put("isImplementation", isImplementation);

+					callParameters.put("useInterfaceOverrideAnnotation", useInterfaceOverrideAnnotation);

 					callParameters.put("isGWT", isGWT);

 					callParameters.put("publicStaticFinalFlag", publicStaticFinalFlag);

 					callParameters.put("singleWildcard", singleWildcard);

@@ -824,7 +842,7 @@
 

 				//Class/unsetGenFeature.todo.override.javajetinc

 			}

-			stringBuffer.append(TEXT_88);

+			stringBuffer.append(TEXT_89);

 		}

 		stringBuffer.append(TEXT_2);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/ResourceFactoryClass/ResourceFactoryClasscreateResourceoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/ResourceFactoryClass/ResourceFactoryClasscreateResourceoverride.java
index a68c182..bd26b62 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/ResourceFactoryClass/ResourceFactoryClasscreateResourceoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/ResourceFactoryClass/ResourceFactoryClasscreateResourceoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.ResourceFactoryClass;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/ValidatorClass/ValidatorClassinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/ValidatorClass/ValidatorClassinsert.java
index ff1643c..4b4d009 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/ValidatorClass/ValidatorClassinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/model/call/ValidatorClass/ValidatorClassinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.model.call.ValidatorClass;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
index 30f9b4f..afc647e 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/BuildProperties.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -32,12 +32,14 @@
 	protected final String TEXT_3 = ",\\";

 	protected final String TEXT_4 = NL + "               META-INF/,\\";

 	protected final String TEXT_5 = NL + "               plugin.xml,\\";

-	protected final String TEXT_6 = NL + "               plugin.properties" + NL + "jars.compile.order = ";

-	protected final String TEXT_7 = NL + "source.";

-	protected final String TEXT_8 = " = ";

-	protected final String TEXT_9 = NL + "output.";

-	protected final String TEXT_10 = " = bin/" + NL;

-	protected final String TEXT_11 = NL;

+	protected final String TEXT_6 = NL + "               ";

+	protected final String TEXT_7 = ".properties";

+	protected final String TEXT_8 = NL + "jars.compile.order = ";

+	protected final String TEXT_9 = NL + "source.";

+	protected final String TEXT_10 = " = ";

+	protected final String TEXT_11 = NL + "output.";

+	protected final String TEXT_12 = " = bin/" + NL;

+	protected final String TEXT_13 = NL;

 

 	public BuildProperties() {

 		//Here is the constructor

@@ -73,8 +75,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_11);

-		stringBuffer.append(TEXT_11);

+		stringBuffer.append(TEXT_13);

+		stringBuffer.append(TEXT_13);

 		return stringBuffer.toString();

 	}

 

@@ -146,9 +148,9 @@
 		/**

 		 * Copyright (c) 2005-2008 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

@@ -181,7 +183,17 @@
 		} else {

 			stringBuffer.append(TEXT_5);

 		}

-		stringBuffer.append(TEXT_6);

+		String testsBundleLocalization = genModel.getTestsBundleLocalization();

+		int index = testsBundleLocalization.indexOf("/");

+		if (index == -1) {

+			stringBuffer.append(TEXT_6);

+			stringBuffer.append(testsBundleLocalization);

+			stringBuffer.append(TEXT_7);

+		} else {

+			stringBuffer.append(TEXT_6);

+			stringBuffer.append(testsBundleLocalization.substring(0, index + 1));

+		}

+		stringBuffer.append(TEXT_8);

 		stringBuffer.append(pluginClassesLocation);

 		boolean first = true;

 		for (Iterator<String> i = sourceFolders.iterator(); i.hasNext();) {

@@ -190,18 +202,18 @@
 				sourceFolder += ",\\";

 			}

 			if (first) {

-				stringBuffer.append(TEXT_7);

+				stringBuffer.append(TEXT_9);

 				stringBuffer.append(pluginClassesLocation);

-				stringBuffer.append(TEXT_8);

+				stringBuffer.append(TEXT_10);

 				stringBuffer.append(sourceFolder);

 				first = false;

 			} else {

 				stringBuffer.append(sourceFolder);

 			}

 		}

-		stringBuffer.append(TEXT_9);

+		stringBuffer.append(TEXT_11);

 		stringBuffer.append(pluginClassesLocation);

-		stringBuffer.append(TEXT_10);

+		stringBuffer.append(TEXT_12);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
index 04a8b58..53d60ee 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ManifestMF.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -27,26 +27,28 @@
 	}

 

 	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

-	protected final String TEXT_1 = "Manifest-Version: 1.0" + NL + "Bundle-ManifestVersion: 2" + NL

-			+ "Bundle-Name: %pluginName" + NL + "Bundle-SymbolicName: ";

-	protected final String TEXT_2 = ";singleton:=true" + NL + "Bundle-Version: 1.0.0.qualifier" + NL

-			+ "Bundle-ClassPath: ";

-	protected final String TEXT_3 = ".jar";

-	protected final String TEXT_4 = ".";

-	protected final String TEXT_5 = NL + "Bundle-Vendor: %providerName" + NL + "Bundle-Localization: plugin";

-	protected final String TEXT_6 = NL + "Bundle-RequiredExecutionEnvironment: J2SE-1.5";

-	protected final String TEXT_7 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.6";

-	protected final String TEXT_8 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.7";

-	protected final String TEXT_9 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.8";

-	protected final String TEXT_10 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-9";

-	protected final String TEXT_11 = NL + "Export-Package: ";

-	protected final String TEXT_12 = ",";

-	protected final String TEXT_13 = NL + " ";

-	protected final String TEXT_14 = NL + "Require-Bundle: ";

-	protected final String TEXT_15 = ";visibility:=reexport";

-	protected final String TEXT_16 = NL + "Eclipse-LazyStart: true";

-	protected final String TEXT_17 = NL + "Bundle-ActivationPolicy: lazy" + NL;

-	protected final String TEXT_18 = NL;

+	protected final String TEXT_1 = "Manifest-Version: 1.0" + NL + "Bundle-ManifestVersion: 2" + NL + "Bundle-Name: ";

+	protected final String TEXT_2 = NL + "Bundle-SymbolicName: ";

+	protected final String TEXT_3 = ";singleton:=true" + NL + "Automatic-Module-Name: ";

+	protected final String TEXT_4 = NL + "Bundle-Version: 1.0.0.qualifier" + NL + "Bundle-ClassPath: ";

+	protected final String TEXT_5 = ".jar";

+	protected final String TEXT_6 = ".";

+	protected final String TEXT_7 = NL + "Bundle-Vendor: ";

+	protected final String TEXT_8 = NL + "Bundle-Localization: ";

+	protected final String TEXT_9 = NL + "Bundle-RequiredExecutionEnvironment: J2SE-1.5";

+	protected final String TEXT_10 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.6";

+	protected final String TEXT_11 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.7";

+	protected final String TEXT_12 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-1.8";

+	protected final String TEXT_13 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-9";

+	protected final String TEXT_14 = NL + "Bundle-RequiredExecutionEnvironment: JavaSE-10";

+	protected final String TEXT_15 = NL + "Export-Package: ";

+	protected final String TEXT_16 = ",";

+	protected final String TEXT_17 = NL + " ";

+	protected final String TEXT_18 = NL + "Require-Bundle: ";

+	protected final String TEXT_19 = ";visibility:=reexport";

+	protected final String TEXT_20 = NL + "Eclipse-LazyStart: true";

+	protected final String TEXT_21 = NL + "Bundle-ActivationPolicy: lazy" + NL;

+	protected final String TEXT_22 = NL;

 

 	public ManifestMF() {

 		//Here is the constructor

@@ -82,8 +84,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_18);

-		stringBuffer.append(TEXT_18);

+		stringBuffer.append(TEXT_22);

+		stringBuffer.append(TEXT_22);

 		return stringBuffer.toString();

 	}

 

@@ -155,9 +157,9 @@
 		/**

 		 * Copyright (c) 2005 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

@@ -165,62 +167,71 @@
 

 		GenModel genModel = (GenModel) argument;

 		stringBuffer.append(TEXT_1);

-		stringBuffer.append(genModel.getTestsPluginID());

+		stringBuffer.append(genModel.getTestsBundleNameKey());

 		stringBuffer.append(TEXT_2);

+		stringBuffer.append(genModel.getTestsPluginID());

+		stringBuffer.append(TEXT_3);

+		stringBuffer.append(genModel.getTestsPluginID());

+		stringBuffer.append(TEXT_4);

 		if (genModel.isRuntimeJar()) {

 			stringBuffer.append(genModel.getTestsPluginID());

-			stringBuffer.append(TEXT_3);

+			stringBuffer.append(TEXT_5);

 		} else {

-			stringBuffer.append(TEXT_4);

-		}

-		stringBuffer.append(TEXT_5);

-		if (genModel.getComplianceLevel() == GenJDKLevel.JDK50_LITERAL) {

 			stringBuffer.append(TEXT_6);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK60_LITERAL) {

-			stringBuffer.append(TEXT_7);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK70_LITERAL) {

-			stringBuffer.append(TEXT_8);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK80_LITERAL) {

+		}

+		stringBuffer.append(TEXT_7);

+		stringBuffer.append(genModel.getTestsBundleVendorKey());

+		stringBuffer.append(TEXT_8);

+		stringBuffer.append(genModel.getTestsBundleLocalization());

+		if (genModel.getComplianceLevel() == GenJDKLevel.JDK50_LITERAL) {

 			stringBuffer.append(TEXT_9);

-		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK90_LITERAL) {

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK60_LITERAL) {

 			stringBuffer.append(TEXT_10);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK70_LITERAL) {

+			stringBuffer.append(TEXT_11);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK80_LITERAL) {

+			stringBuffer.append(TEXT_12);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK90_LITERAL) {

+			stringBuffer.append(TEXT_13);

+		} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK100_LITERAL) {

+			stringBuffer.append(TEXT_14);

 		}

 		Iterator<String> packagesIterator = genModel.getTestsQualifiedPackageNames().iterator();

 		if (packagesIterator.hasNext()) {

 			String pack = packagesIterator.next();

-			stringBuffer.append(TEXT_11);

+			stringBuffer.append(TEXT_15);

 			stringBuffer.append(pack);

 			while (packagesIterator.hasNext()) {

 				pack = packagesIterator.next();

-				stringBuffer.append(TEXT_12);

-				stringBuffer.append(TEXT_13);

+				stringBuffer.append(TEXT_16);

+				stringBuffer.append(TEXT_17);

 				stringBuffer.append(pack);

 			}

 		}

 		Iterator<String> requiredPluginIterator = genModel.getTestsRequiredPlugins().iterator();

 		if (requiredPluginIterator.hasNext()) {

 			String pluginID = requiredPluginIterator.next();

-			stringBuffer.append(TEXT_14);

+			stringBuffer.append(TEXT_18);

 			stringBuffer.append(pluginID);

 			if (!pluginID.startsWith("org.eclipse.core.runtime")) {

-				stringBuffer.append(TEXT_15);

+				stringBuffer.append(TEXT_19);

 			}

 			while (requiredPluginIterator.hasNext()) {

 				pluginID = requiredPluginIterator.next();

-				stringBuffer.append(TEXT_12);

-				stringBuffer.append(TEXT_13);

+				stringBuffer.append(TEXT_16);

+				stringBuffer.append(TEXT_17);

 				stringBuffer.append(pluginID);

 				if (!pluginID.startsWith("org.eclipse.core.runtime") && !pluginID.equals("org.eclipse.xtext.xbase.lib")

 						&& !pluginID.equals("org.eclipse.emf.ecore.xcore.lib")) {

-					stringBuffer.append(TEXT_15);

+					stringBuffer.append(TEXT_19);

 				}

 			}

 		}

 		if (genModel.getRuntimeVersion() == GenRuntimeVersion.EMF22

 				|| genModel.getRuntimeVersion() == GenRuntimeVersion.EMF23) {

-			stringBuffer.append(TEXT_16);

+			stringBuffer.append(TEXT_20);

 		}

-		stringBuffer.append(TEXT_17);

+		stringBuffer.append(TEXT_21);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
index d8a6cf2..c9c537e 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/ModelTestSuite.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -171,9 +171,9 @@
 		/**

 		 * Copyright (c) 2005 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
index 0cd1ad0..9cd0cbc 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageExample.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -256,9 +256,9 @@
 		/**

 		 * Copyright (c) 2005-2007 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
index 0ea8fa8..a02389d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PackageTestSuite.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -171,9 +171,9 @@
 		/**

 		 * Copyright (c) 2005 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
index 2ed73b1..684206f 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginProperties.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -29,8 +29,9 @@
 	public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;

 	protected final String TEXT_1 = "";

 	protected final String TEXT_2 = NL + NL + "pluginName = ";

-	protected final String TEXT_3 = " Tests" + NL + "providerName = www.example.org" + NL;

+	protected final String TEXT_3 = NL + "providerName = ";

 	protected final String TEXT_4 = NL;

+	protected final String TEXT_5 = NL;

 

 	public PluginProperties() {

 		//Here is the constructor

@@ -66,8 +67,8 @@
 			ctx.getReporter().executionFinished(OutputManager.computeExecutionOutput(ctx), ctx);

 		}

 

-		stringBuffer.append(TEXT_4);

-		stringBuffer.append(TEXT_4);

+		stringBuffer.append(TEXT_5);

+		stringBuffer.append(TEXT_5);

 		return stringBuffer.toString();

 	}

 

@@ -107,7 +108,8 @@
 			throws Exception {

 

 		GenModel genModel = parameter;

-		targetPathName = genModel.getTestsProjectDirectory() + "/plugin.properties";

+		targetPathName = genModel.getTestsProjectDirectory() + "/" + genModel.getTestsBundleLocalization()

+				+ ".properties";

 

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "setReporterVariables", stringBuffer.toString());

@@ -137,9 +139,9 @@
 		/**

 		 * Copyright (c) 2005 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

@@ -163,8 +165,10 @@
 		}

 

 		stringBuffer.append(TEXT_2);

-		stringBuffer.append(genModel.getModelName());

+		stringBuffer.append(genModel.getTestsBundleName());

 		stringBuffer.append(TEXT_3);

+		stringBuffer.append(genModel.getTestsBundleVendorName());

+		stringBuffer.append(TEXT_4);

 		InternalPatternContext ictx = (InternalPatternContext) ctx;

 		new Node.DataLeaf(ictx.getNode(), getClass(), "doGenerate", stringBuffer.toString());

 	}

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
index dbdd91b..2308c7d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/PluginXML.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -154,9 +154,9 @@
 		/**

 		 * Copyright (c) 2005 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 * 

 		 * Contributors: 

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
index 47ec7ba..ff2a6da 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/TestCase.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests;

 

 import org.eclipse.egf.emf.pattern.base.*;

@@ -215,9 +215,9 @@
 		/**

 		 * Copyright (c) 2005, 2007 IBM Corporation and others.

 		 * All rights reserved.   This program and the accompanying materials

-		 * are made available under the terms of the Eclipse Public License v1.0

+		 * are made available under the terms of the Eclipse Public License v2.0

 		 * which accompanies this distribution, and is available at

-		 * http://www.eclipse.org/legal/epl-v10.html

+		 * http://www.eclipse.org/legal/epl-v20.html

 		 *

 		 * Contributors:

 		 *   IBM - Initial API and implementation

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegenOperationannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegenOperationannotationsinsert.java
index fc1db0a..7d6ef6a 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegenOperationannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegenOperationannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegetGenFeatureTODOoverride.java
index b04da94..65bb56c 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegetGenFeatureannotationsinsert.java
index 3ab6ed7..bfca283 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegetGenFeatureoverride.java
index ee51030..70577ca 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasegetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenFeatureinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenFeatureinsert.java
index 95e3134..95433b4 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenFeatureinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenFeatureinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenFeatureoverride.java
index 34cb0d9..7cc5e76 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenOperationTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenOperationTODOoverride.java
index 5e2c4d9..c273c04 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenOperationTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenOperationTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenOperationinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenOperationinsert.java
index c032315..db61553 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenOperationinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenOperationinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenOperationoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenOperationoverride.java
index 9086381..23e28c5 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenOperationoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseimplementedGenOperationoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseinsert.java
index d675bec..fb6fe50 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseisSetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseisSetGenFeatureTODOoverride.java
index f232f6f..bd19ce2 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseisSetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseisSetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseisSetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseisSetGenFeatureannotationsinsert.java
index d919e50..2053c12 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseisSetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseisSetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseisSetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseisSetGenFeatureoverride.java
index b51ff51..c22d22f 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseisSetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseisSetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasesetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasesetGenFeatureTODOoverride.java
index ef0b084..4505be1 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasesetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasesetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasesetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasesetGenFeatureannotationsinsert.java
index ff88bfc..95b875a 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasesetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasesetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasesetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasesetGenFeatureoverride.java
index a5809ac..8aba337 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasesetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCasesetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseunsetGenFeatureTODOoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseunsetGenFeatureTODOoverride.java
index 9fb7e13..025b350 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseunsetGenFeatureTODOoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseunsetGenFeatureTODOoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseunsetGenFeatureannotationsinsert.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseunsetGenFeatureannotationsinsert.java
index d62c8d0..1813ab0 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseunsetGenFeatureannotationsinsert.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseunsetGenFeatureannotationsinsert.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseunsetGenFeatureoverride.java b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseunsetGenFeatureoverride.java
index 2e38c35..25534f2 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseunsetGenFeatureoverride.java
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/generated/org/eclipse/egf/emf/pattern/tests/call/TestCase/TestCaseunsetGenFeatureoverride.java
@@ -1,4 +1,4 @@
-//Generated with EGF 1.5.0.qualifier

+//Generated with EGF 1.6.0.201901231418

 package org.eclipse.egf.emf.pattern.tests.call.TestCase;

 

 import org.eclipse.egf.emf.pattern.base.*;

diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._00BroGJ-Ed-FqczH3ESmRw/method._00BrsmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._00BroGJ-Ed-FqczH3ESmRw/method._00BrsmJ-Ed-FqczH3ESmRw.pt
index 03623c9..b903d2e 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._00BroGJ-Ed-FqczH3ESmRw/method._00BrsmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._00BroGJ-Ed-FqczH3ESmRw/method._00BrsmJ-Ed-FqczH3ESmRw.pt
@@ -2,7 +2,7 @@
 
 	/**
 	 * Unsets the value of the '{@link <%=genClass.getRawQualifiedInterfaceName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
   <%if (!genFeature.isSuppressedIsSetVisibility()) {%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._00oIkGJ-Ed-FqczH3ESmRw/method._00oIomJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._00oIkGJ-Ed-FqczH3ESmRw/method._00oIomJ-Ed-FqczH3ESmRw.pt
index 64ca99c..89cc0ee 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._00oIkGJ-Ed-FqczH3ESmRw/method._00oIomJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._00oIkGJ-Ed-FqczH3ESmRw/method._00oIomJ-Ed-FqczH3ESmRw.pt
@@ -1,7 +1,7 @@
 
 
 <%if (isInterface) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/isSetGenFeature.javadoc.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/isSetGenFeature.javadoc.override.javajetinc%>
 <%} else {%>
 	/**
 	 * <!-- begin-user-doc -->
@@ -12,7 +12,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/isSetGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
 <%}%>
 <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
@@ -22,6 +22,9 @@
 	boolean isSet<%=genFeature.getAccessorName()%>();
 
 <%} else {%>
+  <%if (useInterfaceOverrideAnnotation  && !genClass.isMapEntry() && !genClass.hasCollidingIsSetAccessorOperation(genFeature) && !genFeature.isSuppressedIsSetVisibility()) {%>
+	@Override
+  <%}%>
 	public boolean isSet<%=genFeature.getAccessorName()%><%if (genClass.hasCollidingIsSetAccessorOperation(genFeature)) {%>_<%}%>()
 	{
     <%if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {%>
@@ -54,7 +57,7 @@
     <%} else if (genClass.getIsSetAccessorOperation(genFeature) != null) {%>
 		<%=genClass.getIsSetAccessorOperation(genFeature).getBody(genModel.getIndentation(stringBuffer))%>
     <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/isSetGenFeature.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/isSetGenFeature.todo.override.javajetinc%>
     <%}%>
 	}
 
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._00x5kGJ-Ed-FqczH3ESmRw/method._00x5omJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._00x5kGJ-Ed-FqczH3ESmRw/method._00x5omJ-Ed-FqczH3ESmRw.pt
index 948b2b2..7790ffd 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._00x5kGJ-Ed-FqczH3ESmRw/method._00x5omJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._00x5kGJ-Ed-FqczH3ESmRw/method._00x5omJ-Ed-FqczH3ESmRw.pt
@@ -2,7 +2,7 @@
 
 	/**
 	 * Returns whether the value of the '{@link <%=genClass.getRawQualifiedInterfaceName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%> is set.
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return whether the value of the '<em><%=genFeature.getFormattedName()%></em>' <%=genFeature.getFeatureKind()%> is set.
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._01-MYGJ-Ed-FqczH3ESmRw/method._01-McmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._01-MYGJ-Ed-FqczH3ESmRw/method._01-McmJ-Ed-FqczH3ESmRw.pt
index 6ab7904..b6edacf 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._01-MYGJ-Ed-FqczH3ESmRw/method._01-McmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._01-MYGJ-Ed-FqczH3ESmRw/method._01-McmJ-Ed-FqczH3ESmRw.pt
@@ -38,7 +38,7 @@
     <%}%>
   <%}%>
 <%if (isInterface) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.javadoc.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/genOperation.javadoc.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.javadoc.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/genOperation.javadoc.override.javajetinc%>
 <%} else {%>
 	/**
 	 * <!-- begin-user-doc -->
@@ -49,7 +49,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/genOperation.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.annotations.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.annotations.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
 <%}%>
 <%if (isJDK50 && genOperation.hasAPIDeprecatedTag()) {%>
@@ -62,6 +62,9 @@
   <%if (genModel.useGenerics() && !genOperation.hasBody() && !genOperation.isInvariant() && genOperation.hasInvocationDelegate() && genOperation.isUncheckedCast(genClass)) {%>
 	@SuppressWarnings("unchecked")
   <%}%>
+  <%if (useInterfaceOverrideAnnotation && !genClass.isMapEntry() && !genOperation.isSuppressedVisibility()) {%>
+	@Override
+  <%}%>
 	public <%=genOperation.getTypeParameters(genClass)%><%=genOperation.getImportedType(genClass)%> <%=genOperation.getName()%>(<%=genOperation.getParameters(isImplementation, genClass)%>)<%=genOperation.getThrows(genClass)%>
 	{
   <%if (genOperation.hasBody()) {%>
@@ -115,9 +118,9 @@
 			throw new <%=genModel.getImportedName("org.eclipse.emf.common.util.WrappedException")%>(ite);
 		}
   <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.implementedGenOperation.TODO.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/implementedGenOperation.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.implementedGenOperation.TODO.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/implementedGenOperation.todo.override.javajetinc%>
   <%}%>
 	}
 
 <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._02HWUGJ-Ed-FqczH3ESmRw/method._02HWYmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._02HWUGJ-Ed-FqczH3ESmRw/method._02HWYmJ-Ed-FqczH3ESmRw.pt
index 8a45b6b..70fb037 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._02HWUGJ-Ed-FqczH3ESmRw/method._02HWYmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._02HWUGJ-Ed-FqczH3ESmRw/method._02HWYmJ-Ed-FqczH3ESmRw.pt
@@ -1,7 +1,7 @@
 
 
 	/**
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.javadoc.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.javadoc.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
   <%if (genOperation.hasDocumentation() || genOperation.hasParameterDocumentation()) {%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._03mkEWJ-Ed-FqczH3ESmRw/method._03mkHWJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._03mkEWJ-Ed-FqczH3ESmRw/method._03mkHWJ-Ed-FqczH3ESmRw.pt
index 9ffe19d..047bafd 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._03mkEWJ-Ed-FqczH3ESmRw/method._03mkHWJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._03mkEWJ-Ed-FqczH3ESmRw/method._03mkHWJ-Ed-FqczH3ESmRw.pt
@@ -25,13 +25,23 @@
 				 getString("<%=genModel.getPropertyCategoryKey(genFeature.getPropertyCategory())%>"),<%=genModel.getNonNLS()%>
   <%}%>
   <%if (genFeature.getPropertyFilterFlags().isEmpty()) {%>
+    <%if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF214_VALUE && genFeature.getPropertyEditorFactory() != null && genFeature.getPropertyEditorFactory().trim().length() != 0) {%>
+				 null,
+				 <%=genModel.getImportedName("org.eclipse.emf.common.util.URI")%>.createURI(<%=org.eclipse.emf.codegen.ecore.genmodel.impl.Literals.toStringLiteral(genFeature.getPropertyEditorFactory().trim(), genModel)%>)));
+    <%} else {%>
 				 null));
+    <%}%>
   <%} else {%>
 				 new String[] {
-    <%for (Iterator<String> j = genFeature.getPropertyFilterFlags().iterator(); j.hasNext();) { String filterFlag = j.next();%>
+    <%/*}*/for (Iterator<String> j = genFeature.getPropertyFilterFlags().iterator(); j.hasNext();) { String filterFlag = j.next();%>
       <%if (filterFlag != null && filterFlag.length() > 0) {%>
 					"<%=filterFlag%>"<%if (j.hasNext()) {%>,<%}%><%=genModel.getNonNLS()%>
       <%}%>
     <%}%>
+    <%if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF214_VALUE && genFeature.getPropertyEditorFactory() != null && genFeature.getPropertyEditorFactory().trim().length() != 0) { // {%>
+				 },
+				 <%=genModel.getImportedName("org.eclipse.emf.common.util.URI")%>.createURI(<%=org.eclipse.emf.codegen.ecore.genmodel.impl.Literals.toStringLiteral(genFeature.getPropertyEditorFactory().trim(), genModel)%>)));
+    <%} else { // {%>
 				 }));
+    <%}%>
   <%}%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0jpGTmJ-Ed-FqczH3ESmRw/method._0jpGYGJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0jpGTmJ-Ed-FqczH3ESmRw/method._0jpGYGJ-Ed-FqczH3ESmRw.pt
index 6033f17..61371a9 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0jpGTmJ-Ed-FqczH3ESmRw/method._0jpGYGJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0jpGTmJ-Ed-FqczH3ESmRw/method._0jpGYGJ-Ed-FqczH3ESmRw.pt
@@ -239,4 +239,4 @@
 
       <%}%>
     <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.declaredFieldGenFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.declaredFieldGenFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0kO8IGJ-Ed-FqczH3ESmRw/method._0kO8MmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0kO8IGJ-Ed-FqczH3ESmRw/method._0kO8MmJ-Ed-FqczH3ESmRw.pt
index 361354f..1f22cd9 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0kO8IGJ-Ed-FqczH3ESmRw/method._0kO8MmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0kO8IGJ-Ed-FqczH3ESmRw/method._0kO8MmJ-Ed-FqczH3ESmRw.pt
@@ -19,6 +19,9 @@
     <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
 	@Deprecated
     <%}%>
+    <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+    <%}%>
 	public <%=arrayElementType%>[] <%=genFeature.getGetArrayAccessor()%>()
 	{
       <%if (genFeature.isVolatile()) {%>
@@ -48,6 +51,9 @@
 	<%=genFeature.getListItemType(genClass)%> get<%=genFeature.getAccessorName()%>(int index);
 
     <%} else {%>
+    <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+    <%}%>
 	public <%=genFeature.getListItemType(genClass)%> get<%=genFeature.getAccessorName()%>(int index)
 	{
 		return <%if (!genModel.useGenerics()) {%>(<%=genFeature.getListItemType(genClass)%>)<%}%><%=genFeature.getGetAccessor()%>().get(index);
@@ -69,6 +75,9 @@
 	int get<%=genFeature.getAccessorName()%>Length();
 
     <%} else {%>
+    <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+    <%}%>
 	public int get<%=genFeature.getAccessorName()%>Length()
 	{
       <%if (genFeature.isVolatile()) {%>
@@ -94,6 +103,9 @@
 	void set<%=genFeature.getAccessorName()%>(<%=genFeature.getListItemType(genClass)%>[] new<%=genFeature.getCapName()%>);
 
     <%} else {%>
+    <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+    <%}%>
 	public void set<%=genFeature.getAccessorName()%>(<%=genFeature.getListItemType(genClass)%>[] new<%=genFeature.getCapName()%>)
 	{
 		((<%=genModel.getImportedName("org.eclipse.emf.common.util.BasicEList")%><%=genFeature.getListTemplateArguments(genClass)%>)<%=genFeature.getGetAccessor()%>()).setData(new<%=genFeature.getCapName()%>.length, new<%=genFeature.getCapName()%>);
@@ -115,6 +127,9 @@
 	void set<%=genFeature.getAccessorName()%>(int index, <%=genFeature.getListItemType(genClass)%> element);
 
     <%} else {%>
+    <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+    <%}%>
 	public void set<%=genFeature.getAccessorName()%>(int index, <%=genFeature.getListItemType(genClass)%> element)
 	{
 		<%=genFeature.getGetAccessor()%>().set(index, element);
@@ -123,24 +138,24 @@
     <%}%>
   <%}%>
   <%if (genFeature.isGet() && (isImplementation || !genFeature.isSuppressedGetVisibility())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/getGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/getGenFeature.override.javajetinc%>
   <%}%>
   <%if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicGet()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicGetGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicGetGenFeature.override.javajetinc%>
   <%}%>
   <%if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicSet()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicSetGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicSetGenFeature.override.javajetinc%>
   <%}%>
   <%if (genFeature.isSet() && (isImplementation || !genFeature.isSuppressedSetVisibility())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/setGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/setGenFeature.override.javajetinc%>
   <%}%>
   <%if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicUnset()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class.basicUnsetGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class.basicUnsetGenFeature.override.javajetinc%>
   <%}%>
   <%if (genFeature.isUnset() && (isImplementation || !genFeature.isSuppressedUnsetVisibility())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/unsetGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/unsetGenFeature.override.javajetinc%>
   <%}%>
   <%if (genFeature.isIsSet() && (isImplementation || !genFeature.isSuppressedIsSetVisibility())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/isSetGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/isSetGenFeature.override.javajetinc%>
   <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0kh3EGJ-Ed-FqczH3ESmRw/method._0kh3ImJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0kh3EGJ-Ed-FqczH3ESmRw/method._0kh3ImJ-Ed-FqczH3ESmRw.pt
index 4ae3706..1a82a0b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0kh3EGJ-Ed-FqczH3ESmRw/method._0kh3ImJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0kh3EGJ-Ed-FqczH3ESmRw/method._0kh3ImJ-Ed-FqczH3ESmRw.pt
@@ -1,7 +1,7 @@
 
 
 <%if (isInterface) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/getGenFeature.javadoc.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/getGenFeature.javadoc.override.javajetinc%>
 <%} else {%>
 	/**
 	 * <!-- begin-user-doc -->
@@ -12,7 +12,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/getGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
 <%}%>
         <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
@@ -25,9 +25,12 @@
   <%if (genModel.useGenerics() && ((genFeature.isContainer() || genFeature.isResolveProxies()) && !genFeature.isListType() && genFeature.isUncheckedCast(genClass) || genFeature.isListType() && !genFeature.isFeatureMapType() && (genModel.isReflectiveDelegation() || genModel.isVirtualDelegation() || (genModel.isDynamicDelegation() && !genFeature.isVolatile())) || genFeature.isListDataType() && genFeature.hasDelegateFeature() || genFeature.isListType() && genFeature.hasSettingDelegate())) {%>
 	@SuppressWarnings("unchecked")
   <%}%>
+  <%if (useInterfaceOverrideAnnotation && !genClass.isMapEntry() && !genClass.hasCollidingGetAccessorOperation(genFeature) && !genFeature.isSuppressedGetVisibility()) {%>
+	@Override
+  <%}%>
 	public <%=genFeature.getImportedType(genClass)%> <%=genFeature.getGetAccessor()%><%if (genClass.hasCollidingGetAccessorOperation(genFeature)) {%>_<%}%>()
 	{
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
     <%if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {%>
 		return <%if (!isJDK50 && genFeature.isPrimitiveType()) {%>(<%}%>(<%=genFeature.getObjectType(genClass)%>)eDynamicGet(<%=genClass.getQualifiedFeatureID(genFeature)%><%if (genClass.hasStaticFeatures()){%> - ESTATIC_FEATURE_COUNT<%}%>, <%=genFeature.getQualifiedFeatureAccessor()%>, true, <%=!genFeature.isEffectiveSuppressEMFTypes()%>)<%if (!isJDK50 && genFeature.isPrimitiveType()) {%>).<%=genFeature.getPrimitiveValueFunction()%>()<%}%>;
     <%} else if (genModel.isReflectiveDelegation()) {%>
@@ -62,12 +65,12 @@
           <%}%>
 		if (<%=genFeature.getSafeName()%> != null && <%=genFeature.getSafeNameAsEObject()%>.eIsProxy())
 		{
-			<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> old<%=genFeature.getCapName()%> = (<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>;
+			<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> old<%=genFeature.getCapName()%> = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), false)%>;
 			<%=genFeature.getSafeName()%> = <%=genFeature.getNonEObjectInternalTypeCast(genClass)%>eResolveProxy(old<%=genFeature.getCapName()%>);
 			if (<%=genFeature.getSafeName()%> != old<%=genFeature.getCapName()%>)
 			{
           <%if (genFeature.isEffectiveContains()) {%>
-				<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> new<%=genFeature.getCapName()%> = (<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>;
+				<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> new<%=genFeature.getCapName()%> = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), false)%>;
           <%if (!genFeature.isBidirectional()) {%>
 				<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = old<%=genFeature.getCapName()%>.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, null);
           <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
@@ -107,7 +110,7 @@
     <%} else {//volatile%>
       <%if (genFeature.isResolveProxies() && !genFeature.isListType()) {%>
 		<%=genFeature.getImportedType(genClass)%> <%=genFeature.getSafeName()%> = basicGet<%=genFeature.getAccessorName()%>();
-		return <%=genFeature.getSafeName()%> != null && <%=genFeature.getSafeNameAsEObject()%>.eIsProxy() ? <%=genFeature.getNonEObjectInternalTypeCast(genClass)%>eResolveProxy((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>) : <%=genFeature.getSafeName()%>;
+		return <%=genFeature.getSafeName()%> != null && <%=genFeature.getSafeNameAsEObject()%>.eIsProxy() ? <%=genFeature.getNonEObjectInternalTypeCast(genClass)%>eResolveProxy(<%=genFeature.getAsInternalEObject(genFeature.getSafeName(), false)%>) : <%=genFeature.getSafeName()%>;
       <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
         <%if (genFeature.isFeatureMapType()) {%>
         <%String featureMapEntryTemplateArgument = isJDK50 ? "<" + genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap") + ".Entry>" : "";%>
@@ -134,7 +137,7 @@
       <%} else if (genFeature.hasGetterBody()) {%>
 		<%=genFeature.getGetterBody(genModel.getIndentation(stringBuffer))%>
       <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/getGenFeature.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/getGenFeature.todo.override.javajetinc%>
       <%}%>
     <%}%>
 	}
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0kroEGJ-Ed-FqczH3ESmRw/method._0kroImJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0kroEGJ-Ed-FqczH3ESmRw/method._0kroImJ-Ed-FqczH3ESmRw.pt
index 10e4b72..c61332c 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0kroEGJ-Ed-FqczH3ESmRw/method._0kroImJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0kroEGJ-Ed-FqczH3ESmRw/method._0kroImJ-Ed-FqczH3ESmRw.pt
@@ -23,7 +23,7 @@
 	 * It is bidirectional and its opposite is '{@link <%=reverseGenFeature.getGenClass().getRawQualifiedInterfaceName()%>#<%=reverseGenFeature.getGetAccessor()%> <em><%=reverseGenFeature.getFormattedName()%></em>}'.
       <%}%>
     <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 	 * <!-- begin-user-doc -->
     <%if (!genFeature.hasDocumentation()) {%>
 	 * <p>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0lk_8GJ-Ed-FqczH3ESmRw/method._0llAAmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0lk_8GJ-Ed-FqczH3ESmRw/method._0llAAmJ-Ed-FqczH3ESmRw.pt
index ae71d04..14737f8 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0lk_8GJ-Ed-FqczH3ESmRw/method._0llAAmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0lk_8GJ-Ed-FqczH3ESmRw/method._0llAAmJ-Ed-FqczH3ESmRw.pt
@@ -9,14 +9,14 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/basicGetGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
     <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
 	@Deprecated
     <%}%>
 	public <%=genFeature.getImportedType(genClass)%> basicGet<%=genFeature.getAccessorName()%>()
 	{
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
     <%if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {%>
 		return (<%=genFeature.getImportedType(genClass)%>)eDynamicGet(<%=genClass.getQualifiedFeatureID(genFeature)%><%if (genClass.hasStaticFeatures()){%> - ESTATIC_FEATURE_COUNT<%}%>, <%=genFeature.getQualifiedFeatureAccessor()%>, false, <%=!genFeature.isEffectiveSuppressEMFTypes()%>);
     <%} else if (genFeature.hasSettingDelegate()) {%>
@@ -39,7 +39,7 @@
     <%} else if (genFeature.hasGetterBody()) {%>
 		<%=genFeature.getGetterBody(genModel.getIndentation(stringBuffer))%>
     <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicGetGenFeature.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicGetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicGetGenFeature.todo.override.javajetinc%>
     <%}%>
 	}
 
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0mUm0GJ-Ed-FqczH3ESmRw/method._0mUm4mJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0mUm0GJ-Ed-FqczH3ESmRw/method._0mUm4mJ-Ed-FqczH3ESmRw.pt
index 21357c6..53898ee 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0mUm0GJ-Ed-FqczH3ESmRw/method._0mUm4mJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0mUm0GJ-Ed-FqczH3ESmRw/method._0mUm4mJ-Ed-FqczH3ESmRw.pt
@@ -9,7 +9,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/basicSetGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
     <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
 	@Deprecated
@@ -17,17 +17,17 @@
 	public <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> basicSet<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedInternalType(genClass)%> new<%=genFeature.getCapName()%>, <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs)
 	{
     <%if (genFeature.isContainer()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
-		msgs = eBasicSetContainer((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>, <%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>, msgs);
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+		msgs = eBasicSetContainer(<%=genFeature.getAsInternalEObject("new" + genFeature.getCapName(), false)%>, <%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>, msgs);
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 		return msgs;
     <%} else if (genModel.isDynamicDelegation()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
-		msgs = eDynamicInverseAdd((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>, <%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>, msgs);
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+		msgs = eDynamicInverseAdd(<%=genFeature.getAsInternalEObject("new" + genFeature.getCapName(), false)%>, <%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>, msgs);
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 		return msgs;
     <%} else if (!genFeature.isVolatile()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
       <%if (genModel.isVirtualDelegation()) {%>
 		Object old<%=genFeature.getCapName()%> = eVirtualSet(<%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>, new<%=genFeature.getCapName()%>);
       <%} else {%>
@@ -62,7 +62,7 @@
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
       <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 		return msgs;
     <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
       <%if (delegateFeature.isWrappedFeatureMapType()) {%>
@@ -71,7 +71,7 @@
 		return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)get<%=delegateFeature.getAccessorName()%>()).basicAdd(<%=genFeature.getQualifiedFeatureAccessor()%>, new<%=genFeature.getCapName()%>, msgs);
       <%}%>
     <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicSetGenFeature.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicSetGenFeature.todo.override.javajetinc%>
     <%}%>
 	}
 
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0nN-sGJ-Ed-FqczH3ESmRw/method._0nN-wmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0nN-sGJ-Ed-FqczH3ESmRw/method._0nN-wmJ-Ed-FqczH3ESmRw.pt
index e8540bc..9a899ad 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0nN-sGJ-Ed-FqczH3ESmRw/method._0nN-wmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0nN-sGJ-Ed-FqczH3ESmRw/method._0nN-wmJ-Ed-FqczH3ESmRw.pt
@@ -1,7 +1,7 @@
 
 
 <%if (isInterface) { %>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/setGenFeature.javadoc.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/setGenFeature.javadoc.override.javajetinc%>
 <%} else {%>
 	/**
 	 * <!-- begin-user-doc -->
@@ -12,7 +12,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/setGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
 <%}%>
 <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
@@ -22,11 +22,16 @@
 	void set<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedType(genClass)%> value);
 
 <%} else { GenOperation setAccessorOperation = genClass.getSetAccessorOperation(genFeature);%>
+  <%if (useInterfaceOverrideAnnotation && !genClass.isMapEntry() && !genClass.hasCollidingSetAccessorOperation(genFeature) && !genFeature.isSuppressedSetVisibility()) {%>
+	@Override
+  <%}%>
 	public void set<%=genFeature.getAccessorName()%><%if (genClass.hasCollidingSetAccessorOperation(genFeature)) {%>_<%}%>(<%=genFeature.getImportedType(genClass)%> <%=setAccessorOperation == null ? "new" + genFeature.getCapName() : setAccessorOperation.getGenParameters().get(0).getName()%>)
 	{
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.pre.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.pre.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
     <%if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.dynamicSetGenFeature.pre.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 		eDynamicSet(<%=genClass.getQualifiedFeatureID(genFeature)%><%if (genClass.hasStaticFeatures()){%> - ESTATIC_FEATURE_COUNT<%}%>, <%=genFeature.getQualifiedFeatureAccessor()%>, <%if (!isJDK50 && genFeature.isPrimitiveType()) {%>new <%=genFeature.getObjectType(genClass)%>(<%}%>new<%=genFeature.getCapName()%><%if (!isJDK50 && genFeature.isPrimitiveType()) {%>)<%}%>);
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.dynamicSetGenFeature.post.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
     <%} else if (genModel.isReflectiveDelegation()) {%>
 		eSet(<%=genFeature.getQualifiedFeatureAccessor()%>, <%if (!isJDK50 && genFeature.isPrimitiveType()) {%>new <%=genFeature.getObjectType(genClass)%>(<%}%>new<%=genFeature.getCapName()%><%if (!isJDK50 && genFeature.isPrimitiveType()) {%>)<%}%>);
     <%} else if (genFeature.hasSettingDelegate()) {%>
@@ -41,7 +46,7 @@
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (new<%=genFeature.getCapName()%> != null)
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>).eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
+				msgs = <%=genFeature.getAsInternalEObject("new" + genFeature.getCapName(), true)%>.eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
 			msgs = basicSet<%=genFeature.getAccessorName()%>(<%=genFeature.getInternalTypeCast()%>new<%=genFeature.getCapName()%>, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
@@ -58,13 +63,13 @@
 			<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = null;
 			if (<%=genFeature.getSafeName()%> != null)
         <%if (!genFeature.isBidirectional()) {%>
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
+				msgs = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), true)%>.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
 			if (new<%=genFeature.getCapName()%> != null)
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
+				msgs = <%=genFeature.getAsInternalEObject("new" + genFeature.getCapName(), true)%>.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
         <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
+				msgs = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), true)%>.eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
 			if (new<%=genFeature.getCapName()%> != null)
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>).eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
+				msgs = <%=genFeature.getAsInternalEObject("new" + genFeature.getCapName(), true)%>.eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
         <%}%>
 			msgs = basicSet<%=genFeature.getAccessorName()%>(<%=genFeature.getInternalTypeCast()%>new<%=genFeature.getCapName()%>, msgs);
 			if (msgs != null) msgs.dispatch();
@@ -159,7 +164,7 @@
           <%}%>
         <%}%>
       <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.post.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.post.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
     <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
       <%if (delegateFeature.isWrappedFeatureMapType()) {%>
 		((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap()).set(<%=genFeature.getQualifiedFeatureAccessor()%>, <%if (!isJDK50 && genFeature.isPrimitiveType()) {%>new <%=genFeature.getObjectType(genClass)%>(<%}%>new<%=genFeature.getCapName()%><%if (!isJDK50 && genFeature.isPrimitiveType()) {%>)<%}%>);
@@ -169,7 +174,7 @@
     <%} else if (setAccessorOperation != null) {%>
 		<%=setAccessorOperation.getBody(genModel.getIndentation(stringBuffer))%>
     <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.TODO.override" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/setGenFeature.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.TODO.override" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/setGenFeature.todo.override.javajetinc%>
     <%}%>
 	}
 
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0nXIoGJ-Ed-FqczH3ESmRw/method._0nXIsmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0nXIoGJ-Ed-FqczH3ESmRw/method._0nXIsmJ-Ed-FqczH3ESmRw.pt
index bf65bba..49f4b58 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0nXIoGJ-Ed-FqczH3ESmRw/method._0nXIsmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0nXIoGJ-Ed-FqczH3ESmRw/method._0nXIsmJ-Ed-FqczH3ESmRw.pt
@@ -2,7 +2,7 @@
 
 	/**
 	 * Sets the value of the '{@link <%=genClass.getRawQualifiedInterfaceName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em><%=genFeature.getFormattedName()%></em>' <%=genFeature.getFeatureKind()%>.
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0q8BEGJ-Ed-FqczH3ESmRw/method._0q8BImJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0q8BEGJ-Ed-FqczH3ESmRw/method._0q8BImJ-Ed-FqczH3ESmRw.pt
index 44bc115..a5dc10a 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0q8BEGJ-Ed-FqczH3ESmRw/method._0q8BImJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0q8BEGJ-Ed-FqczH3ESmRw/method._0q8BImJ-Ed-FqczH3ESmRw.pt
@@ -1,7 +1,7 @@
 
 
 <%if (isInterface) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/unsetGenFeature.javadoc.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/unsetGenFeature.javadoc.override.javajetinc%>
 <%} else {%>
 	/**
 	 * <!-- begin-user-doc -->
@@ -12,7 +12,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/unsetGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
 <%}%>
 <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
@@ -22,6 +22,9 @@
 	void unset<%=genFeature.getAccessorName()%>();
 
 <%} else {%>
+  <%if (useInterfaceOverrideAnnotation && !genClass.isMapEntry() && !genClass.hasCollidingUnsetAccessorOperation(genFeature) && !genFeature.isSuppressedUnsetVisibility()) {%>
+	@Override
+  <%}%>
 	public void unset<%=genFeature.getAccessorName()%><%if (genClass.hasCollidingUnsetAccessorOperation(genFeature)) {%>_<%}%>()
 	{
     <%if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {%>
@@ -44,9 +47,9 @@
 		{
 			<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = null;
         <%if (!genFeature.isBidirectional()) {%>
-			msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
+			msgs = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), true)%>.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
         <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
-			msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
+			msgs = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), true)%>.eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
         <%}%>
 			msgs = basicUnset<%=genFeature.getAccessorName()%>(msgs);
 			if (msgs != null) msgs.dispatch();
@@ -141,7 +144,7 @@
     <%} else if (genClass.getUnsetAccessorOperation(genFeature) != null) {%>
 		<%=genClass.getUnsetAccessorOperation(genFeature).getBody(genModel.getIndentation(stringBuffer))%>
     <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/unsetGenFeature.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/unsetGenFeature.todo.override.javajetinc%>
     <%}%>
 	}
 
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0qfVIGJ-Ed-FqczH3ESmRw/method._0qfVMmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0qfVIGJ-Ed-FqczH3ESmRw/method._0qfVMmJ-Ed-FqczH3ESmRw.pt
index ccdfbc2..35786c92 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0qfVIGJ-Ed-FqczH3ESmRw/method._0qfVMmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0qfVIGJ-Ed-FqczH3ESmRw/method._0qfVMmJ-Ed-FqczH3ESmRw.pt
@@ -9,7 +9,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/basicUnsetGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
 <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
 	@Deprecated
@@ -17,7 +17,7 @@
 	public <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> basicUnset<%=genFeature.getAccessorName()%>(<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs)
 	{
     <%if (genModel.isDynamicDelegation()) {%>
-		return eDynamicInverseRemove((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%if (genFeature.isResolveProxies()) {%>basicGet<%=genFeature.getAccessorName()%><%} else {%><%=genFeature.getGetAccessor()%><%}%>(), <%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>, msgs);
+		return eDynamicInverseRemove(<%=genFeature.getAsInternalEObject("", false)%><%if (genFeature.isResolveProxies()) {%>basicGet<%=genFeature.getAccessorName()%><%} else {%><%=genFeature.getGetAccessor()%><%}%>(), <%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>, msgs);
     <%} else if (!genFeature.isVolatile()) {%>
       <%if (genModel.isVirtualDelegation()) {%>
         <%if (!genModel.isSuppressNotification()) {%>Object old<%=genFeature.getCapName()%> = <%}%>eVirtualUnset(<%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>);
@@ -51,7 +51,7 @@
 		return msgs;
         <%}%>
     <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicUnsetGenFeature.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicUnsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicUnsetGenFeature.todo.override.javajetinc%>
     <%}%>
 	}
 
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0rPjEGJ-Ed-FqczH3ESmRw/method._0rPjImJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0rPjEGJ-Ed-FqczH3ESmRw/method._0rPjImJ-Ed-FqczH3ESmRw.pt
index 94a63cd..fd03a31 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0rPjEGJ-Ed-FqczH3ESmRw/method._0rPjImJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0rPjEGJ-Ed-FqczH3ESmRw/method._0rPjImJ-Ed-FqczH3ESmRw.pt
@@ -2,7 +2,7 @@
 
 	/**
 	 * Unsets the value of the '{@link <%=genClass.getRawQualifiedInterfaceName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.unsetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
   <%if (!genFeature.isSuppressedIsSetVisibility()) {%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0sIT4GJ-Ed-FqczH3ESmRw/method._0sIT8mJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0sIT4GJ-Ed-FqczH3ESmRw/method._0sIT8mJ-Ed-FqczH3ESmRw.pt
index 6e08bd9..bf2e0ea 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0sIT4GJ-Ed-FqczH3ESmRw/method._0sIT8mJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0sIT4GJ-Ed-FqczH3ESmRw/method._0sIT8mJ-Ed-FqczH3ESmRw.pt
@@ -1,7 +1,7 @@
 
 
 <%if (isInterface) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/isSetGenFeature.javadoc.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/isSetGenFeature.javadoc.override.javajetinc%>
 <%} else {%>
 	/**
 	 * <!-- begin-user-doc -->
@@ -12,7 +12,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/isSetGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
 <%}%>
 <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
@@ -22,6 +22,9 @@
 	boolean isSet<%=genFeature.getAccessorName()%>();
 
 <%} else {%>
+  <%if (useInterfaceOverrideAnnotation  && !genClass.isMapEntry() && !genClass.hasCollidingIsSetAccessorOperation(genFeature) && !genFeature.isSuppressedIsSetVisibility()) {%>
+	@Override
+  <%}%>
 	public boolean isSet<%=genFeature.getAccessorName()%><%if (genClass.hasCollidingIsSetAccessorOperation(genFeature)) {%>_<%}%>()
 	{
     <%if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {%>
@@ -54,7 +57,7 @@
     <%} else if (genClass.getIsSetAccessorOperation(genFeature) != null) {%>
 		<%=genClass.getIsSetAccessorOperation(genFeature).getBody(genModel.getIndentation(stringBuffer))%>
     <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/isSetGenFeature.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/isSetGenFeature.todo.override.javajetinc%>
     <%}%>
 	}
 
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0sSE4GJ-Ed-FqczH3ESmRw/method._0sSE8mJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0sSE4GJ-Ed-FqczH3ESmRw/method._0sSE8mJ-Ed-FqczH3ESmRw.pt
index 088e8c3..39bb2eb 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0sSE4GJ-Ed-FqczH3ESmRw/method._0sSE8mJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0sSE4GJ-Ed-FqczH3ESmRw/method._0sSE8mJ-Ed-FqczH3ESmRw.pt
@@ -2,7 +2,7 @@
 
 	/**
 	 * Returns whether the value of the '{@link <%=genClass.getRawQualifiedInterfaceName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%> is set.
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.isSetGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return whether the value of the '<em><%=genFeature.getFormattedName()%></em>' <%=genFeature.getFeatureKind()%> is set.
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0tBrwGJ-Ed-FqczH3ESmRw/method._0tLc0GJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0tBrwGJ-Ed-FqczH3ESmRw/method._0tLc0GJ-Ed-FqczH3ESmRw.pt
index d1433d2..2516bdc 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0tBrwGJ-Ed-FqczH3ESmRw/method._0tLc0GJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0tBrwGJ-Ed-FqczH3ESmRw/method._0tLc0GJ-Ed-FqczH3ESmRw.pt
@@ -38,7 +38,7 @@
     <%}%>
   <%}%>
 <%if (isInterface) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.javadoc.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/genOperation.javadoc.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.javadoc.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/genOperation.javadoc.override.javajetinc%>
 <%} else {%>
 	/**
 	 * <!-- begin-user-doc -->
@@ -49,7 +49,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/genOperation.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.annotations.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.annotations.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
 <%}%>
 <%if (isJDK50 && genOperation.hasAPIDeprecatedTag()) {%>
@@ -62,6 +62,9 @@
   <%if (genModel.useGenerics() && !genOperation.hasBody() && !genOperation.isInvariant() && genOperation.hasInvocationDelegate() && genOperation.isUncheckedCast(genClass)) {%>
 	@SuppressWarnings("unchecked")
   <%}%>
+  <%if (useInterfaceOverrideAnnotation && !genClass.isMapEntry() && !genOperation.isSuppressedVisibility()) {%>
+	@Override
+  <%}%>
 	public <%=genOperation.getTypeParameters(genClass)%><%=genOperation.getImportedType(genClass)%> <%=genOperation.getName()%>(<%=genOperation.getParameters(isImplementation, genClass)%>)<%=genOperation.getThrows(genClass)%>
 	{
   <%if (genOperation.hasBody()) {%>
@@ -115,9 +118,9 @@
 			throw new <%=genModel.getImportedName("org.eclipse.emf.common.util.WrappedException")%>(ite);
 		}
   <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.implementedGenOperation.TODO.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/implementedGenOperation.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.implementedGenOperation.TODO.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/implementedGenOperation.todo.override.javajetinc%>
   <%}%>
 	}
 
 <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0tUmsGJ-Ed-FqczH3ESmRw/method._0tUmwmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0tUmsGJ-Ed-FqczH3ESmRw/method._0tUmwmJ-Ed-FqczH3ESmRw.pt
index cc3760f..2d65982 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0tUmsGJ-Ed-FqczH3ESmRw/method._0tUmwmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0tUmsGJ-Ed-FqczH3ESmRw/method._0tUmwmJ-Ed-FqczH3ESmRw.pt
@@ -1,7 +1,7 @@
 
 
 	/**
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.javadoc.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.javadoc.insert" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
   <%if (genOperation.hasDocumentation() || genOperation.hasParameterDocumentation()) {%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0u0bgWJ-Ed-FqczH3ESmRw/method._0u0bk2J-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0u0bgWJ-Ed-FqczH3ESmRw/method._0u0bk2J-Ed-FqczH3ESmRw.pt
index 22f8de1..7515682 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0u0bgWJ-Ed-FqczH3ESmRw/method._0u0bk2J-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0u0bgWJ-Ed-FqczH3ESmRw/method._0u0bk2J-Ed-FqczH3ESmRw.pt
@@ -239,4 +239,4 @@
 
       <%}%>
     <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.declaredFieldGenFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.declaredFieldGenFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0vaRYGJ-Ed-FqczH3ESmRw/method._0vaRcmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0vaRYGJ-Ed-FqczH3ESmRw/method._0vaRcmJ-Ed-FqczH3ESmRw.pt
index 6675e1a..4d170a9 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0vaRYGJ-Ed-FqczH3ESmRw/method._0vaRcmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0vaRYGJ-Ed-FqczH3ESmRw/method._0vaRcmJ-Ed-FqczH3ESmRw.pt
@@ -19,6 +19,9 @@
     <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
 	@Deprecated
     <%}%>
+    <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+    <%}%>
 	public <%=arrayElementType%>[] <%=genFeature.getGetArrayAccessor()%>()
 	{
       <%if (genFeature.isVolatile()) {%>
@@ -48,6 +51,9 @@
 	<%=genFeature.getListItemType(genClass)%> get<%=genFeature.getAccessorName()%>(int index);
 
     <%} else {%>
+    <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+    <%}%>
 	public <%=genFeature.getListItemType(genClass)%> get<%=genFeature.getAccessorName()%>(int index)
 	{
 		return <%if (!genModel.useGenerics()) {%>(<%=genFeature.getListItemType(genClass)%>)<%}%><%=genFeature.getGetAccessor()%>().get(index);
@@ -69,6 +75,9 @@
 	int get<%=genFeature.getAccessorName()%>Length();
 
     <%} else {%>
+    <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+    <%}%>
 	public int get<%=genFeature.getAccessorName()%>Length()
 	{
       <%if (genFeature.isVolatile()) {%>
@@ -94,6 +103,9 @@
 	void set<%=genFeature.getAccessorName()%>(<%=genFeature.getListItemType(genClass)%>[] new<%=genFeature.getCapName()%>);
 
     <%} else {%>
+    <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+    <%}%>
 	public void set<%=genFeature.getAccessorName()%>(<%=genFeature.getListItemType(genClass)%>[] new<%=genFeature.getCapName()%>)
 	{
 		((<%=genModel.getImportedName("org.eclipse.emf.common.util.BasicEList")%><%=genFeature.getListTemplateArguments(genClass)%>)<%=genFeature.getGetAccessor()%>()).setData(new<%=genFeature.getCapName()%>.length, new<%=genFeature.getCapName()%>);
@@ -115,6 +127,9 @@
 	void set<%=genFeature.getAccessorName()%>(int index, <%=genFeature.getListItemType(genClass)%> element);
 
     <%} else {%>
+    <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+    <%}%>
 	public void set<%=genFeature.getAccessorName()%>(int index, <%=genFeature.getListItemType(genClass)%> element)
 	{
 		<%=genFeature.getGetAccessor()%>().set(index, element);
@@ -123,24 +138,24 @@
     <%}%>
   <%}%>
   <%if (genFeature.isGet() && (isImplementation || !genFeature.isSuppressedGetVisibility())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/getGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/getGenFeature.override.javajetinc%>
   <%}%>
   <%if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicGet()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicGetGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicGetGenFeature.override.javajetinc%>
   <%}%>
   <%if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicSet()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicSetGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicSetGenFeature.override.javajetinc%>
   <%}%>
   <%if (genFeature.isSet() && (isImplementation || !genFeature.isSuppressedSetVisibility())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/setGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/setGenFeature.override.javajetinc%>
   <%}%>
   <%if (isImplementation && !genModel.isReflectiveDelegation() && genFeature.isBasicUnset()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class.basicUnsetGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class.basicUnsetGenFeature.override.javajetinc%>
   <%}%>
   <%if (genFeature.isUnset() && (isImplementation || !genFeature.isSuppressedUnsetVisibility())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/unsetGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/unsetGenFeature.override.javajetinc%>
   <%}%>
   <%if (genFeature.isIsSet() && (isImplementation || !genFeature.isSuppressedIsSetVisibility())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/isSetGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.isSetGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/isSetGenFeature.override.javajetinc%>
   <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeature.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0vkCYGJ-Ed-FqczH3ESmRw/method._0vkCcmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0vkCYGJ-Ed-FqczH3ESmRw/method._0vkCcmJ-Ed-FqczH3ESmRw.pt
index abbc7fa..81ac845 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0vkCYGJ-Ed-FqczH3ESmRw/method._0vkCcmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0vkCYGJ-Ed-FqczH3ESmRw/method._0vkCcmJ-Ed-FqczH3ESmRw.pt
@@ -1,7 +1,7 @@
 
 
 <%if (isInterface) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/getGenFeature.javadoc.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/getGenFeature.javadoc.override.javajetinc%>
 <%} else {%>
 	/**
 	 * <!-- begin-user-doc -->
@@ -12,7 +12,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/getGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
 <%}%>
         <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
@@ -25,9 +25,12 @@
   <%if (genModel.useGenerics() && ((genFeature.isContainer() || genFeature.isResolveProxies()) && !genFeature.isListType() && genFeature.isUncheckedCast(genClass) || genFeature.isListType() && !genFeature.isFeatureMapType() && (genModel.isReflectiveDelegation() || genModel.isVirtualDelegation() || (genModel.isDynamicDelegation() && !genFeature.isVolatile())) || genFeature.isListDataType() && genFeature.hasDelegateFeature() || genFeature.isListType() && genFeature.hasSettingDelegate())) {%>
 	@SuppressWarnings("unchecked")
   <%}%>
+  <%if (useInterfaceOverrideAnnotation && !genClass.isMapEntry() && !genClass.hasCollidingGetAccessorOperation(genFeature) && !genFeature.isSuppressedGetVisibility()) {%>
+	@Override
+  <%}%>
 	public <%=genFeature.getImportedType(genClass)%> <%=genFeature.getGetAccessor()%><%if (genClass.hasCollidingGetAccessorOperation(genFeature)) {%>_<%}%>()
 	{
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
     <%if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {%>
 		return <%if (!isJDK50 && genFeature.isPrimitiveType()) {%>(<%}%>(<%=genFeature.getObjectType(genClass)%>)eDynamicGet(<%=genClass.getQualifiedFeatureID(genFeature)%><%if (genClass.hasStaticFeatures()){%> - ESTATIC_FEATURE_COUNT<%}%>, <%=genFeature.getQualifiedFeatureAccessor()%>, true, <%=!genFeature.isEffectiveSuppressEMFTypes()%>)<%if (!isJDK50 && genFeature.isPrimitiveType()) {%>).<%=genFeature.getPrimitiveValueFunction()%>()<%}%>;
     <%} else if (genModel.isReflectiveDelegation()) {%>
@@ -62,12 +65,12 @@
           <%}%>
 		if (<%=genFeature.getSafeName()%> != null && <%=genFeature.getSafeNameAsEObject()%>.eIsProxy())
 		{
-			<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> old<%=genFeature.getCapName()%> = (<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>;
+			<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> old<%=genFeature.getCapName()%> = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), false)%>;
 			<%=genFeature.getSafeName()%> = <%=genFeature.getNonEObjectInternalTypeCast(genClass)%>eResolveProxy(old<%=genFeature.getCapName()%>);
 			if (<%=genFeature.getSafeName()%> != old<%=genFeature.getCapName()%>)
 			{
           <%if (genFeature.isEffectiveContains()) {%>
-				<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> new<%=genFeature.getCapName()%> = (<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>;
+				<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%> new<%=genFeature.getCapName()%> = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), false)%>;
           <%if (!genFeature.isBidirectional()) {%>
 				<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = old<%=genFeature.getCapName()%>.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, null);
           <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
@@ -107,7 +110,7 @@
     <%} else {//volatile%>
       <%if (genFeature.isResolveProxies() && !genFeature.isListType()) {%>
 		<%=genFeature.getImportedType(genClass)%> <%=genFeature.getSafeName()%> = basicGet<%=genFeature.getAccessorName()%>();
-		return <%=genFeature.getSafeName()%> != null && <%=genFeature.getSafeNameAsEObject()%>.eIsProxy() ? <%=genFeature.getNonEObjectInternalTypeCast(genClass)%>eResolveProxy((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>) : <%=genFeature.getSafeName()%>;
+		return <%=genFeature.getSafeName()%> != null && <%=genFeature.getSafeNameAsEObject()%>.eIsProxy() ? <%=genFeature.getNonEObjectInternalTypeCast(genClass)%>eResolveProxy(<%=genFeature.getAsInternalEObject(genFeature.getSafeName(), false)%>) : <%=genFeature.getSafeName()%>;
       <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
         <%if (genFeature.isFeatureMapType()) {%>
         <%String featureMapEntryTemplateArgument = isJDK50 ? "<" + genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap") + ".Entry>" : "";%>
@@ -134,7 +137,7 @@
       <%} else if (genFeature.hasGetterBody()) {%>
 		<%=genFeature.getGetterBody(genModel.getIndentation(stringBuffer))%>
       <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/getGenFeature.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/getGenFeature.todo.override.javajetinc%>
       <%}%>
     <%}%>
 	}
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0vtMUGJ-Ed-FqczH3ESmRw/method._0vtMYmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0vtMUGJ-Ed-FqczH3ESmRw/method._0vtMYmJ-Ed-FqczH3ESmRw.pt
index 07096b3..eb7f0a3 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0vtMUGJ-Ed-FqczH3ESmRw/method._0vtMYmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0vtMUGJ-Ed-FqczH3ESmRw/method._0vtMYmJ-Ed-FqczH3ESmRw.pt
@@ -23,7 +23,7 @@
 	 * It is bidirectional and its opposite is '{@link <%=reverseGenFeature.getGenClass().getRawQualifiedInterfaceName()%>#<%=reverseGenFeature.getGetAccessor()%> <em><%=reverseGenFeature.getFormattedName()%></em>}'.
       <%}%>
     <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 	 * <!-- begin-user-doc -->
     <%if (!genFeature.hasDocumentation()) {%>
 	 * <p>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0wwVMGJ-Ed-FqczH3ESmRw/method._0wwVQmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0wwVMGJ-Ed-FqczH3ESmRw/method._0wwVQmJ-Ed-FqczH3ESmRw.pt
index 8276439..01fe7db 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0wwVMGJ-Ed-FqczH3ESmRw/method._0wwVQmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0wwVMGJ-Ed-FqczH3ESmRw/method._0wwVQmJ-Ed-FqczH3ESmRw.pt
@@ -9,14 +9,14 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/basicGetGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
     <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
 	@Deprecated
     <%}%>
 	public <%=genFeature.getImportedType(genClass)%> basicGet<%=genFeature.getAccessorName()%>()
 	{
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
     <%if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {%>
 		return (<%=genFeature.getImportedType(genClass)%>)eDynamicGet(<%=genClass.getQualifiedFeatureID(genFeature)%><%if (genClass.hasStaticFeatures()){%> - ESTATIC_FEATURE_COUNT<%}%>, <%=genFeature.getQualifiedFeatureAccessor()%>, false, <%=!genFeature.isEffectiveSuppressEMFTypes()%>);
     <%} else if (genFeature.hasSettingDelegate()) {%>
@@ -39,7 +39,7 @@
     <%} else if (genFeature.hasGetterBody()) {%>
 		<%=genFeature.getGetterBody(genModel.getIndentation(stringBuffer))%>
     <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicGetGenFeature.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicGetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicGetGenFeature.todo.override.javajetinc%>
     <%}%>
 	}
 
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0xWLEGJ-Ed-FqczH3ESmRw/method._0xWLImJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0xWLEGJ-Ed-FqczH3ESmRw/method._0xWLImJ-Ed-FqczH3ESmRw.pt
index 325502b..9a88187 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0xWLEGJ-Ed-FqczH3ESmRw/method._0xWLImJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0xWLEGJ-Ed-FqczH3ESmRw/method._0xWLImJ-Ed-FqczH3ESmRw.pt
@@ -9,7 +9,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/basicSetGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
     <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
 	@Deprecated
@@ -17,17 +17,17 @@
 	public <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> basicSet<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedInternalType(genClass)%> new<%=genFeature.getCapName()%>, <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs)
 	{
     <%if (genFeature.isContainer()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
-		msgs = eBasicSetContainer((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>, <%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>, msgs);
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+		msgs = eBasicSetContainer(<%=genFeature.getAsInternalEObject("new" + genFeature.getCapName(), false)%>, <%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>, msgs);
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 		return msgs;
     <%} else if (genModel.isDynamicDelegation()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
-		msgs = eDynamicInverseAdd((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>, <%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>, msgs);
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+		msgs = eDynamicInverseAdd(<%=genFeature.getAsInternalEObject("new" + genFeature.getCapName(), false)%>, <%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>, msgs);
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 		return msgs;
     <%} else if (!genFeature.isVolatile()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
       <%if (genModel.isVirtualDelegation()) {%>
 		Object old<%=genFeature.getCapName()%> = eVirtualSet(<%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>, new<%=genFeature.getCapName()%>);
       <%} else {%>
@@ -62,7 +62,7 @@
 			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
       <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.post.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 		return msgs;
     <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
       <%if (delegateFeature.isWrappedFeatureMapType()) {%>
@@ -71,7 +71,7 @@
 		return ((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)get<%=delegateFeature.getAccessorName()%>()).basicAdd(<%=genFeature.getQualifiedFeatureAccessor()%>, new<%=genFeature.getCapName()%>, msgs);
       <%}%>
     <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicSetGenFeature.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicSetGenFeature.todo.override.javajetinc%>
     <%}%>
 	}
 
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0yPi8GJ-Ed-FqczH3ESmRw/method._0yPjAmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0yPi8GJ-Ed-FqczH3ESmRw/method._0yPjAmJ-Ed-FqczH3ESmRw.pt
index 1302a3c..23e6814 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0yPi8GJ-Ed-FqczH3ESmRw/method._0yPjAmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0yPi8GJ-Ed-FqczH3ESmRw/method._0yPjAmJ-Ed-FqczH3ESmRw.pt
@@ -1,7 +1,7 @@
 
 
 <%if (isInterface) { %>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/setGenFeature.javadoc.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/setGenFeature.javadoc.override.javajetinc%>
 <%} else {%>
 	/**
 	 * <!-- begin-user-doc -->
@@ -12,7 +12,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/setGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
 <%}%>
 <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
@@ -22,11 +22,16 @@
 	void set<%=genFeature.getAccessorName()%>(<%=genFeature.getImportedType(genClass)%> value);
 
 <%} else { GenOperation setAccessorOperation = genClass.getSetAccessorOperation(genFeature);%>
+  <%if (useInterfaceOverrideAnnotation && !genClass.isMapEntry() && !genClass.hasCollidingSetAccessorOperation(genFeature) && !genFeature.isSuppressedSetVisibility()) {%>
+	@Override
+  <%}%>
 	public void set<%=genFeature.getAccessorName()%><%if (genClass.hasCollidingSetAccessorOperation(genFeature)) {%>_<%}%>(<%=genFeature.getImportedType(genClass)%> <%=setAccessorOperation == null ? "new" + genFeature.getCapName() : setAccessorOperation.getGenParameters().get(0).getName()%>)
 	{
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.pre.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.pre.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
     <%if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.dynamicSetGenFeature.pre.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 		eDynamicSet(<%=genClass.getQualifiedFeatureID(genFeature)%><%if (genClass.hasStaticFeatures()){%> - ESTATIC_FEATURE_COUNT<%}%>, <%=genFeature.getQualifiedFeatureAccessor()%>, <%if (!isJDK50 && genFeature.isPrimitiveType()) {%>new <%=genFeature.getObjectType(genClass)%>(<%}%>new<%=genFeature.getCapName()%><%if (!isJDK50 && genFeature.isPrimitiveType()) {%>)<%}%>);
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.dynamicSetGenFeature.post.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
     <%} else if (genModel.isReflectiveDelegation()) {%>
 		eSet(<%=genFeature.getQualifiedFeatureAccessor()%>, <%if (!isJDK50 && genFeature.isPrimitiveType()) {%>new <%=genFeature.getObjectType(genClass)%>(<%}%>new<%=genFeature.getCapName()%><%if (!isJDK50 && genFeature.isPrimitiveType()) {%>)<%}%>);
     <%} else if (genFeature.hasSettingDelegate()) {%>
@@ -41,7 +46,7 @@
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (new<%=genFeature.getCapName()%> != null)
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>).eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
+				msgs = <%=genFeature.getAsInternalEObject("new" + genFeature.getCapName(), true)%>.eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
 			msgs = basicSet<%=genFeature.getAccessorName()%>(<%=genFeature.getInternalTypeCast()%>new<%=genFeature.getCapName()%>, msgs);
 			if (msgs != null) msgs.dispatch();
 		}
@@ -58,13 +63,13 @@
 			<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = null;
 			if (<%=genFeature.getSafeName()%> != null)
         <%if (!genFeature.isBidirectional()) {%>
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
+				msgs = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), true)%>.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
 			if (new<%=genFeature.getCapName()%> != null)
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
+				msgs = <%=genFeature.getAsInternalEObject("new" + genFeature.getCapName(), true)%>.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
         <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
+				msgs = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), true)%>.eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
 			if (new<%=genFeature.getCapName()%> != null)
-				msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)new<%=genFeature.getCapName()%>).eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
+				msgs = <%=genFeature.getAsInternalEObject("new" + genFeature.getCapName(), true)%>.eInverseAdd(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
         <%}%>
 			msgs = basicSet<%=genFeature.getAccessorName()%>(<%=genFeature.getInternalTypeCast()%>new<%=genFeature.getCapName()%>, msgs);
 			if (msgs != null) msgs.dispatch();
@@ -159,7 +164,7 @@
           <%}%>
         <%}%>
       <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.post.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.post.insert" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
     <%} else if (genFeature.hasDelegateFeature()) { GenFeature delegateFeature = genFeature.getDelegateFeature();%>
       <%if (delegateFeature.isWrappedFeatureMapType()) {%>
 		((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal)((<%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Internal.Wrapper)get<%=delegateFeature.getAccessorName()%>()).featureMap()).set(<%=genFeature.getQualifiedFeatureAccessor()%>, <%if (!isJDK50 && genFeature.isPrimitiveType()) {%>new <%=genFeature.getObjectType(genClass)%>(<%}%>new<%=genFeature.getCapName()%><%if (!isJDK50 && genFeature.isPrimitiveType()) {%>)<%}%>);
@@ -169,7 +174,7 @@
     <%} else if (setAccessorOperation != null) {%>
 		<%=setAccessorOperation.getBody(genModel.getIndentation(stringBuffer))%>
     <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.TODO.override" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/setGenFeature.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.TODO.override" args="setAccessorOperation:setAccessorOperation,genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/setGenFeature.todo.override.javajetinc%>
     <%}%>
 	}
 
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0yZT8GJ-Ed-FqczH3ESmRw/method._0yZUAmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0yZT8GJ-Ed-FqczH3ESmRw/method._0yZUAmJ-Ed-FqczH3ESmRw.pt
index da5d64a..57ee174 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0yZT8GJ-Ed-FqczH3ESmRw/method._0yZUAmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0yZT8GJ-Ed-FqczH3ESmRw/method._0yZUAmJ-Ed-FqczH3ESmRw.pt
@@ -2,7 +2,7 @@
 
 	/**
 	 * Sets the value of the '{@link <%=genClass.getRawQualifiedInterfaceName()%>#<%=genFeature.getGetAccessor()%> <em><%=genFeature.getFormattedName()%></em>}' <%=genFeature.getFeatureKind()%>.
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.javadoc.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em><%=genFeature.getFormattedName()%></em>' <%=genFeature.getFeatureKind()%>.
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0z4hsGJ-Ed-FqczH3ESmRw/method._0z4hwmJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0z4hsGJ-Ed-FqczH3ESmRw/method._0z4hwmJ-Ed-FqczH3ESmRw.pt
index 6b91b21..eaf9451 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0z4hsGJ-Ed-FqczH3ESmRw/method._0z4hwmJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0z4hsGJ-Ed-FqczH3ESmRw/method._0z4hwmJ-Ed-FqczH3ESmRw.pt
@@ -1,7 +1,7 @@
 
 
 <%if (isInterface) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/unsetGenFeature.javadoc.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.javadoc.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/unsetGenFeature.javadoc.override.javajetinc%>
 <%} else {%>
 	/**
 	 * <!-- begin-user-doc -->
@@ -12,7 +12,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/unsetGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
 <%}%>
 <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
@@ -22,6 +22,9 @@
 	void unset<%=genFeature.getAccessorName()%>();
 
 <%} else {%>
+  <%if (useInterfaceOverrideAnnotation && !genClass.isMapEntry() && !genClass.hasCollidingUnsetAccessorOperation(genFeature) && !genFeature.isSuppressedUnsetVisibility()) {%>
+	@Override
+  <%}%>
 	public void unset<%=genFeature.getAccessorName()%><%if (genClass.hasCollidingUnsetAccessorOperation(genFeature)) {%>_<%}%>()
 	{
     <%if (genModel.isDynamicDelegation() && !genFeature.isVolatile()) {%>
@@ -44,9 +47,9 @@
 		{
 			<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs = null;
         <%if (!genFeature.isBidirectional()) {%>
-			msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
+			msgs = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), true)%>.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
         <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
-			msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
+			msgs = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), true)%>.eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
         <%}%>
 			msgs = basicUnset<%=genFeature.getAccessorName()%>(msgs);
 			if (msgs != null) msgs.dispatch();
@@ -141,7 +144,7 @@
     <%} else if (genClass.getUnsetAccessorOperation(genFeature) != null) {%>
 		<%=genClass.getUnsetAccessorOperation(genFeature).getBody(genModel.getIndentation(stringBuffer))%>
     <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/unsetGenFeature.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.unsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/unsetGenFeature.todo.override.javajetinc%>
     <%}%>
 	}
 
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0zSEwGJ-Ed-FqczH3ESmRw/method._0zSE0mJ-Ed-FqczH3ESmRw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0zSEwGJ-Ed-FqczH3ESmRw/method._0zSE0mJ-Ed-FqczH3ESmRw.pt
index d3b24d7..cca6d70 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0zSEwGJ-Ed-FqczH3ESmRw/method._0zSE0mJ-Ed-FqczH3ESmRw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._0zSEwGJ-Ed-FqczH3ESmRw/method._0zSE0mJ-Ed-FqczH3ESmRw.pt
@@ -9,7 +9,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/basicUnsetGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
 <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
 	@Deprecated
@@ -17,7 +17,7 @@
 	public <%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> basicUnset<%=genFeature.getAccessorName()%>(<%=genModel.getImportedName("org.eclipse.emf.common.notify.NotificationChain")%> msgs)
 	{
     <%if (genModel.isDynamicDelegation()) {%>
-		return eDynamicInverseRemove((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%if (genFeature.isResolveProxies()) {%>basicGet<%=genFeature.getAccessorName()%><%} else {%><%=genFeature.getGetAccessor()%><%}%>(), <%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>, msgs);
+		return eDynamicInverseRemove(<%=genFeature.getAsInternalEObject("", false)%><%if (genFeature.isResolveProxies()) {%>basicGet<%=genFeature.getAccessorName()%><%} else {%><%=genFeature.getGetAccessor()%><%}%>(), <%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>, msgs);
     <%} else if (!genFeature.isVolatile()) {%>
       <%if (genModel.isVirtualDelegation()) {%>
         <%if (!genModel.isSuppressNotification()) {%>Object old<%=genFeature.getCapName()%> = <%}%>eVirtualUnset(<%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>);
@@ -51,7 +51,7 @@
 		return msgs;
         <%}%>
     <%} else {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicUnsetGenFeature.todo.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicUnsetGenFeature.TODO.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/basicUnsetGenFeature.todo.override.javajetinc%>
     <%}%>
 	}
 
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._JLBM0HroEeC0XN9kbwkPYQ/method._JLBM0nroEeC0XN9kbwkPYQ.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._JLBM0HroEeC0XN9kbwkPYQ/method._JLBM0nroEeC0XN9kbwkPYQ.pt
index 1f88a8d..7bf6f2d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._JLBM0HroEeC0XN9kbwkPYQ/method._JLBM0nroEeC0XN9kbwkPYQ.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._JLBM0HroEeC0XN9kbwkPYQ/method._JLBM0nroEeC0XN9kbwkPYQ.pt
@@ -1 +1 @@
-<%@ jet package="PACKAGE" class="CLASS" imports="org.eclipse.egf.emf.pattern.base.* org.eclipse.emf.codegen.ecore.genmodel.* org.eclipse.emf.codegen.ecore.genmodel.impl.* org.eclipse.emf.codegen.ecore.genmodel.generator.* org.eclipse.emf.codegen.util.* org.eclipse.emf.ecore.util.* org.eclipse.emf.common.util.* org.eclipse.egf.common.helper.* java.util.* org.eclipse.emf.ecore.* org.eclipse.egf.model.pattern.* org.eclipse.egf.pattern.execution.* org.eclipse.egf.pattern.query.*"  %>
\ No newline at end of file
+<%@ jet package="PACKAGE" class="CLASS" imports="org.eclipse.egf.emf.pattern.base.* org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil org.eclipse.emf.codegen.ecore.genmodel.* org.eclipse.emf.codegen.ecore.genmodel.impl.* org.eclipse.emf.codegen.ecore.genmodel.generator.* org.eclipse.emf.codegen.util.* org.eclipse.emf.ecore.util.* org.eclipse.emf.common.util.* org.eclipse.egf.common.helper.* java.util.* org.eclipse.emf.ecore.* org.eclipse.egf.model.pattern.* org.eclipse.egf.pattern.execution.* org.eclipse.egf.pattern.query.*"  %>
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._K9da0HroEeC0XN9kbwkPYQ/method._K9da0nroEeC0XN9kbwkPYQ.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._K9da0HroEeC0XN9kbwkPYQ/method._K9da0nroEeC0XN9kbwkPYQ.pt
index 1f88a8d..7bf6f2d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._K9da0HroEeC0XN9kbwkPYQ/method._K9da0nroEeC0XN9kbwkPYQ.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._K9da0HroEeC0XN9kbwkPYQ/method._K9da0nroEeC0XN9kbwkPYQ.pt
@@ -1 +1 @@
-<%@ jet package="PACKAGE" class="CLASS" imports="org.eclipse.egf.emf.pattern.base.* org.eclipse.emf.codegen.ecore.genmodel.* org.eclipse.emf.codegen.ecore.genmodel.impl.* org.eclipse.emf.codegen.ecore.genmodel.generator.* org.eclipse.emf.codegen.util.* org.eclipse.emf.ecore.util.* org.eclipse.emf.common.util.* org.eclipse.egf.common.helper.* java.util.* org.eclipse.emf.ecore.* org.eclipse.egf.model.pattern.* org.eclipse.egf.pattern.execution.* org.eclipse.egf.pattern.query.*"  %>
\ No newline at end of file
+<%@ jet package="PACKAGE" class="CLASS" imports="org.eclipse.egf.emf.pattern.base.* org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil org.eclipse.emf.codegen.ecore.genmodel.* org.eclipse.emf.codegen.ecore.genmodel.impl.* org.eclipse.emf.codegen.ecore.genmodel.generator.* org.eclipse.emf.codegen.util.* org.eclipse.emf.ecore.util.* org.eclipse.emf.common.util.* org.eclipse.egf.common.helper.* java.util.* org.eclipse.emf.ecore.* org.eclipse.egf.model.pattern.* org.eclipse.egf.pattern.execution.* org.eclipse.egf.pattern.query.*"  %>
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pcm9tDG0Ed-kc8dEZsdm2w/method._PcwusjG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pcm9tDG0Ed-kc8dEZsdm2w/method._PcwusjG0Ed-kc8dEZsdm2w.pt
index af3bedb..4ab8c36 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pcm9tDG0Ed-kc8dEZsdm2w/method._PcwusjG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pcm9tDG0Ed-kc8dEZsdm2w/method._PcwusjG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2010 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
@@ -27,7 +27,11 @@
 <%if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {%>
                plugin.xml,\
 <%}%>
-               plugin.properties
+<%String modelBundleLocalization = genModel.getModelBundleLocalization(); int index = modelBundleLocalization.indexOf("/"); if (index == -1) {%>
+               <%=modelBundleLocalization%>.properties
+<%} else {%>
+               <%=modelBundleLocalization.substring(0, index + 1)%>
+<%}%>
 jars.compile.order = <%=pluginClassesLocation%>
 <% boolean first=true; for (Iterator<String> i = sourceFolders.iterator(); i.hasNext();) { String sourceFolder = i.next(); if (i.hasNext()){sourceFolder +=",\\";} if (first) {%>
 source.<%=pluginClassesLocation%> = <%=sourceFolder%><%first=false;} else {%><%=sourceFolder%><%}}%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdDpoDG0Ed-kc8dEZsdm2w/method._PdDpqTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdDpoDG0Ed-kc8dEZsdm2w/method._PdDpqTG0Ed-kc8dEZsdm2w.pt
index 31ccd8b..a4e6118 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdDpoDG0Ed-kc8dEZsdm2w/method._PdDpqTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdDpoDG0Ed-kc8dEZsdm2w/method._PdDpqTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2005-2007 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
@@ -14,15 +14,16 @@
 <%GenModel genModel = (GenModel)argument;%>
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: <%=genModel.getModelBundleNameKey()%>
 Bundle-SymbolicName: <%=genModel.getModelPluginID()%>;singleton:=true
+Automatic-Module-Name: <%=genModel.getModelPluginID()%>
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: <%if (genModel.isRuntimeJar()) {%><%=genModel.getModelPluginID()%>.jar<%}else{%>.<%}%>
 <%if (genModel.hasModelPluginClass()) {%>
 Bundle-Activator: <%=genModel.getQualifiedModelPluginClassName()%>$Implementation<%if (genModel.isOSGiCompatible()) {%>$Activator<%}%>
 <%}%>
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
+Bundle-Vendor: <%=genModel.getModelBundleVendorKey()%>
+Bundle-Localization: <%=genModel.getModelBundleLocalization()%>
 <%if (genModel.getComplianceLevel() == GenJDKLevel.JDK50_LITERAL) {%>
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 <%} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK60_LITERAL) {%>
@@ -33,6 +34,8 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 <%} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK90_LITERAL) {%>
 Bundle-RequiredExecutionEnvironment: JavaSE-9
+<%} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK100_LITERAL) {%>
+Bundle-RequiredExecutionEnvironment: JavaSE-10
 <%}%>
 <%Iterator<String> packagesIterator = genModel.getModelQualifiedPackageNames().iterator(); if (packagesIterator.hasNext()) { String pack = packagesIterator.next();%>
 Export-Package: <%=pack%><%while(packagesIterator.hasNext()) { pack = packagesIterator.next();%>,
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdNaoDG0Ed-kc8dEZsdm2w/method._PdXLpTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdNaoDG0Ed-kc8dEZsdm2w/method._PdXLpTG0Ed-kc8dEZsdm2w.pt
index 9dae5b4..25a9198 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdNaoDG0Ed-kc8dEZsdm2w/method._PdXLpTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdNaoDG0Ed-kc8dEZsdm2w/method._PdXLpTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2005 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdgVkDG0Ed-kc8dEZsdm2w/method._PdgVlzG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdgVkDG0Ed-kc8dEZsdm2w/method._PdgVlzG0Ed-kc8dEZsdm2w.pt
index d779e2d..e97c3de 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdgVkDG0Ed-kc8dEZsdm2w/method._PdgVlzG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdgVkDG0Ed-kc8dEZsdm2w/method._PdgVlzG0Ed-kc8dEZsdm2w.pt
@@ -1,4 +1,4 @@
 <%
 GenModel genModel = parameter;
-targetPathName = genModel.getModelProjectDirectory() + "/plugin.properties";
+targetPathName = genModel.getModelProjectDirectory() + "/" + genModel.getModelBundleLocalization()+ ".properties";
 %>
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdgVkDG0Ed-kc8dEZsdm2w/method._PdgVmTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdgVkDG0Ed-kc8dEZsdm2w/method._PdgVmTG0Ed-kc8dEZsdm2w.pt
index e2e9351..2f0b3c1 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdgVkDG0Ed-kc8dEZsdm2w/method._PdgVmTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdgVkDG0Ed-kc8dEZsdm2w/method._PdgVmTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2004 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
@@ -14,8 +14,8 @@
 <%GenModel genModel = (GenModel)argument;%>
 <%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#LogicalName=org.eclipse.egf.emf.pattern.base.HeaderProperties" args="parameter:argument"%>
 
-pluginName = <%=genModel.getModelName()%> Model
-providerName = www.example.org
+pluginName = <%=genModel.getModelBundleName()%>
+providerName = <%=genModel.getModelBundleVendorName()%>
 <%boolean first = true; for (GenPackage genPackage : genModel.getAllGenPackagesWithClassifiers()) {%>
   <%if (genPackage.isContentType()) {%>
     <%if (first) { first = false;%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdzQgDG0Ed-kc8dEZsdm2w/method._PdzQiTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdzQgDG0Ed-kc8dEZsdm2w/method._PdzQiTG0Ed-kc8dEZsdm2w.pt
index d6de99f..639fba2 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdzQgDG0Ed-kc8dEZsdm2w/method._PdzQiTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PdzQgDG0Ed-kc8dEZsdm2w/method._PdzQiTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2010 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
@@ -13,7 +13,7 @@
 %>
 <%final GenPackage genPackage = (GenPackage)((Object[])argument)[0]; final GenModel genModel=genPackage.getGenModel();%>
 <%final boolean isJDK50 = genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50;%>
-<%boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]);%>
+<%boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]);  boolean useInterfaceOverrideAnnotation = genModel.useInterfaceOverrideAnnotation() && !(isInterface && isImplementation);%>
 <%boolean packageNeedsSuppressDeprecation = isJDK50 && GenModelUtil.hasAPIDeprecatedTag(genPackage.getOrderedGenClassifiers()) && !genPackage.hasAPIDeprecatedTag();%>
 <%String publicStaticFinalFlag = isImplementation ? "public static final " : "";%>
 <%boolean needsAddEOperation = false;%>
@@ -395,6 +395,9 @@
 			(the<%=genPackage.getBasicPackageName()%>,
 			 new <%=genModel.getImportedName("org.eclipse.emf.ecore.EValidator")%>.Descriptor()
 			 {
+ <%if (genModel.useInterfaceOverrideAnnotation()) {%>
+				 @Override
+ <%}%>
 				 public <%=genModel.getImportedName("org.eclipse.emf.ecore.EValidator")%> getEValidator()
 				 {
 					 return <%=genPackage.getImportedValidatorClassName()%>.INSTANCE;
@@ -567,6 +570,9 @@
 	@Deprecated
   <%}%>
 <%if (isImplementation) {%>
+ <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+ <%}%>
 	public <%=genClassifier.getImportedMetaType()%> get<%=genClassifier.getClassifierAccessorName()%>()
 	{
     <%if (genPackage.isLoadedInitialization()) {%>
@@ -611,6 +617,9 @@
 	@Deprecated
 <%}%>
 <%if (isImplementation) {%>
+   <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+   <%}%>
 	public <%=genFeature.getImportedMetaType()%> get<%=genFeature.getFeatureAccessorName()%>()
 	{
         <%if (!genPackage.isLoadedInitialization()) {%>
@@ -652,6 +661,9 @@
 	@Deprecated
 <%}%>
 <%if (isImplementation) {%>
+   <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+   <%}%>
 	public <%=genOperation.getImportedMetaType()%> get<%=genOperation.getOperationAccessorName()%>()
 	{
         <%if (!genPackage.isLoadedInitialization()) {%>
@@ -684,6 +696,9 @@
 	 */
 <%}%>
 <%if (isImplementation) {%>
+   <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+   <%}%>
 	public <%=genPackage.getImportedFactoryInterfaceName()%> get<%=genPackage.getFactoryName()%>()
 	{
 		return (<%=genPackage.getImportedFactoryInterfaceName()%>)getEFactoryInstance();
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PeP8cDG0Ed-kc8dEZsdm2w/method._PeP8eTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PeP8cDG0Ed-kc8dEZsdm2w/method._PeP8eTG0Ed-kc8dEZsdm2w.pt
index a6938b6..2958f4c 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PeP8cDG0Ed-kc8dEZsdm2w/method._PeP8eTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PeP8cDG0Ed-kc8dEZsdm2w/method._PeP8eTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2005-2006 IBM Corporation and others. 
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pe_jUDG0Ed-kc8dEZsdm2w/method._Pe_jWTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pe_jUDG0Ed-kc8dEZsdm2w/method._Pe_jWTG0Ed-kc8dEZsdm2w.pt
index a2b76a1..9dad620 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pe_jUDG0Ed-kc8dEZsdm2w/method._Pe_jWTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pe_jUDG0Ed-kc8dEZsdm2w/method._Pe_jWTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2011 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
@@ -13,7 +13,7 @@
 %>
 <%final GenClass genClass = (GenClass)((Object[])argument)[0]; final GenPackage genPackage = genClass.getGenPackage(); final GenModel genModel=genPackage.getGenModel();%>
 <%final boolean isJDK50 = genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50;%>
-<%final boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); final boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]);%>
+<%final boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); final boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]); final boolean useInterfaceOverrideAnnotation = genModel.useInterfaceOverrideAnnotation() && !(isInterface && isImplementation);%>
 <%final boolean isGWT = genModel.getRuntimePlatform() == GenRuntimePlatform.GWT;%>
 <%final String publicStaticFinalFlag = isImplementation ? "public static final " : "";%>
 <%final String singleWildcard = isJDK50 ? "<?>" : "";%>
@@ -32,7 +32,7 @@
 <%if (isImplementation) { genClass.addClassPsuedoImports(); }%>
 
 <%if (isInterface) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.interface.javadoc.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/interface.javadoc.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.interface.javadoc.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/interface.javadoc.override.javajetinc%>
 <%} else {%>
 /**
  * <!-- begin-user-doc -->
@@ -166,7 +166,7 @@
       <%}%>
   <%}%>
   <%for (GenFeature genFeature : genClass.getDeclaredFieldGenFeatures()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.declaredFieldGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/declaredFieldGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.declaredFieldGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/declaredFieldGenFeature.override.javajetinc%>
   <%}%>
 <%}%>
 <%if (isImplementation && genClass.hasOffsetCorrection() && !genClass.getImplementedGenFeatures().isEmpty()) {%>
@@ -214,7 +214,7 @@
 	 */
 	<%if (genModel.isPublicConstructors()) {%>public<%} else {%>protected<%}%> <%=genClass.getClassName()%>()
 	{
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.egfCustom.constructor.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.egfCustom.constructor.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
   <%for (GenFeature genFeature : genClass.getFlagGenFeaturesWithDefault()) {%>
 		<%=genClass.getFlagsField(genFeature)%> |= <%=genFeature.getUpperName()%>_EFLAG<%if (!genFeature.isBooleanType()) {%>_DEFAULT<%}%>;
   <%}%>
@@ -234,19 +234,22 @@
 	}
 
 <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.reflectiveDelegation.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/reflectiveDelegation.override.javajetinc%>
+<%if (isImplementation && genModel.isDynamicDelegation()) {%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.dynamicDelegation" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%}%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.reflectiveDelegation.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/reflectiveDelegation.override.javajetinc%>
 <%if (isImplementation) {%>
 <%new Runnable() { public void run() { GenClass classExtendsGenClass = genClass.getClassExtendsGenClass(); List<GenFeature> classExtendsAllGenFeatures = classExtendsGenClass == null? Collections.<GenFeature>emptyList() : classExtendsGenClass.getAllGenFeatures();%>
   <%for (GenFeature genFeature : genClass.getReifiedGenFeatures()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeatureReified.override" args="genFeature:genFeature,classExtendsGenClass:classExtendsGenClass,classExtendsAllGenFeatures:classExtendsAllGenFeatures,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/genFeatureReified.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeatureReified.override" args="genFeature:genFeature,classExtendsGenClass:classExtendsGenClass,classExtendsAllGenFeatures:classExtendsAllGenFeatures,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/genFeatureReified.override.javajetinc%>
 <%}}}.run();}%>
 <%new Runnable() { public void run() {%>
 <%for (GenFeature genFeature : (isImplementation ? genClass.getImplementedGenFeatures() : genClass.getDeclaredGenFeatures())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/genFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/genFeature.override.javajetinc%>
 <%}//for%>
 <%}}.run();%>
 <%for (GenOperation genOperation : (isImplementation ? genClass.getImplementedGenOperations() : genClass.getDeclaredGenOperations())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/implementedGenOperation.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.genOperation.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/implementedGenOperation.override.javajetinc%>
 <%}//for%>
 <%if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEInverseAddGenFeatures())) {%>
 	/**
@@ -292,9 +295,9 @@
     <%}%>
 				if (<%=genFeature.getSafeName()%> != null)
     <%if (genFeature.isEffectiveContains()) {%>
-					msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
+					msgs = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), true)%>.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
     <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
-					msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
+					msgs = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), true)%>.eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
     <%}%>
 				return basicSet<%=genFeature.getAccessorName()%>((<%=genFeature.getImportedType(genClass)%>)otherEnd, msgs);
   <%}%>
@@ -482,10 +485,10 @@
 
 <%}%>
 <%if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEUnsetGenFeatures())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.eUnset.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/eUnset.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.eUnset.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/eUnset.override.javajetinc%>
 <%}%>
 <%if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEIsSetGenFeatures())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.eIsSet.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/eIsSet.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.eIsSet.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/eIsSet.override.javajetinc%>
 <%}%>
 <%if (isImplementation && (!genClass.getMixinGenFeatures().isEmpty() || genClass.hasOffsetCorrection() && !genClass.getGenFeatures().isEmpty())) {%>
   <%if (!genClass.getMixinGenFeatures().isEmpty()) {%>
@@ -810,6 +813,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public int getHash()
 	{
 		if (hash == -1)
@@ -825,6 +831,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public void setHash(int hash)
 	{
 		this.hash = hash;
@@ -835,6 +844,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public <%=keyType%> getKey()
 	{
   <%if (!isJDK50 && keyFeature.isPrimitiveType()) {%>
@@ -849,6 +861,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public void setKey(<%=keyType%> key)
 	{
   <%if (keyFeature.isListType()) {%>
@@ -867,6 +882,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public <%=valueType%> getValue()
 	{
   <%if (!isJDK50 && valueFeature.isPrimitiveType()) {%>
@@ -881,6 +899,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public <%=valueType%> setValue(<%=valueType%> value)
 	{
 		<%=valueType%> oldValue = getValue();
@@ -912,7 +933,7 @@
 	}
 
 <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.insert" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.insert" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 } //<%=isInterface ? " " + genClass.getInterfaceName() : genClass.getClassName()%>
 <%// TODO fix the space above%>
 <%genModel.emitSortedImports();%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PejecDG0Ed-kc8dEZsdm2w/method._PejeeTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PejecDG0Ed-kc8dEZsdm2w/method._PejeeTG0Ed-kc8dEZsdm2w.pt
index 6d40550..ece8cce 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PejecDG0Ed-kc8dEZsdm2w/method._PejeeTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PejecDG0Ed-kc8dEZsdm2w/method._PejeeTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2004 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PesoYDG0Ed-kc8dEZsdm2w/method._PesoaTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PesoYDG0Ed-kc8dEZsdm2w/method._PesoaTG0Ed-kc8dEZsdm2w.pt
index a636bed..faad011 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PesoYDG0Ed-kc8dEZsdm2w/method._PesoaTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PesoYDG0Ed-kc8dEZsdm2w/method._PesoaTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2006 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pf47MDG0Ed-kc8dEZsdm2w/method._Pf47OTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pf47MDG0Ed-kc8dEZsdm2w/method._Pf47OTG0Ed-kc8dEZsdm2w.pt
index 5899a4e..1e3361b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pf47MDG0Ed-kc8dEZsdm2w/method._Pf47OTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pf47MDG0Ed-kc8dEZsdm2w/method._Pf47OTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2007 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
@@ -60,10 +60,12 @@
 	 * The '<em><b><%=genEnumLiteral.getFormattedName()%></b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+<%if (genEnumLiteral.hasDocumentation()) {%>
+	 * <!-- begin-model-doc -->
+	 * <%=genEnumLiteral.getDocumentation(genModel.getIndentation(stringBuffer))%>
+	 * <!-- end-model-doc -->
+<%}%>
 	 * @see #<%=genEnumLiteral.getEnumLiteralValueConstantName()%>
-      <%if (genEnumLiteral.hasAPITags()) {%>
-	 * <%=genEnumLiteral.getAPITags(genModel.getIndentation(stringBuffer))%>
-      <%}%>
 	 * @generated
 	 * @ordered
 	 */
@@ -264,6 +266,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (genModel.useInterfaceOverrideAnnotation()) {%>
+	@Override
+  <%}%>
 	public int getValue()
 	{
 	  return value;
@@ -274,6 +279,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (genModel.useInterfaceOverrideAnnotation()) {%>
+	@Override
+  <%}%>
 	public <%=genModel.getImportedName("java.lang.String")%> getName()
 	{
 	  return name;
@@ -284,6 +292,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (genModel.useInterfaceOverrideAnnotation()) {%>
+	@Override
+  <%}%>
 	public <%=genModel.getImportedName("java.lang.String")%> getLiteral()
 	{
 	  return literal;
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PfcPQDG0Ed-kc8dEZsdm2w/method._PfmAQTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PfcPQDG0Ed-kc8dEZsdm2w/method._PfmAQTG0Ed-kc8dEZsdm2w.pt
index 6c1511e..0848dae 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PfcPQDG0Ed-kc8dEZsdm2w/method._PfmAQTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PfcPQDG0Ed-kc8dEZsdm2w/method._PfmAQTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2010 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
@@ -13,7 +13,7 @@
 %>
 <%GenPackage genPackage = (GenPackage)((Object[])argument)[0]; GenModel genModel=genPackage.getGenModel(); /* Trick to import java.util.* without warnings */Iterator.class.getName();%>
 <%final boolean isJDK50 = genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50;%>
-<%boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]);%>
+<%boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]); boolean useInterfaceOverrideAnnotation = genModel.useInterfaceOverrideAnnotation() && !(isInterface && isImplementation);%>
 <%String publicStaticFinalFlag = isImplementation ? "public static final " : "";%>
 <%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#LogicalName=org.eclipse.egf.emf.pattern.base.HeaderJava" args="parameter:argument"%>
 <%if (isInterface || genModel.isSuppressInterfaces()) {%>
@@ -60,9 +60,9 @@
 @Deprecated
 <%}%>
 <%if (isImplementation) {%>
-  <%if (isJDK50 && GenModelUtil.hasAPIDeprecatedTag(genPackage.getGenClassifiers()) && !genPackage.hasAPIDeprecatedTag()) {%>
+  <%if (isJDK50 && !genPackage.hasAPIDeprecatedTag()) { List<GenClassifier> genClassifiers = new ArrayList<GenClassifier>(genPackage.getGenClassifiers()); for (Iterator<GenClassifier> i = genClassifiers.iterator(); i.hasNext(); ) { GenClassifier genClassifier = i.next(); if (genClassifier instanceof GenClass && ((GenClass)genClassifier).isAbstract()) i.remove(); } if (GenModelUtil.hasAPIDeprecatedTag(genClassifiers)) {%>
 @SuppressWarnings("deprecation")
-  <%}%>
+  <%}}%>
 public class <%=genPackage.getFactoryClassName()%> extends <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.EFactoryImpl")%><%if (!genModel.isSuppressInterfaces()) {%> implements <%=genPackage.getImportedFactoryInterfaceName()%><%}%>
 <%} else {%>
 public interface <%=genPackage.getFactoryInterfaceName()%><%if (!genModel.isSuppressEMFMetaData()) {%> extends <%=genModel.getImportedName("org.eclipse.emf.ecore.EFactory")%><%}%>
@@ -225,6 +225,9 @@
 <%if (isJDK50 && genClass.hasAPIDeprecatedTag()) {%>
 	@Deprecated
 <%}%>
+<%if (useInterfaceOverrideAnnotation && !genClass.isMapEntry()) {%>
+	@Override
+<%}%>
 	public <%=genClass.getTypeParameters()%><%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceTypeArguments()%> create<%=genClass.getName()%>()
 	{
     <%if (genClass.isDynamic()) {%>
@@ -254,6 +257,9 @@
     <%if (isJDK50 && genDataType.hasAPIDeprecatedTag()) {%>
 	@Deprecated
     <%}%>
+  <%if (genPackage.isDataTypeConverters() && useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public <%=genDataType.getImportedParameterizedInstanceClassName()%> create<%=genDataType.getName()%>(<%if (genDataType.hasCreatorBody()) {%>final <%}%>String <%if (genDataType.hasCreatorBody()) {%>it<%} else {%>literal<%}%>)
 	{
     <%if (genDataType.hasCreatorBody()) {%>
@@ -463,6 +469,9 @@
   <%if (isJDK50 && genDataType.hasAPIDeprecatedTag()) {%>
 	@Deprecated
   <%}%>
+  <%if (genPackage.isDataTypeConverters() && useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public String convert<%=genDataType.getName()%>(<%if (genDataType.hasCreatorBody()) {%>final <%}%><%=genDataType.getImportedBoundedWildcardInstanceClassName()%> <%if (genDataType.hasConverterBody()) {%>it<%} else {%>instanceValue<%}%>)
 	{
     <%if (genDataType.hasConverterBody()) {%>
@@ -756,6 +765,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+ <%if (useInterfaceOverrideAnnotation && !genModel.isSuppressEMFMetaData()) {%>
+	@Override
+ <%}%>
 	public <%=genPackage.getImportedPackageInterfaceName()%> get<%=genPackage.getBasicPackageName()%>()
 	{
 		return (<%=genPackage.getImportedPackageInterfaceName()%>)getEPackage();
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pg8EEDG0Ed-kc8dEZsdm2w/method._Pg8EGTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pg8EEDG0Ed-kc8dEZsdm2w/method._Pg8EGTG0Ed-kc8dEZsdm2w.pt
index 3dc96fe..77d2726 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pg8EEDG0Ed-kc8dEZsdm2w/method._Pg8EGTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pg8EEDG0Ed-kc8dEZsdm2w/method._Pg8EGTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2011 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
@@ -13,7 +13,7 @@
 %>
 <%final GenClass genClass = (GenClass)((Object[])argument)[0]; final GenPackage genPackage = genClass.getGenPackage(); final GenModel genModel=genPackage.getGenModel();%>
 <%final boolean isJDK50 = genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50;%>
-<%final boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); final boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]);%>
+<%final boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); final boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]); final boolean useInterfaceOverrideAnnotation = genModel.useInterfaceOverrideAnnotation() && !(isInterface && isImplementation);%>
 <%final boolean isGWT = genModel.getRuntimePlatform() == GenRuntimePlatform.GWT;%>
 <%final String publicStaticFinalFlag = isImplementation ? "public static final " : "";%>
 <%final String singleWildcard = isJDK50 ? "<?>" : "";%>
@@ -32,7 +32,7 @@
 <%if (isImplementation) { genClass.addClassPsuedoImports(); }%>
 
 <%if (isInterface) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.interface.javadoc.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/interface.javadoc.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.interface.javadoc.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/interface.javadoc.override.javajetinc%>
 <%} else {%>
 /**
  * <!-- begin-user-doc -->
@@ -166,7 +166,7 @@
       <%}%>
   <%}%>
   <%for (GenFeature genFeature : genClass.getDeclaredFieldGenFeatures()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.declaredFieldGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/declaredFieldGenFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.declaredFieldGenFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/declaredFieldGenFeature.override.javajetinc%>
   <%}%>
 <%}%>
 <%if (isImplementation && genClass.hasOffsetCorrection() && !genClass.getImplementedGenFeatures().isEmpty()) {%>
@@ -214,7 +214,7 @@
 	 */
 	<%if (genModel.isPublicConstructors()) {%>public<%} else {%>protected<%}%> <%=genClass.getClassName()%>()
 	{
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.egfCustom.constructor.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.egfCustom.constructor.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
   <%for (GenFeature genFeature : genClass.getFlagGenFeaturesWithDefault()) {%>
 		<%=genClass.getFlagsField(genFeature)%> |= <%=genFeature.getUpperName()%>_EFLAG<%if (!genFeature.isBooleanType()) {%>_DEFAULT<%}%>;
   <%}%>
@@ -234,19 +234,22 @@
 	}
 
 <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.reflectiveDelegation.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/reflectiveDelegation.override.javajetinc%>
+<%if (isImplementation && genModel.isDynamicDelegation()) {%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.dynamicDelegation" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%}%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.reflectiveDelegation.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/reflectiveDelegation.override.javajetinc%>
 <%if (isImplementation) {%>
 <%new Runnable() { public void run() { GenClass classExtendsGenClass = genClass.getClassExtendsGenClass(); List<GenFeature> classExtendsAllGenFeatures = classExtendsGenClass == null? Collections.<GenFeature>emptyList() : classExtendsGenClass.getAllGenFeatures();%>
   <%for (GenFeature genFeature : genClass.getReifiedGenFeatures()) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeatureReified.override" args="genFeature:genFeature,classExtendsGenClass:classExtendsGenClass,classExtendsAllGenFeatures:classExtendsAllGenFeatures,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/genFeatureReified.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeatureReified.override" args="genFeature:genFeature,classExtendsGenClass:classExtendsGenClass,classExtendsAllGenFeatures:classExtendsAllGenFeatures,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/genFeatureReified.override.javajetinc%>
 <%}}}.run();}%>
 <%new Runnable() { public void run() {%>
 <%for (GenFeature genFeature : (isImplementation ? genClass.getImplementedGenFeatures() : genClass.getDeclaredGenFeatures())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/genFeature.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genFeature.override" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/genFeature.override.javajetinc%>
 <%}//for%>
 <%}}.run();%>
 <%for (GenOperation genOperation : (isImplementation ? genClass.getImplementedGenOperations() : genClass.getDeclaredGenOperations())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/implementedGenOperation.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.genOperation.override" args="genOperation:genOperation,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/implementedGenOperation.override.javajetinc%>
 <%}//for%>
 <%if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEInverseAddGenFeatures())) {%>
 	/**
@@ -292,9 +295,9 @@
     <%}%>
 				if (<%=genFeature.getSafeName()%> != null)
     <%if (genFeature.isEffectiveContains()) {%>
-					msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
+					msgs = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), true)%>.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - <%=genClass.getQualifiedFeatureID(genFeature)%><%=negativeOffsetCorrection%>, null, msgs);
     <%} else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass(); String reverseOffsetCorrection = targetClass.hasOffsetCorrection() ? " + " + genClass.getOffsetCorrectionField(genFeature) : "";%>
-					msgs = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject")%>)<%=genFeature.getSafeName()%>).eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
+					msgs = <%=genFeature.getAsInternalEObject(genFeature.getSafeName(), true)%>.eInverseRemove(this, <%=targetClass.getQualifiedFeatureID(reverseFeature)%><%=reverseOffsetCorrection%>, <%=targetClass.getRawImportedInterfaceName()%>.class, msgs);
     <%}%>
 				return basicSet<%=genFeature.getAccessorName()%>((<%=genFeature.getImportedType(genClass)%>)otherEnd, msgs);
   <%}%>
@@ -482,10 +485,10 @@
 
 <%}%>
 <%if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEUnsetGenFeatures())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.eUnset.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/eUnset.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.eUnset.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/eUnset.override.javajetinc%>
 <%}%>
 <%if (isImplementation && !genModel.isReflectiveDelegation() && genClass.implementsAny(genClass.getEIsSetGenFeatures())) {%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.eIsSet.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/eIsSet.override.javajetinc%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.eIsSet.override" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%><%//Class/eIsSet.override.javajetinc%>
 <%}%>
 <%if (isImplementation && (!genClass.getMixinGenFeatures().isEmpty() || genClass.hasOffsetCorrection() && !genClass.getGenFeatures().isEmpty())) {%>
   <%if (!genClass.getMixinGenFeatures().isEmpty()) {%>
@@ -810,6 +813,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public int getHash()
 	{
 		if (hash == -1)
@@ -825,6 +831,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public void setHash(int hash)
 	{
 		this.hash = hash;
@@ -835,6 +844,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public <%=keyType%> getKey()
 	{
   <%if (!isJDK50 && keyFeature.isPrimitiveType()) {%>
@@ -849,6 +861,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public void setKey(<%=keyType%> key)
 	{
   <%if (keyFeature.isListType()) {%>
@@ -867,6 +882,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public <%=valueType%> getValue()
 	{
   <%if (!isJDK50 && valueFeature.isPrimitiveType()) {%>
@@ -881,6 +899,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+  <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public <%=valueType%> setValue(<%=valueType%> value)
 	{
 		<%=valueType%> oldValue = getValue();
@@ -912,7 +933,7 @@
 	}
 
 <%}%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.insert" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.insert" args="genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 } //<%=isInterface ? " " + genClass.getInterfaceName() : genClass.getClassName()%>
 <%// TODO fix the space above%>
 <%genModel.emitSortedImports();%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PgCsMDG0Ed-kc8dEZsdm2w/method._PgL2IjG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PgCsMDG0Ed-kc8dEZsdm2w/method._PgL2IjG0Ed-kc8dEZsdm2w.pt
index d6de99f..639fba2 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PgCsMDG0Ed-kc8dEZsdm2w/method._PgL2IjG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PgCsMDG0Ed-kc8dEZsdm2w/method._PgL2IjG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2010 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
@@ -13,7 +13,7 @@
 %>
 <%final GenPackage genPackage = (GenPackage)((Object[])argument)[0]; final GenModel genModel=genPackage.getGenModel();%>
 <%final boolean isJDK50 = genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50;%>
-<%boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]);%>
+<%boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]);  boolean useInterfaceOverrideAnnotation = genModel.useInterfaceOverrideAnnotation() && !(isInterface && isImplementation);%>
 <%boolean packageNeedsSuppressDeprecation = isJDK50 && GenModelUtil.hasAPIDeprecatedTag(genPackage.getOrderedGenClassifiers()) && !genPackage.hasAPIDeprecatedTag();%>
 <%String publicStaticFinalFlag = isImplementation ? "public static final " : "";%>
 <%boolean needsAddEOperation = false;%>
@@ -395,6 +395,9 @@
 			(the<%=genPackage.getBasicPackageName()%>,
 			 new <%=genModel.getImportedName("org.eclipse.emf.ecore.EValidator")%>.Descriptor()
 			 {
+ <%if (genModel.useInterfaceOverrideAnnotation()) {%>
+				 @Override
+ <%}%>
 				 public <%=genModel.getImportedName("org.eclipse.emf.ecore.EValidator")%> getEValidator()
 				 {
 					 return <%=genPackage.getImportedValidatorClassName()%>.INSTANCE;
@@ -567,6 +570,9 @@
 	@Deprecated
   <%}%>
 <%if (isImplementation) {%>
+ <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+ <%}%>
 	public <%=genClassifier.getImportedMetaType()%> get<%=genClassifier.getClassifierAccessorName()%>()
 	{
     <%if (genPackage.isLoadedInitialization()) {%>
@@ -611,6 +617,9 @@
 	@Deprecated
 <%}%>
 <%if (isImplementation) {%>
+   <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+   <%}%>
 	public <%=genFeature.getImportedMetaType()%> get<%=genFeature.getFeatureAccessorName()%>()
 	{
         <%if (!genPackage.isLoadedInitialization()) {%>
@@ -652,6 +661,9 @@
 	@Deprecated
 <%}%>
 <%if (isImplementation) {%>
+   <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+   <%}%>
 	public <%=genOperation.getImportedMetaType()%> get<%=genOperation.getOperationAccessorName()%>()
 	{
         <%if (!genPackage.isLoadedInitialization()) {%>
@@ -684,6 +696,9 @@
 	 */
 <%}%>
 <%if (isImplementation) {%>
+   <%if (useInterfaceOverrideAnnotation) {%>
+	@Override
+   <%}%>
 	public <%=genPackage.getImportedFactoryInterfaceName()%> get<%=genPackage.getFactoryName()%>()
 	{
 		return (<%=genPackage.getImportedFactoryInterfaceName()%>)getEFactoryInstance();
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PgVnIDG0Ed-kc8dEZsdm2w/method._PgVnKTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PgVnIDG0Ed-kc8dEZsdm2w/method._PgVnKTG0Ed-kc8dEZsdm2w.pt
index 6c1511e..0848dae 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PgVnIDG0Ed-kc8dEZsdm2w/method._PgVnKTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PgVnIDG0Ed-kc8dEZsdm2w/method._PgVnKTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2010 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
@@ -13,7 +13,7 @@
 %>
 <%GenPackage genPackage = (GenPackage)((Object[])argument)[0]; GenModel genModel=genPackage.getGenModel(); /* Trick to import java.util.* without warnings */Iterator.class.getName();%>
 <%final boolean isJDK50 = genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50;%>
-<%boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]);%>
+<%boolean isInterface = Boolean.TRUE.equals(((Object[])argument)[1]); boolean isImplementation = Boolean.TRUE.equals(((Object[])argument)[2]); boolean useInterfaceOverrideAnnotation = genModel.useInterfaceOverrideAnnotation() && !(isInterface && isImplementation);%>
 <%String publicStaticFinalFlag = isImplementation ? "public static final " : "";%>
 <%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#LogicalName=org.eclipse.egf.emf.pattern.base.HeaderJava" args="parameter:argument"%>
 <%if (isInterface || genModel.isSuppressInterfaces()) {%>
@@ -60,9 +60,9 @@
 @Deprecated
 <%}%>
 <%if (isImplementation) {%>
-  <%if (isJDK50 && GenModelUtil.hasAPIDeprecatedTag(genPackage.getGenClassifiers()) && !genPackage.hasAPIDeprecatedTag()) {%>
+  <%if (isJDK50 && !genPackage.hasAPIDeprecatedTag()) { List<GenClassifier> genClassifiers = new ArrayList<GenClassifier>(genPackage.getGenClassifiers()); for (Iterator<GenClassifier> i = genClassifiers.iterator(); i.hasNext(); ) { GenClassifier genClassifier = i.next(); if (genClassifier instanceof GenClass && ((GenClass)genClassifier).isAbstract()) i.remove(); } if (GenModelUtil.hasAPIDeprecatedTag(genClassifiers)) {%>
 @SuppressWarnings("deprecation")
-  <%}%>
+  <%}}%>
 public class <%=genPackage.getFactoryClassName()%> extends <%=genModel.getImportedName("org.eclipse.emf.ecore.impl.EFactoryImpl")%><%if (!genModel.isSuppressInterfaces()) {%> implements <%=genPackage.getImportedFactoryInterfaceName()%><%}%>
 <%} else {%>
 public interface <%=genPackage.getFactoryInterfaceName()%><%if (!genModel.isSuppressEMFMetaData()) {%> extends <%=genModel.getImportedName("org.eclipse.emf.ecore.EFactory")%><%}%>
@@ -225,6 +225,9 @@
 <%if (isJDK50 && genClass.hasAPIDeprecatedTag()) {%>
 	@Deprecated
 <%}%>
+<%if (useInterfaceOverrideAnnotation && !genClass.isMapEntry()) {%>
+	@Override
+<%}%>
 	public <%=genClass.getTypeParameters()%><%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceTypeArguments()%> create<%=genClass.getName()%>()
 	{
     <%if (genClass.isDynamic()) {%>
@@ -254,6 +257,9 @@
     <%if (isJDK50 && genDataType.hasAPIDeprecatedTag()) {%>
 	@Deprecated
     <%}%>
+  <%if (genPackage.isDataTypeConverters() && useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public <%=genDataType.getImportedParameterizedInstanceClassName()%> create<%=genDataType.getName()%>(<%if (genDataType.hasCreatorBody()) {%>final <%}%>String <%if (genDataType.hasCreatorBody()) {%>it<%} else {%>literal<%}%>)
 	{
     <%if (genDataType.hasCreatorBody()) {%>
@@ -463,6 +469,9 @@
   <%if (isJDK50 && genDataType.hasAPIDeprecatedTag()) {%>
 	@Deprecated
   <%}%>
+  <%if (genPackage.isDataTypeConverters() && useInterfaceOverrideAnnotation) {%>
+	@Override
+  <%}%>
 	public String convert<%=genDataType.getName()%>(<%if (genDataType.hasCreatorBody()) {%>final <%}%><%=genDataType.getImportedBoundedWildcardInstanceClassName()%> <%if (genDataType.hasConverterBody()) {%>it<%} else {%>instanceValue<%}%>)
 	{
     <%if (genDataType.hasConverterBody()) {%>
@@ -756,6 +765,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+ <%if (useInterfaceOverrideAnnotation && !genModel.isSuppressEMFMetaData()) {%>
+	@Override
+ <%}%>
 	public <%=genPackage.getImportedPackageInterfaceName()%> get<%=genPackage.getBasicPackageName()%>()
 	{
 		return (<%=genPackage.getImportedPackageInterfaceName()%>)getEPackage();
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PgoiEDG0Ed-kc8dEZsdm2w/method._PgoiGTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PgoiEDG0Ed-kc8dEZsdm2w/method._PgoiGTG0Ed-kc8dEZsdm2w.pt
index e5d7623..170637d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PgoiEDG0Ed-kc8dEZsdm2w/method._PgoiGTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PgoiEDG0Ed-kc8dEZsdm2w/method._PgoiGTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2006 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Ph004DG0Ed-kc8dEZsdm2w/method._Ph006TG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Ph004DG0Ed-kc8dEZsdm2w/method._Ph006TG0Ed-kc8dEZsdm2w.pt
index ba58114..99d091d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Ph004DG0Ed-kc8dEZsdm2w/method._Ph006TG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Ph004DG0Ed-kc8dEZsdm2w/method._Ph006TG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2013 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PhO_ADG0Ed-kc8dEZsdm2w/method._PhO_CTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PhO_ADG0Ed-kc8dEZsdm2w/method._PhO_CTG0Ed-kc8dEZsdm2w.pt
index c25d352..1093c97 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PhO_ADG0Ed-kc8dEZsdm2w/method._PhO_CTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PhO_ADG0Ed-kc8dEZsdm2w/method._PhO_CTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2006 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Phh58DG0Ed-kc8dEZsdm2w/method._Phh5-TG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Phh58DG0Ed-kc8dEZsdm2w/method._Phh5-TG0Ed-kc8dEZsdm2w.pt
index b36289e..2badca5 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Phh58DG0Ed-kc8dEZsdm2w/method._Phh5-TG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Phh58DG0Ed-kc8dEZsdm2w/method._Phh5-TG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2006 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pi39wDG0Ed-kc8dEZsdm2w/method._Pi39xzG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pi39wDG0Ed-kc8dEZsdm2w/method._Pi39xzG0Ed-kc8dEZsdm2w.pt
index 6cb54c9..0634f5b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pi39wDG0Ed-kc8dEZsdm2w/method._Pi39xzG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pi39wDG0Ed-kc8dEZsdm2w/method._Pi39xzG0Ed-kc8dEZsdm2w.pt
@@ -1,4 +1,4 @@
 <%
 GenModel genModel = parameter;
-targetPathName = genModel.getEditProjectDirectory() + "/plugin.properties";
+targetPathName = genModel.getEditProjectDirectory() + "/" + genModel.getEditBundleLocalization()+ ".properties";
 %>
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pi39wDG0Ed-kc8dEZsdm2w/method._Pi39yTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pi39wDG0Ed-kc8dEZsdm2w/method._Pi39yTG0Ed-kc8dEZsdm2w.pt
index 42ed59e..edb321d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pi39wDG0Ed-kc8dEZsdm2w/method._Pi39yTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pi39wDG0Ed-kc8dEZsdm2w/method._Pi39yTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2007 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
@@ -14,8 +14,8 @@
 <%GenModel genModel = (GenModel)argument; /* Trick to import java.util.* without warnings */Iterator.class.getName();%>
 <%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#LogicalName=org.eclipse.egf.emf.pattern.base.HeaderProperties" args="parameter:argument"%>
 
-pluginName = <%=genModel.getModelName()%> Edit Support
-providerName = www.example.org
+pluginName = <%=genModel.getEditBundleName()%>
+providerName = <%=genModel.getEditBundleVendorName()%>
 <%if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {%>
 
 <%if (genModel.isCreationCommands()) {%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PiIW5DG0Ed-kc8dEZsdm2w/method._PiIW7TG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PiIW5DG0Ed-kc8dEZsdm2w/method._PiIW7TG0Ed-kc8dEZsdm2w.pt
index d34a88e..a3910da 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PiIW5DG0Ed-kc8dEZsdm2w/method._PiIW7TG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PiIW5DG0Ed-kc8dEZsdm2w/method._PiIW7TG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2005 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PibR0DG0Ed-kc8dEZsdm2w/method._PibR2TG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PibR0DG0Ed-kc8dEZsdm2w/method._PibR2TG0Ed-kc8dEZsdm2w.pt
index a594ace..494ab7d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PibR0DG0Ed-kc8dEZsdm2w/method._PibR2TG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PibR0DG0Ed-kc8dEZsdm2w/method._PibR2TG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2010 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
@@ -26,7 +26,11 @@
 <%if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {%>
                plugin.xml,\
 <%}%>
-               plugin.properties
+<%String editBundleLocalization = genModel.getEditBundleLocalization(); int index = editBundleLocalization.indexOf("/"); if (index == -1) {%>
+               <%=editBundleLocalization%>.properties
+<%} else {%>
+               <%=editBundleLocalization.substring(0, index + 1)%>
+<%}%>
 jars.compile.order = <%=pluginClassesLocation%>
 <% boolean first=true; for (Iterator<String> i = sourceFolders.iterator(); i.hasNext();) { String sourceFolder = i.next(); if (i.hasNext()){sourceFolder +=",\\";} if (first) {%>
 source.<%=pluginClassesLocation%> = <%=sourceFolder%><%first=false;} else {%><%=sourceFolder%><%}}%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PiuMwDG0Ed-kc8dEZsdm2w/method._PiuMyTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PiuMwDG0Ed-kc8dEZsdm2w/method._PiuMyTG0Ed-kc8dEZsdm2w.pt
index d390a57..1945d4e 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PiuMwDG0Ed-kc8dEZsdm2w/method._PiuMyTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PiuMwDG0Ed-kc8dEZsdm2w/method._PiuMyTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2005-2010 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors:
  *   IBM - Initial API and implementation
@@ -14,15 +14,16 @@
 <%GenModel genModel = (GenModel)argument;%>
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: <%=genModel.getEditBundleNameKey()%>
 Bundle-SymbolicName: <%=genModel.getEditPluginID()%>;singleton:=true
+Automatic-Module-Name: <%=genModel.getEditPluginID()%>
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: <%if (genModel.isRuntimeJar()) {%><%=genModel.getEditPluginID()%>.jar<%}else{%>.<%}%>
 <%if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {%>
 Bundle-Activator: <%=genModel.getQualifiedEditPluginClassName()%>$Implementation<%if (genModel.isOSGiCompatible()) {%>$Activator<%}%>
 <%}%>
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
+Bundle-Vendor: <%=genModel.getEditBundleVendorKey()%>
+Bundle-Localization: <%=genModel.getEditBundleLocalization()%>
 <%if (genModel.getComplianceLevel() == GenJDKLevel.JDK50_LITERAL) {%>
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 <%} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK60_LITERAL) {%>
@@ -33,6 +34,8 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 <%} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK90_LITERAL) {%>
 Bundle-RequiredExecutionEnvironment: JavaSE-9
+<%} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK100_LITERAL) {%>
+Bundle-RequiredExecutionEnvironment: JavaSE-10
 <%}%>
 <%Iterator<String> packagesIterator = genModel.getEditQualifiedPackageNames().iterator(); if (packagesIterator.hasNext()) { String pack = packagesIterator.next();%>
 Export-Package: <%=pack%><%while(packagesIterator.hasNext()) { pack = packagesIterator.next();%>,
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PjK4sDG0Ed-kc8dEZsdm2w/method._PjK4uTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PjK4sDG0Ed-kc8dEZsdm2w/method._PjK4uTG0Ed-kc8dEZsdm2w.pt
index f3aa517..9d899c8 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PjK4sDG0Ed-kc8dEZsdm2w/method._PjK4uTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PjK4sDG0Ed-kc8dEZsdm2w/method._PjK4uTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2007 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PjdzoDG0Ed-kc8dEZsdm2w/method._PjdzqTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PjdzoDG0Ed-kc8dEZsdm2w/method._PjdzqTG0Ed-kc8dEZsdm2w.pt
index e4a80f6..8588805 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PjdzoDG0Ed-kc8dEZsdm2w/method._PjdzqTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PjdzoDG0Ed-kc8dEZsdm2w/method._PjdzqTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2010 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
@@ -247,6 +247,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()){%>
+	@Override
+<%}%>
 	public ComposeableAdapterFactory getRootAdapterFactory()
 	{
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
@@ -258,6 +261,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()){%>
+	@Override
+<%}%>
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
 	{
 		this.parentAdapterFactory = parentAdapterFactory;
@@ -370,6 +376,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()){%>
+	@Override
+<%}%>
 	public void addListener(INotifyChangedListener notifyChangedListener)
 	{
 		changeNotifier.addListener(notifyChangedListener);
@@ -381,6 +390,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()){%>
+	@Override
+<%}%>
 	public void removeListener(INotifyChangedListener notifyChangedListener)
 	{
 		changeNotifier.removeListener(notifyChangedListener);
@@ -392,6 +404,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()){%>
+	@Override
+<%}%>
 	public void fireNotifyChanged(Notification notification)
 	{
 		changeNotifier.fireNotifyChanged(notification);
@@ -409,6 +424,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()){%>
+	@Override
+<%}%>
 	public void dispose()
 	{
 <%if (genPackage.hasStatefulProvider()) {%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PjwukDG0Ed-kc8dEZsdm2w/method._PjwumTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PjwukDG0Ed-kc8dEZsdm2w/method._PjwumTG0Ed-kc8dEZsdm2w.pt
index 6475f38..ac89089 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PjwukDG0Ed-kc8dEZsdm2w/method._PjwumTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PjwukDG0Ed-kc8dEZsdm2w/method._PjwumTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2010 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pk9BYDG0Ed-kc8dEZsdm2w/method._Pk9BaTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pk9BYDG0Ed-kc8dEZsdm2w/method._Pk9BaTG0Ed-kc8dEZsdm2w.pt
index b4ffffd..439335e 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pk9BYDG0Ed-kc8dEZsdm2w/method._Pk9BaTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pk9BYDG0Ed-kc8dEZsdm2w/method._Pk9BaTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2005-2010 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
@@ -14,15 +14,16 @@
 <%GenModel genModel = (GenModel)argument;%>
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: <%=genModel.getEditorBundleNameKey()%>
 Bundle-SymbolicName: <%=genModel.getEditorPluginID()%>;singleton:=true
+Automatic-Module-Name: <%=genModel.getEditorPluginID()%>
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: <%if (genModel.isRuntimeJar()) {%><%=genModel.getEditorPluginID()%>.jar<%}else{%>.<%}%>
 <%if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {%>
 Bundle-Activator: <%=genModel.getQualifiedEditorPluginClassName()%>$Implementation
 <%}%>
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
+Bundle-Vendor: <%=genModel.getEditorBundleVendorKey()%>
+Bundle-Localization: <%=genModel.getEditorBundleLocalization()%>
 <%if (genModel.getComplianceLevel() == GenJDKLevel.JDK50_LITERAL) {%>
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 <%} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK60_LITERAL) {%>
@@ -33,6 +34,8 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 <%} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK90_LITERAL) {%>
 Bundle-RequiredExecutionEnvironment: JavaSE-9
+<%} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK100_LITERAL) {%>
+Bundle-RequiredExecutionEnvironment: JavaSE-10
 <%}%>
 <%Iterator<String> packagesIterator = genModel.getEditorQualifiedPackageNames().iterator(); if (packagesIterator.hasNext()) { String pack = packagesIterator.next();%>
 Export-Package: <%=pack%><%while(packagesIterator.hasNext()) { pack = packagesIterator.next();%>,
@@ -40,7 +43,7 @@
 <%}%>
 <%Iterator<String> requiredPluginIterator = genModel.getEditorRequiredPlugins().iterator(); if (requiredPluginIterator.hasNext()) { String pluginID = requiredPluginIterator.next();%>
 Require-Bundle: <%=pluginID%><%if (!pluginID.startsWith("org.eclipse.core.runtime")){%>;visibility:=reexport<%} while(requiredPluginIterator.hasNext()) { pluginID = requiredPluginIterator.next();%>,
- <%=pluginID%><%if (!pluginID.startsWith("org.eclipse.core.runtime") && !pluginID.equals("org.eclipse.xtext.xbase.lib") && !pluginID.equals("org.eclipse.emf.ecore.xcore.lib")) {%>;visibility:=reexport<%}}%>
+ <%=pluginID%><%if (!pluginID.startsWith("org.eclipse.core.runtime") && !pluginID.equals("org.eclipse.jface.text") && !pluginID.equals("org.eclipse.xtext.xbase.lib") && !pluginID.equals("org.eclipse.emf.ecore.xcore.lib")) {%>;visibility:=reexport<%}}%>
 <%}%>
 <%if (genModel.isRichAjaxPlatform()) {%>
 Import-Package: org.eclipse.emf.common.ui,
@@ -58,6 +61,8 @@
  org.eclipse.jface.action,
  org.eclipse.jface.dialogs,
  org.eclipse.jface.operation,
+ org.eclipse.jface.text,
+ org.eclipse.jface.util,
  org.eclipse.jface.viewers,
  org.eclipse.jface.window,
  org.eclipse.jface.wizard,
@@ -72,6 +77,7 @@
  org.eclipse.ui.actions;ui.workbench="split",
  org.eclipse.ui.application,
  org.eclipse.ui.part;ui.workbench="split",
+ org.eclipse.ui.plugin,
  org.eclipse.ui.views,
  org.eclipse.ui.views.contentoutline,
  org.eclipse.ui.views.properties;ui.views="split"
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PkqGdDG0Ed-kc8dEZsdm2w/method._Pkz3cjG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PkqGdDG0Ed-kc8dEZsdm2w/method._Pkz3cjG0Ed-kc8dEZsdm2w.pt
index 6277262..3ffc6f6 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PkqGdDG0Ed-kc8dEZsdm2w/method._Pkz3cjG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PkqGdDG0Ed-kc8dEZsdm2w/method._Pkz3cjG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2010 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PlQjYDG0Ed-kc8dEZsdm2w/method._PlQjaTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PlQjYDG0Ed-kc8dEZsdm2w/method._PlQjaTG0Ed-kc8dEZsdm2w.pt
index e262bb6..4ec761e 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PlQjYDG0Ed-kc8dEZsdm2w/method._PlQjaTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PlQjYDG0Ed-kc8dEZsdm2w/method._PlQjaTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2008 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
@@ -24,7 +24,11 @@
 <%if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {%>
                plugin.xml,\
 <%}%>
-               plugin.properties
+<%String editorBundleLocalization = genModel.getEditorBundleLocalization(); int index = editorBundleLocalization.indexOf("/"); if (index == -1) {%>
+               <%=editorBundleLocalization%>.properties
+<%} else {%>
+               <%=editorBundleLocalization.substring(0, index + 1)%>
+<%}%>
 jars.compile.order = <%=pluginClassesLocation%>
 <% boolean first=true; for (Iterator<String> i = sourceFolders.iterator(); i.hasNext();) { String sourceFolder = i.next(); if (i.hasNext()){sourceFolder +=",\\";} if (first) {%>
 source.<%=pluginClassesLocation%> = <%=sourceFolder%><%first=false;} else {%><%=sourceFolder%><%}}%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PljeUDG0Ed-kc8dEZsdm2w/method._PljeVzG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PljeUDG0Ed-kc8dEZsdm2w/method._PljeVzG0Ed-kc8dEZsdm2w.pt
index 79e92549..b4340e9 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PljeUDG0Ed-kc8dEZsdm2w/method._PljeVzG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PljeUDG0Ed-kc8dEZsdm2w/method._PljeVzG0Ed-kc8dEZsdm2w.pt
@@ -1,4 +1,4 @@
 <%
 GenModel genModel = parameter;
-targetPathName = genModel.getEditorProjectDirectory() + "/plugin.properties";
+targetPathName = genModel.getEditorProjectDirectory() + "/" + genModel.getEditorBundleLocalization()+ ".properties";
 %>
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PljeUDG0Ed-kc8dEZsdm2w/method._PljeWTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PljeUDG0Ed-kc8dEZsdm2w/method._PljeWTG0Ed-kc8dEZsdm2w.pt
index 2a9c78e..4edacd9 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PljeUDG0Ed-kc8dEZsdm2w/method._PljeWTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PljeUDG0Ed-kc8dEZsdm2w/method._PljeWTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2006 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
@@ -14,8 +14,8 @@
 <%GenModel genModel = (GenModel)argument; /* Trick to import java.util.* without warnings */Iterator.class.getName();%>
 <%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#LogicalName=org.eclipse.egf.emf.pattern.base.HeaderProperties" args="parameter:argument"%>
 
-pluginName = <%=genModel.getModelName()%> Editor
-providerName = www.example.org
+pluginName = <%=genModel.getEditorBundleName()%>
+providerName = <%=genModel.getEditorBundleVendorName()%>
 <%if (genModel.getRuntimePlatform() != GenRuntimePlatform.GWT) {%>
 
 <%boolean hasMultiPageEditor = false;%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PltPUDG0Ed-kc8dEZsdm2w/method._Pl2ZQjG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PltPUDG0Ed-kc8dEZsdm2w/method._Pl2ZQjG0Ed-kc8dEZsdm2w.pt
index d4c7210..6b7c408 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PltPUDG0Ed-kc8dEZsdm2w/method._Pl2ZQjG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PltPUDG0Ed-kc8dEZsdm2w/method._Pl2ZQjG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2007 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
@@ -82,6 +82,9 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+		@Override
+<%}%>
 		public void run(<%=genModel.getImportedName("org.eclipse.jface.action.IAction")%> action)
 		{
 			<%=genPackage.getModelWizardClassName()%> wizard = new <%=genPackage.getModelWizardClassName()%>();
@@ -238,6 +241,18 @@
 		liveValidationAction = new <%=genModel.getImportedName("org.eclipse.emf.edit.ui.provider.DiagnosticDecorator")%>.LiveValidator.LiveValidationAction(<%=genPackage.getImportedEditorPluginClassName()%>.getPlugin().getDialogSettings());
 <%}%>
 		controlAction = new <%=genModel.getImportedName("org.eclipse.emf.edit.ui.action.ControlAction")%>();
+<%if (genModel.isFindAction()) {%>
+		findAction = <%=genModel.getImportedName("org.eclipse.emf.edit.ui.action.FindAction")%>.create();
+<%}%>
+<%if (genModel.isRevertAction()) {%>
+		revertAction = new <%=genModel.getImportedName("org.eclipse.emf.edit.ui.action.RevertAction")%>();
+<%}%>
+<%if (genModel.isExpandAllAction()) {%>
+		expandAllAction = new <%=genModel.getImportedName("org.eclipse.emf.edit.ui.action.ExpandAllAction")%>();
+<%}%>
+<%if (genModel.isCollapseAllAction()) {%>
+		collapseAllAction = new <%=genModel.getImportedName("org.eclipse.emf.edit.ui.action.CollapseAllAction")%>();
+<%}%>
 	}
 
 	/**
@@ -251,6 +266,7 @@
 <%}%>
 	public void contributeToToolBar(<%=genModel.getImportedName("org.eclipse.jface.action.IToolBarManager")%> toolBarManager)
 	{
+		super.contributeToToolBar(toolBarManager);
 		toolBarManager.add(new <%=genModel.getImportedName("org.eclipse.jface.action.Separator")%>("<%=genPackage.getPrefix().toLowerCase(genModel.getLocale())%>-settings"));<%=genModel.getNonNLS()%>
 		toolBarManager.add(new <%=genModel.getImportedName("org.eclipse.jface.action.Separator")%>("<%=genPackage.getPrefix().toLowerCase(genModel.getLocale())%>-additions"));<%=genModel.getNonNLS()%>
 	}
@@ -292,6 +308,9 @@
 		submenuManager.addMenuListener
 			(new <%=genModel.getImportedName("org.eclipse.jface.action.IMenuListener")%>()
 			 {
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+				 @Override
+<%}%>
 				 public void menuAboutToShow(<%=genModel.getImportedName("org.eclipse.jface.action.IMenuManager")%> menuManager)
 				 {
 					 menuManager.updateAll(true);
@@ -352,6 +371,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+	@Override
+<%}%>
 	public void selectionChanged(<%=genModel.getImportedName("org.eclipse.jface.viewers.SelectionChangedEvent")%> event)
 	{
 <%if (genModel.isCreationCommands()) {%>
@@ -631,7 +653,7 @@
 					<%=genModel.getImportedName("org.eclipse.jface.action.MenuManager")%> submenuManager = (<%=genModel.getImportedName("org.eclipse.jface.action.MenuManager")%>)contributionItem;
 					if (submenuActions.containsKey(submenuManager.getMenuText()))
 					{
-						depopulateManager(submenuManager, <%if (!genModel.useGenerics()) {%>(<%=_CollectionOfIAction%>)<%}%>submenuActions.get(contributionItem));
+						depopulateManager(submenuManager, <%if (!genModel.useGenerics()) {%>(<%=_CollectionOfIAction%>)<%}%>submenuActions.get(submenuManager.getMenuText()));
 						manager.remove(contributionItem);
 					}
 				}
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pmc2MDG0Ed-kc8dEZsdm2w/method._PmmAJzG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pmc2MDG0Ed-kc8dEZsdm2w/method._PmmAJzG0Ed-kc8dEZsdm2w.pt
index b7fd99d..cda2def 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pmc2MDG0Ed-kc8dEZsdm2w/method._PmmAJzG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pmc2MDG0Ed-kc8dEZsdm2w/method._PmmAJzG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2010 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
@@ -197,9 +197,7 @@
 <%}%>
 
 import org.eclipse.emf.ecore.resource.Resource;
-<%if (!genModel.isRichClientPlatform()) {%>
 import org.eclipse.emf.ecore.resource.ResourceSet;
-<%}%>
 
 import org.eclipse.emf.ecore.util.EContentAdapter;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -256,7 +254,7 @@
 <%}%>
 public class <%=genPackage.getEditorClassName()%>
 	extends MultiPageEditorPart
-	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider<%if (!genModel.isRichClientPlatform()) {%>, IGotoMarker<%}%>
+	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider<%if (!genModel.isRichClientPlatform()) {%>, IGotoMarker<%}%><%if (genModel.isRevertAction()) {%>, <%=genModel.getImportedName("org.eclipse.emf.edit.ui.util.IRevertablePart")%><%}%>
 {
 <%if (genModel.hasCopyrightField()) {%>
 	/**
@@ -462,6 +460,9 @@
 	protected IPartListener partListener =
 		new IPartListener()
 		{
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+			@Override
+<%}%>
 			public void partActivated(IWorkbenchPart p)
 			{
 				if (p instanceof ContentOutline)
@@ -486,18 +487,30 @@
 					handleActivate();
 				}
 			}
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+			@Override
+<%}%>
 			public void partBroughtToTop(IWorkbenchPart p)
 			{
 				// Ignore.
 			}
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+			@Override
+<%}%>
 			public void partClosed(IWorkbenchPart p)
 			{
 				// Ignore.
 			}
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+			@Override
+<%}%>
 			public void partDeactivated(IWorkbenchPart p)
 			{
 				// Ignore.
 			}
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+			@Override
+<%}%>
 			public void partOpened(IWorkbenchPart p)
 			{
 				// Ignore.
@@ -597,6 +610,9 @@
 					getSite().getShell().getDisplay().asyncExec
 						(new Runnable()
 						 {
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+							 @Override
+<%}%>
 							 public void run()
 							 {
 								 dispatching = false;
@@ -635,6 +651,9 @@
 	protected IResourceChangeListener resourceChangeListener =
 		new IResourceChangeListener()
 		{
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+			@Override
+<%}%>
 			public void resourceChanged(IResourceChangeEvent event)
 			{
 				IResourceDelta delta = event.getDelta();
@@ -646,6 +665,9 @@
 						protected <%=_CollectionOfResource%> changedResources = new <%=_ArrayListOfResource%>();
 						protected <%=_CollectionOfResource%> removedResources = new <%=_ArrayListOfResource%>();
 
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+						@Override
+<%}%>
 						public boolean visit(<%if (genModel.getDecoration() != GenDecoration.NONE) {%>final <%}%>IResourceDelta delta)
 						{
 							if (delta.getResource().getType() == IResource.FILE)
@@ -708,6 +730,9 @@
 						getSite().getShell().getDisplay().asyncExec
 							(new Runnable()
 							 {
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+								 @Override
+<%}%>
 								 public void run()
 								 {
 									 removedResources.addAll(visitor.getRemovedResources());
@@ -724,6 +749,9 @@
 						getSite().getShell().getDisplay().asyncExec
 							(new Runnable()
 							 {
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+								 @Override
+<%}%>
 								 public void run()
 								 {
 									 changedResources.addAll(visitor.getChangedResources());
@@ -794,9 +822,10 @@
 	{
 		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict()))
 		{
+			ResourceSet resourceSet = editingDomain.getResourceSet();
 			if (isDirty())
 			{
-				changedResources.addAll(editingDomain.getResourceSet().getResources());
+				changedResources.addAll(resourceSet.getResources());
 			}
 			editingDomain.getCommandStack().flush();
 
@@ -815,7 +844,7 @@
 					resource.unload();
 					try
 					{
-						resource.load(Collections.EMPTY_MAP);
+						resource.load(resourceSet.getLoadOptions());
 					}
 					catch (IOException exception)
 					{
@@ -1003,11 +1032,17 @@
 		commandStack.addCommandStackListener
 			(new CommandStackListener()
 			 {
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+				 @Override
+<%}%>
 				 public void commandStackChanged(final EventObject event)
 				 {
 					 getContainer().getDisplay().asyncExec
 						 (new Runnable()
 						  {
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+							  @Override
+<%}%>
 							  public void run()
 							  {
 								  firePropertyChange(IEditorPart.PROP_DIRTY);
@@ -1071,6 +1106,9 @@
 			Runnable runnable =
 				new Runnable()
 				{
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+					@Override
+<%}%>
 					public void run()
 					{
 						// Try to select the items in the current content viewer of the editor.
@@ -1093,6 +1131,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+	@Override
+<%}%>
 	public EditingDomain getEditingDomain()
 	{
 		return editingDomain;
@@ -1213,6 +1254,9 @@
 					{
 						// This just notifies those things that are affected by the section.
 						//
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+						@Override
+<%}%>
 						public void selectionChanged(SelectionChangedEvent selectionChangedEvent)
 						{
 							setSelection(selectionChangedEvent.getSelection());
@@ -1250,6 +1294,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+	@Override
+<%}%>
 	public Viewer getViewer()
 	{
 		return currentViewer;
@@ -1662,6 +1709,9 @@
 			getSite().getShell().getDisplay().asyncExec
 				(new Runnable()
 				 {
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+					 @Override
+<%}%>
 					 public void run()
 					 {
 						 if (!getContainer().isDisposed())
@@ -1696,6 +1746,9 @@
 		getSite().getShell().getDisplay().asyncExec
 			(new Runnable()
 			 {
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+				 @Override
+<%}%>
 				 public void run()
 				 {
 					 updateProblemIndication();
@@ -1808,6 +1861,12 @@
 <%}%>
 		}
 <%}%>
+<%if (genModel.isFindAction()) {%>
+		else if (key.equals(<%=genModel.getImportedName("org.eclipse.jface.text.IFindReplaceTarget")%>.class)) 
+		{
+			return <%=genModel.getImportedName("org.eclipse.emf.edit.ui.util.FindAndReplaceTarget")%>.getAdapter(key, this, <%=genPackage.getImportedEditorPluginClassName()%>.getPlugin());
+		}
+<%}%>
 		else
 		{
 			return super.getAdapter(key);
@@ -1888,6 +1947,9 @@
 				 {
 					 // This ensures that we handle selections correctly.
 					 //
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+					 @Override
+<%}%>
 					 public void selectionChanged(SelectionChangedEvent event)
 					 {
 						 handleContentOutlineSelection(event.getSelection());
@@ -2010,6 +2072,71 @@
 		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
 	}
 
+<%if (genModel.isRevertAction()) {%>
+	/**
+	 * This is for implementing {@link IRevertablePart}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+<%if (genModel.useClassOverrideAnnotation()) {%>
+	@Override
+<%}%>
+	public void doRevert()
+	{
+<%if (genModel.getDecoration() == GenDecoration.LIVE) {%>
+		DiagnosticDecorator.cancel(editingDomain);
+
+<%}%>		
+		ResourceSet resourceSet = editingDomain.getResourceSet();
+		<%=_ListOfResource%> resources = resourceSet.getResources();
+		<%=_ListOfResource%> unloadedResources = new <%=_ArrayListOfResource%>();
+		updateProblemIndication = false;
+		for (int i = 0; i < resources.size(); ++i)
+		{
+			Resource resource = resources.get(i);
+			if (resource.isLoaded())
+			{
+				resource.unload();
+				unloadedResources.add(resource);
+			}
+		}
+
+		resourceToDiagnosticMap.clear();
+<%if (genModel.useGenerics()) {%>
+		for (Resource resource : unloadedResources)
+<%} else {%>
+		for (Iterator i = unloadedResources.iterator(); i.hasNext(); )
+<%}%>
+		{
+<%if (!genModel.useGenerics()) {%>
+				Resource resource = (Resource)i.next();
+<%}%>
+			try
+			{
+				resource.load(resourceSet.getLoadOptions());
+			}
+			catch (IOException exception)
+			{
+				if (!resourceToDiagnosticMap.containsKey(resource))
+				{
+					resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+				}
+			}
+		}
+
+		editingDomain.getCommandStack().flush();
+
+		if (AdapterFactoryEditingDomain.isStale(editorSelection))
+		{
+			setSelection(StructuredSelection.EMPTY);
+		}
+
+		updateProblemIndication = true;
+		updateProblemIndication();
+	}
+
+<%}%>
 	/**
 	 * This is for implementing {@link IEditorPart} and simply saves the model file.
 	 * <!-- begin-user-doc -->
@@ -2038,7 +2165,7 @@
 			{
 				// This is the method that gets invoked when the operation runs.
 				//
-<%if (!genModel.isRichClientPlatform() && genModel.useClassOverrideAnnotation()) {%>
+<%if (genModel.useInterfaceOverrideAnnotation() || !genModel.isRichClientPlatform() && genModel.useClassOverrideAnnotation()) {%>
 				@Override
 <%}%>
 				public void <%=operationMethodName%>(IProgressMonitor monitor)
@@ -2226,6 +2353,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+	@Override
+<%}%>
 	public void gotoMarker(IMarker marker)
 	{
 <%if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF23_VALUE) {%>
@@ -2310,6 +2440,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+	@Override
+<%}%>
 	public void addSelectionChangedListener(ISelectionChangedListener listener)
 	{
 		selectionChangedListeners.add(listener);
@@ -2321,6 +2454,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+	@Override
+<%}%>
 	public void removeSelectionChangedListener(ISelectionChangedListener listener)
 	{
 		selectionChangedListeners.remove(listener);
@@ -2332,6 +2468,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+	@Override
+<%}%>
 	public ISelection getSelection()
 	{
 		return editorSelection;
@@ -2344,6 +2483,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+	@Override
+<%}%>
 	public void setSelection(ISelection selection)
 	{
 		editorSelection = selection;
@@ -2432,6 +2574,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+	@Override
+<%}%>
 	public void menuAboutToShow(IMenuManager menuManager)
 	{
 		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PmvxIDG0Ed-kc8dEZsdm2w/method._Pm5iIjG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PmvxIDG0Ed-kc8dEZsdm2w/method._Pm5iIjG0Ed-kc8dEZsdm2w.pt
index 41515ef..250c8f3 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PmvxIDG0Ed-kc8dEZsdm2w/method._Pm5iIjG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PmvxIDG0Ed-kc8dEZsdm2w/method._Pm5iIjG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2010 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
@@ -216,6 +216,9 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+	@Override
+<%}%>
 	public void init(IWorkbench workbench, IStructuredSelection selection)
 	{
 		this.workbench = workbench;
@@ -340,6 +343,9 @@
 			//
 			<%=genModel.getImportedName("org.eclipse.jface.operation.IRunnableWithProgress")%> operation = new <%=genModel.getImportedName("org.eclipse.jface.operation.IRunnableWithProgress")%>()
 			{
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+				@Override
+<%}%>
 				public void run(IProgressMonitor progressMonitor)
 <%} else {%>
 			// Remember the file.
@@ -414,6 +420,9 @@
 				getShell().getDisplay().asyncExec
 					(new Runnable()
 					 {
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+						 @Override
+<%}%>
 						 public void run()
 						 {
 							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
@@ -559,6 +568,9 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+		@Override
+<%}%>
 		public void createControl(Composite parent)
 		{
 			Composite composite = new Composite(parent, SWT.NONE);
@@ -710,6 +722,9 @@
 		protected ModifyListener validator =
 			new ModifyListener()
 			{
+<%if (genModel.useInterfaceOverrideAnnotation()) {%>
+				@Override
+<%}%>
 				public void modifyText(ModifyEvent e)
 				{
 					setPageComplete(validatePage());
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PnCsEDG0Ed-kc8dEZsdm2w/method._PnCsGTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PnCsEDG0Ed-kc8dEZsdm2w/method._PnCsGTG0Ed-kc8dEZsdm2w.pt
index 57a4839..fbf5dcc 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PnCsEDG0Ed-kc8dEZsdm2w/method._PnCsGTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PnCsEDG0Ed-kc8dEZsdm2w/method._PnCsGTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2002-2004 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PnVnADG0Ed-kc8dEZsdm2w/method._PnVnCTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PnVnADG0Ed-kc8dEZsdm2w/method._PnVnCTG0Ed-kc8dEZsdm2w.pt
index fe37d71..9e4752d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PnVnADG0Ed-kc8dEZsdm2w/method._PnVnCTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PnVnADG0Ed-kc8dEZsdm2w/method._PnVnCTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2004-2010 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
@@ -173,6 +173,9 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
+<%if (genModel.useInterfaceOverrideAnnotation()){%>
+		@Override
+<%}%>
 		public Object start(IApplicationContext context) throws Exception
 		{
 			WorkbenchAdvisor workbenchAdvisor = new <%=genModel.getEditorAdvisorClassName()%>();
@@ -201,6 +204,9 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
+<%if (genModel.useInterfaceOverrideAnnotation()){%>
+		@Override
+<%}%>
 		public void stop()
 		{
 			// Do nothing.
@@ -229,6 +235,9 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
+<%if (genModel.useInterfaceOverrideAnnotation()){%>
+		@Override
+<%}%>
 		public void createInitialLayout(IPageLayout layout)
 		{
 			layout.setEditorAreaVisible(true);
@@ -463,6 +472,9 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
+<%if (genModel.useInterfaceOverrideAnnotation()){%>
+		@Override
+<%}%>
 		public void run(IAction action)
 		{
 			MessageDialog.openInformation(getWindow().getShell(), getString("_UI_About_title"),<%=genModel.getNonNLS()%>
@@ -485,6 +497,9 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
+<%if (genModel.useInterfaceOverrideAnnotation()){%>
+		@Override
+<%}%>
 		public void run(IAction action)
 		{
 			String[] filePaths = openFilePathDialog(getWindow().getShell(), SWT.OPEN, null);
@@ -510,6 +525,9 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
+<%if (genModel.useInterfaceOverrideAnnotation()){%>
+		@Override
+<%}%>
 		public void run(IAction action)
 		{
 			LoadResourceAction.LoadResourceDialog loadResourceDialog = new LoadResourceAction.LoadResourceDialog(getWindow().getShell());
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Po1b0DG0Ed-kc8dEZsdm2w/method._Po1b2TG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Po1b0DG0Ed-kc8dEZsdm2w/method._Po1b2TG0Ed-kc8dEZsdm2w.pt
index a6bb2f3..f0387b6 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Po1b0DG0Ed-kc8dEZsdm2w/method._Po1b2TG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Po1b0DG0Ed-kc8dEZsdm2w/method._Po1b2TG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
@@ -14,12 +14,13 @@
 <%GenModel genModel = (GenModel)argument;%>
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: <%=genModel.getTestsBundleNameKey()%>
 Bundle-SymbolicName: <%=genModel.getTestsPluginID()%>;singleton:=true
+Automatic-Module-Name: <%=genModel.getTestsPluginID()%>
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: <%if (genModel.isRuntimeJar()) {%><%=genModel.getTestsPluginID()%>.jar<%}else{%>.<%}%>
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
+Bundle-Vendor: <%=genModel.getTestsBundleVendorKey()%>
+Bundle-Localization: <%=genModel.getTestsBundleLocalization()%>
 <%if (genModel.getComplianceLevel() == GenJDKLevel.JDK50_LITERAL) {%>
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 <%} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK60_LITERAL) {%>
@@ -30,6 +31,8 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 <%} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK90_LITERAL) {%>
 Bundle-RequiredExecutionEnvironment: JavaSE-9
+<%} else if (genModel.getComplianceLevel() == GenJDKLevel.JDK100_LITERAL) {%>
+Bundle-RequiredExecutionEnvironment: JavaSE-10
 <%}%>
 <%Iterator<String> packagesIterator = genModel.getTestsQualifiedPackageNames().iterator(); if (packagesIterator.hasNext()) { String pack = packagesIterator.next();%>
 Export-Package: <%=pack%><%while(packagesIterator.hasNext()) { pack = packagesIterator.next();%>,
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PoO-4zG0Ed-kc8dEZsdm2w/method._PoO-7DG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PoO-4zG0Ed-kc8dEZsdm2w/method._PoO-7DG0Ed-kc8dEZsdm2w.pt
index 6102378..fb9be3a 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PoO-4zG0Ed-kc8dEZsdm2w/method._PoO-7DG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PoO-4zG0Ed-kc8dEZsdm2w/method._PoO-7DG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PoYv4DG0Ed-kc8dEZsdm2w/method._PoYv6TG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PoYv4DG0Ed-kc8dEZsdm2w/method._PoYv6TG0Ed-kc8dEZsdm2w.pt
index 4d6aa21..24484d2 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PoYv4DG0Ed-kc8dEZsdm2w/method._PoYv6TG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PoYv4DG0Ed-kc8dEZsdm2w/method._PoYv6TG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2005-2008 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
@@ -22,7 +22,11 @@
 <%} else {%>
                plugin.xml,\
 <%}%>
-               plugin.properties
+<%String testsBundleLocalization = genModel.getTestsBundleLocalization(); int index = testsBundleLocalization.indexOf("/"); if (index == -1) {%>
+               <%=testsBundleLocalization%>.properties
+<%} else {%>
+               <%=testsBundleLocalization.substring(0, index + 1)%>
+<%}%>
 jars.compile.order = <%=pluginClassesLocation%>
 <% boolean first=true; for (Iterator<String> i = sourceFolders.iterator(); i.hasNext();) { String sourceFolder = i.next(); if (i.hasNext()){sourceFolder +=",\\";} if (first) {%>
 source.<%=pluginClassesLocation%> = <%=sourceFolder%><%first=false;} else {%><%=sourceFolder%><%}}%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pp39oDG0Ed-kc8dEZsdm2w/method._PqBuojG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pp39oDG0Ed-kc8dEZsdm2w/method._PqBuojG0Ed-kc8dEZsdm2w.pt
index 439cbd5..0b6232d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pp39oDG0Ed-kc8dEZsdm2w/method._PqBuojG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pp39oDG0Ed-kc8dEZsdm2w/method._PqBuojG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2005, 2007 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PplCsDG0Ed-kc8dEZsdm2w/method._PplCtzG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PplCsDG0Ed-kc8dEZsdm2w/method._PplCtzG0Ed-kc8dEZsdm2w.pt
index b98027e..d5cf19c 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PplCsDG0Ed-kc8dEZsdm2w/method._PplCtzG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PplCsDG0Ed-kc8dEZsdm2w/method._PplCtzG0Ed-kc8dEZsdm2w.pt
@@ -1,4 +1,4 @@
 <%
 GenModel genModel = parameter;
-targetPathName = genModel.getTestsProjectDirectory() + "/plugin.properties";
+targetPathName = genModel.getTestsProjectDirectory() + "/" + genModel.getTestsBundleLocalization()+ ".properties";
 %>
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PplCsDG0Ed-kc8dEZsdm2w/method._PplCuTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PplCsDG0Ed-kc8dEZsdm2w/method._PplCuTG0Ed-kc8dEZsdm2w.pt
index d4ad53c..9d89de6 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PplCsDG0Ed-kc8dEZsdm2w/method._PplCuTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PplCsDG0Ed-kc8dEZsdm2w/method._PplCuTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   IBM - Initial API and implementation
@@ -14,5 +14,5 @@
 <%GenModel genModel = (GenModel)argument;%>
 <%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern.base/egf/EMF_Pattern_Base.fcore#LogicalName=org.eclipse.egf.emf.pattern.base.HeaderProperties" args="parameter:argument"%>
 
-pluginName = <%=genModel.getModelName()%> Tests
-providerName = www.example.org
+pluginName = <%=genModel.getTestsBundleName()%>
+providerName = <%=genModel.getTestsBundleVendorName()%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pq6fcDG0Ed-kc8dEZsdm2w/method._Pq6feTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pq6fcDG0Ed-kc8dEZsdm2w/method._Pq6feTG0Ed-kc8dEZsdm2w.pt
index cd799f9..578a983 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pq6fcDG0Ed-kc8dEZsdm2w/method._Pq6feTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Pq6fcDG0Ed-kc8dEZsdm2w/method._Pq6feTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PqeakDG0Ed-kc8dEZsdm2w/method._PqeamTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PqeakDG0Ed-kc8dEZsdm2w/method._PqeamTG0Ed-kc8dEZsdm2w.pt
index c5ba1bf..b631d3d 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PqeakDG0Ed-kc8dEZsdm2w/method._PqeamTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PqeakDG0Ed-kc8dEZsdm2w/method._PqeamTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2005-2007 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PrOBcDG0Ed-kc8dEZsdm2w/method._PrOBeTG0Ed-kc8dEZsdm2w.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PrOBcDG0Ed-kc8dEZsdm2w/method._PrOBeTG0Ed-kc8dEZsdm2w.pt
index f7df907..9d1099c 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PrOBcDG0Ed-kc8dEZsdm2w/method._PrOBeTG0Ed-kc8dEZsdm2w.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._PrOBcDG0Ed-kc8dEZsdm2w/method._PrOBeTG0Ed-kc8dEZsdm2w.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   IBM - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QIGxoH7rEd-W9_ZFSEQEPg/method._QIGxrH7rEd-W9_ZFSEQEPg.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QIGxoH7rEd-W9_ZFSEQEPg/method._QIGxrH7rEd-W9_ZFSEQEPg.pt
index f4ef199..14684af 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QIGxoH7rEd-W9_ZFSEQEPg/method._QIGxrH7rEd-W9_ZFSEQEPg.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QIGxoH7rEd-W9_ZFSEQEPg/method._QIGxrH7rEd-W9_ZFSEQEPg.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2010 Ed Merks and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   Ed Merks - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QPtOcH7rEd-W9_ZFSEQEPg/method._QP2YZH7rEd-W9_ZFSEQEPg.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QPtOcH7rEd-W9_ZFSEQEPg/method._QP2YZH7rEd-W9_ZFSEQEPg.pt
index 6e7ffb0..ba08e7a 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QPtOcH7rEd-W9_ZFSEQEPg/method._QP2YZH7rEd-W9_ZFSEQEPg.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QPtOcH7rEd-W9_ZFSEQEPg/method._QP2YZH7rEd-W9_ZFSEQEPg.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2010 Ed Merks and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   Ed Merks - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QR8DEH7rEd-W9_ZFSEQEPg/method._QR8DHH7rEd-W9_ZFSEQEPg.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QR8DEH7rEd-W9_ZFSEQEPg/method._QR8DHH7rEd-W9_ZFSEQEPg.pt
index 2181900..c0a27e7 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QR8DEH7rEd-W9_ZFSEQEPg/method._QR8DHH7rEd-W9_ZFSEQEPg.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QR8DEH7rEd-W9_ZFSEQEPg/method._QR8DHH7rEd-W9_ZFSEQEPg.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2010 Ed Merks and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Ed Merks - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QRpIIH7rEd-W9_ZFSEQEPg/method._QRpILH7rEd-W9_ZFSEQEPg.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QRpIIH7rEd-W9_ZFSEQEPg/method._QRpILH7rEd-W9_ZFSEQEPg.pt
index cb1a7be..c79f59b 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QRpIIH7rEd-W9_ZFSEQEPg/method._QRpILH7rEd-W9_ZFSEQEPg.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._QRpIIH7rEd-W9_ZFSEQEPg/method._QRpILH7rEd-W9_ZFSEQEPg.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2010 Ed Merks and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Ed Merks - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WU7GoCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WU7GoCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..7bf6f2d
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WU7GoCSWEemxeP6B0lLOpA.pt
@@ -0,0 +1 @@
+<%@ jet package="PACKAGE" class="CLASS" imports="org.eclipse.egf.emf.pattern.base.* org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil org.eclipse.emf.codegen.ecore.genmodel.* org.eclipse.emf.codegen.ecore.genmodel.impl.* org.eclipse.emf.codegen.ecore.genmodel.generator.* org.eclipse.emf.codegen.util.* org.eclipse.emf.ecore.util.* org.eclipse.emf.common.util.* org.eclipse.egf.common.helper.* java.util.* org.eclipse.emf.ecore.* org.eclipse.egf.model.pattern.* org.eclipse.egf.pattern.execution.* org.eclipse.egf.pattern.query.*"  %>
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WVOBkCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WVOBkCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..d630053
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WVOBkCSWEemxeP6B0lLOpA.pt
@@ -0,0 +1 @@
+<%// add initialisation of the pattern variables (declaration has been already done).%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WVqtgCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WVqtgCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WVqtgCSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WWQjYCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WWQjYCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WWQjYCSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WZig4CSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WZig4CSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._WUeasCSWEemxeP6B0lLOpA/method._WZig4CSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZA4WkCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZA4WkCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..d630053
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZA4WkCSWEemxeP6B0lLOpA.pt
@@ -0,0 +1 @@
+<%// add initialisation of the pattern variables (declaration has been already done).%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZAcRsCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZAcRsCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..7bf6f2d
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZAcRsCSWEemxeP6B0lLOpA.pt
@@ -0,0 +1 @@
+<%@ jet package="PACKAGE" class="CLASS" imports="org.eclipse.egf.emf.pattern.base.* org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil org.eclipse.emf.codegen.ecore.genmodel.* org.eclipse.emf.codegen.ecore.genmodel.impl.* org.eclipse.emf.codegen.ecore.genmodel.generator.* org.eclipse.emf.codegen.util.* org.eclipse.emf.ecore.util.* org.eclipse.emf.common.util.* org.eclipse.egf.common.helper.* java.util.* org.eclipse.emf.ecore.* org.eclipse.egf.model.pattern.* org.eclipse.egf.pattern.execution.* org.eclipse.egf.pattern.query.*"  %>
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZB7fcCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZB7fcCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZB7fcCSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZBVCgCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZBVCgCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZBVCgCSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZFqI4CSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZFqI4CSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._Y__lwCSWEemxeP6B0lLOpA/method._ZFqI4CSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZG2bsCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZG2bsCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..d630053
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZG2bsCSWEemxeP6B0lLOpA.pt
@@ -0,0 +1 @@
+<%// add initialisation of the pattern variables (declaration has been already done).%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZGZvwCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZGZvwCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..7bf6f2d
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZGZvwCSWEemxeP6B0lLOpA.pt
@@ -0,0 +1 @@
+<%@ jet package="PACKAGE" class="CLASS" imports="org.eclipse.egf.emf.pattern.base.* org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil org.eclipse.emf.codegen.ecore.genmodel.* org.eclipse.emf.codegen.ecore.genmodel.impl.* org.eclipse.emf.codegen.ecore.genmodel.generator.* org.eclipse.emf.codegen.util.* org.eclipse.emf.ecore.util.* org.eclipse.emf.common.util.* org.eclipse.egf.common.helper.* java.util.* org.eclipse.emf.ecore.* org.eclipse.egf.model.pattern.* org.eclipse.egf.pattern.execution.* org.eclipse.egf.pattern.query.*"  %>
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZHSgkCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZHSgkCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZHSgkCSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZHvMgCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZHvMgCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZHvMgCSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZLd18CSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZLd18CSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._ZGGNwCSWEemxeP6B0lLOpA/method._ZLd18CSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__9b48BmtEeCMbfVQrOfmzQ/method.__9b4_BmtEeCMbfVQrOfmzQ.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__9b48BmtEeCMbfVQrOfmzQ/method.__9b4_BmtEeCMbfVQrOfmzQ.pt
index c1f89db..075ceca 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__9b48BmtEeCMbfVQrOfmzQ/method.__9b4_BmtEeCMbfVQrOfmzQ.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__9b48BmtEeCMbfVQrOfmzQ/method.__9b4_BmtEeCMbfVQrOfmzQ.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 20010 Ed Merks and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *
  * Contributors:
  *   Ed Merks - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__H8bZBmtEeCMbfVQrOfmzQ/method.__H8bcBmtEeCMbfVQrOfmzQ.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__H8bZBmtEeCMbfVQrOfmzQ/method.__H8bcBmtEeCMbfVQrOfmzQ.pt
index 30a5cd5..281a0827 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__H8bZBmtEeCMbfVQrOfmzQ/method.__H8bcBmtEeCMbfVQrOfmzQ.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__H8bZBmtEeCMbfVQrOfmzQ/method.__H8bcBmtEeCMbfVQrOfmzQ.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2010 Ed Merks and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   Ed Merks - Initial API and implementation
@@ -17,4 +17,5 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 	<application><%=genModel.getModelName().toLowerCase().replaceAll("\\s", "-")%>-editor</application>
 	<version>1</version>
+	<threadsafe>true</threadsafe>
 </appengine-web-app>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__I1zQBmtEeCMbfVQrOfmzQ/method.__I1zTBmtEeCMbfVQrOfmzQ.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__I1zQBmtEeCMbfVQrOfmzQ/method.__I1zTBmtEeCMbfVQrOfmzQ.pt
index 2f0e361..14ade3c 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__I1zQBmtEeCMbfVQrOfmzQ/method.__I1zTBmtEeCMbfVQrOfmzQ.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__I1zQBmtEeCMbfVQrOfmzQ/method.__I1zTBmtEeCMbfVQrOfmzQ.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2010 Ed Merks and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   Ed Merks - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__KLQABmtEeCMbfVQrOfmzQ/method.__KLQDBmtEeCMbfVQrOfmzQ.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__KLQABmtEeCMbfVQrOfmzQ/method.__KLQDBmtEeCMbfVQrOfmzQ.pt
index e8148eb..8bd4afe 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__KLQABmtEeCMbfVQrOfmzQ/method.__KLQDBmtEeCMbfVQrOfmzQ.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__KLQABmtEeCMbfVQrOfmzQ/method.__KLQDBmtEeCMbfVQrOfmzQ.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2010 Ed Merks and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   Ed Merks - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__gO_kBmtEeCMbfVQrOfmzQ/method.__gO_nBmtEeCMbfVQrOfmzQ.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__gO_kBmtEeCMbfVQrOfmzQ/method.__gO_nBmtEeCMbfVQrOfmzQ.pt
index f4aee72..2fea7fb 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__gO_kBmtEeCMbfVQrOfmzQ/method.__gO_nBmtEeCMbfVQrOfmzQ.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern.__gO_kBmtEeCMbfVQrOfmzQ/method.__gO_nBmtEeCMbfVQrOfmzQ.pt
@@ -3,9 +3,9 @@
 /**
  * Copyright (c) 2010 Ed Merks and others.
  * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  * 
  * Contributors: 
  *   Ed Merks - Initial API and implementation
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cA-DcCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cA-DcCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..d630053
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cA-DcCSWEemxeP6B0lLOpA.pt
@@ -0,0 +1 @@
+<%// add initialisation of the pattern variables (declaration has been already done).%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cAhXgCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cAhXgCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..7bf6f2d
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cAhXgCSWEemxeP6B0lLOpA.pt
@@ -0,0 +1 @@
+<%@ jet package="PACKAGE" class="CLASS" imports="org.eclipse.egf.emf.pattern.base.* org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil org.eclipse.emf.codegen.ecore.genmodel.* org.eclipse.emf.codegen.ecore.genmodel.impl.* org.eclipse.emf.codegen.ecore.genmodel.generator.* org.eclipse.emf.codegen.util.* org.eclipse.emf.ecore.util.* org.eclipse.emf.common.util.* org.eclipse.egf.common.helper.* java.util.* org.eclipse.emf.ecore.* org.eclipse.egf.model.pattern.* org.eclipse.egf.pattern.execution.* org.eclipse.egf.pattern.query.*"  %>
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cB3bUCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cB3bUCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cB3bUCSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cBQ-YCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cBQ-YCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cBQ-YCSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cFSiwCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cFSiwCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._cAErkCSWEemxeP6B0lLOpA/method._cFSiwCSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eT5vYCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eT5vYCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..7bf6f2d
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eT5vYCSWEemxeP6B0lLOpA.pt
@@ -0,0 +1 @@
+<%@ jet package="PACKAGE" class="CLASS" imports="org.eclipse.egf.emf.pattern.base.* org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil org.eclipse.emf.codegen.ecore.genmodel.* org.eclipse.emf.codegen.ecore.genmodel.impl.* org.eclipse.emf.codegen.ecore.genmodel.generator.* org.eclipse.emf.codegen.util.* org.eclipse.emf.ecore.util.* org.eclipse.emf.common.util.* org.eclipse.egf.common.helper.* java.util.* org.eclipse.emf.ecore.* org.eclipse.egf.model.pattern.* org.eclipse.egf.pattern.execution.* org.eclipse.egf.pattern.query.*"  %>
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eUMqUCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eUMqUCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..d630053
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eUMqUCSWEemxeP6B0lLOpA.pt
@@ -0,0 +1 @@
+<%// add initialisation of the pattern variables (declaration has been already done).%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eUpWQCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eUpWQCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eUpWQCSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eVPMICSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eVPMICSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eVPMICSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eY91kCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eY91kCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eTdDcCSWEemxeP6B0lLOpA/method._eY91kCSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._eZ3NcCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._eZ3NcCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..7bf6f2d
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._eZ3NcCSWEemxeP6B0lLOpA.pt
@@ -0,0 +1 @@
+<%@ jet package="PACKAGE" class="CLASS" imports="org.eclipse.egf.emf.pattern.base.* org.eclipse.emf.codegen.ecore.genmodel.util.GenModelUtil org.eclipse.emf.codegen.ecore.genmodel.* org.eclipse.emf.codegen.ecore.genmodel.impl.* org.eclipse.emf.codegen.ecore.genmodel.generator.* org.eclipse.emf.codegen.util.* org.eclipse.emf.ecore.util.* org.eclipse.emf.common.util.* org.eclipse.egf.common.helper.* java.util.* org.eclipse.emf.ecore.* org.eclipse.egf.model.pattern.* org.eclipse.egf.pattern.execution.* org.eclipse.egf.pattern.query.*"  %>
\ No newline at end of file
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._eaTSUCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._eaTSUCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..d630053
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._eaTSUCSWEemxeP6B0lLOpA.pt
@@ -0,0 +1 @@
+<%// add initialisation of the pattern variables (declaration has been already done).%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._eam0UCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._eam0UCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._eam0UCSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._ebMqMCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._ebMqMCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._ebMqMCSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._efOOkCSWEemxeP6B0lLOpA.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._efOOkCSWEemxeP6B0lLOpA.pt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._eZahgCSWEemxeP6B0lLOpA/method._efOOkCSWEemxeP6B0lLOpA.pt
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._odzp0LM-EeKd56X4hcZPSw/method._odzp6LM-EeKd56X4hcZPSw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._odzp0LM-EeKd56X4hcZPSw/method._odzp6LM-EeKd56X4hcZPSw.pt
index 892c098..42e6ba8 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._odzp0LM-EeKd56X4hcZPSw/method._odzp6LM-EeKd56X4hcZPSw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._odzp0LM-EeKd56X4hcZPSw/method._odzp6LM-EeKd56X4hcZPSw.pt
@@ -17,7 +17,7 @@
     <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
 	@Deprecated
     <%}%>
-    <%if (classExtendsAllGenFeatures.contains(genFeature)) {%>
+    <%if (useInterfaceOverrideAnnotation || classExtendsAllGenFeatures.contains(genFeature)) {%>
 	@Override
     <%}%>
 	public <%=arrayElementType%>[] <%=genFeature.getGetArrayAccessor()%>()
@@ -45,7 +45,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/getGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
   <%if (genFeature.isListType() && genModel.isVirtualDelegation()) {%>
 	@SuppressWarnings("unchecked")
@@ -53,12 +53,12 @@
     <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
 	@Deprecated
     <%}%>
-    <%if (classExtendsAllGenFeatures.contains(genFeature)) {%>
+    <%if (useInterfaceOverrideAnnotation || classExtendsAllGenFeatures.contains(genFeature)) {%>
 	@Override
     <%}%>
 	public <%=genFeature.getImportedType(genClass)%> <%=genFeature.getGetAccessor()%><%if (genClass.hasCollidingGetAccessorOperation(genFeature)) {%>_<%}%>()
 	{
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
         <%if (genModel.isVirtualDelegation()) {%>
 		<%=genFeature.getImportedType(genClass)%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType(genClass)%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>);
         <%}%>
@@ -85,7 +85,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/basicSetGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
     <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
 	@Deprecated
@@ -110,7 +110,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/setGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Class.Class.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
 <%{ GenOperation setAccessorOperation = genClass.getSetAccessorOperation(genFeature);%>
     <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
diff --git a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._onysQLM-EeKd56X4hcZPSw/method._onysWLM-EeKd56X4hcZPSw.pt b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._onysQLM-EeKd56X4hcZPSw/method._onysWLM-EeKd56X4hcZPSw.pt
index d39a1e5..2eb9646 100644
--- a/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._onysQLM-EeKd56X4hcZPSw/method._onysWLM-EeKd56X4hcZPSw.pt
+++ b/platform_specific/2019-03/org.eclipse.egf.emf.pattern/templates/pattern._onysQLM-EeKd56X4hcZPSw/method._onysWLM-EeKd56X4hcZPSw.pt
@@ -17,7 +17,7 @@
     <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
 	@Deprecated
     <%}%>
-    <%if (classExtendsAllGenFeatures.contains(genFeature)) {%>
+    <%if (useInterfaceOverrideAnnotation || classExtendsAllGenFeatures.contains(genFeature)) {%>
 	@Override
     <%}%>
 	public <%=arrayElementType%>[] <%=genFeature.getGetArrayAccessor()%>()
@@ -45,7 +45,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/getGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
   <%if (genFeature.isListType() && genModel.isVirtualDelegation()) {%>
 	@SuppressWarnings("unchecked")
@@ -53,12 +53,12 @@
     <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
 	@Deprecated
     <%}%>
-    <%if (classExtendsAllGenFeatures.contains(genFeature)) {%>
+    <%if (useInterfaceOverrideAnnotation || classExtendsAllGenFeatures.contains(genFeature)) {%>
 	@Override
     <%}%>
 	public <%=genFeature.getImportedType(genClass)%> <%=genFeature.getGetAccessor()%><%if (genClass.hasCollidingGetAccessorOperation(genFeature)) {%>_<%}%>()
 	{
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.getGenFeature.pre.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
         <%if (genModel.isVirtualDelegation()) {%>
 		<%=genFeature.getImportedType(genClass)%> <%=genFeature.getSafeName()%> = (<%=genFeature.getImportedType(genClass)%>)eVirtualGet(<%=genClass.getQualifiedFeatureID(genFeature)%><%=positiveOffsetCorrection%>);
         <%}%>
@@ -85,7 +85,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/basicSetGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.basicSetGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
     <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
 	@Deprecated
@@ -110,7 +110,7 @@
 	 * @generated
 	 */
 <%if (isJDK50) { //Class/setGenFeature.annotations.insert.javajetinc%>
-<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
+<%@ egf:patternCall patternId="platform:/plugin/org.eclipse.egf.emf.pattern/egf/EMF_Pattern.fcore#LogicalName=org.eclipse.egf.emf.pattern.model.call.Interface.Interface.setGenFeature.annotations.insert" args="genFeature:genFeature,genClass:genClass,genPackage:genPackage,genModel:genModel,isJDK50:isJDK50,isInterface:isInterface,isImplementation:isImplementation,useInterfaceOverrideAnnotation:useInterfaceOverrideAnnotation,isGWT:isGWT,publicStaticFinalFlag:publicStaticFinalFlag,singleWildcard:singleWildcard,negativeOffsetCorrection:negativeOffsetCorrection,positiveOffsetCorrection:positiveOffsetCorrection,negativeOperationOffsetCorrection:negativeOperationOffsetCorrection,positiveOperationOffsetCorrection:positiveOperationOffsetCorrection"%>
 <%}%>
 <%{ GenOperation setAccessorOperation = genClass.getSetAccessorOperation(genFeature);%>
     <%if (isJDK50 && genFeature.hasAPIDeprecatedTag()) {%>
diff --git a/releng/org.eclipse.egf.targets/core-2019-03.target b/releng/org.eclipse.egf.targets/core-2019-03.target
index de4995b..c846033 100644
--- a/releng/org.eclipse.egf.targets/core-2019-03.target
+++ b/releng/org.eclipse.egf.targets/core-2019-03.target
@@ -4,7 +4,6 @@
 <target name="core" sequenceNumber="1548145364">

   <locations>

     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

-      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>

@@ -18,11 +17,15 @@
       <unit id="org.eclipse.emf.codegen.ecore.ui.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.emf.databinding.edit.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.emf.converter.feature.group" version="0.0.0"/>

+      <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201901300518/"/>

+    </location>

+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">

       <unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.emf.transaction.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.emf.query.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.emf.validation.feature.group" version="0.0.0"/>

-      <unit id="org.eclipse.emf.converter.feature.group" version="0.0.0"/>

+      <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>

       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>

diff --git a/releng/org.eclipse.egf.targets/core-2019-03.targetplatform b/releng/org.eclipse.egf.targets/core-2019-03.targetplatform
index 2181287..ca4d3d9 100644
--- a/releng/org.eclipse.egf.targets/core-2019-03.targetplatform
+++ b/releng/org.eclipse.egf.targets/core-2019-03.targetplatform
@@ -1,7 +1,7 @@
 target "core"  with source, requirements

 

-location eclipse "https://download.eclipse.org/releases/2019-03/" {

-	org.eclipse.sdk.feature.group lazy

+

+location emf "https://download.eclipse.org/modeling/emf/emf/builds/milestone/S201901300518/" {

 	org.eclipse.emf.sdk.feature.group lazy

 	org.eclipse.emf.common.feature.group lazy

 	org.eclipse.emf.edit.feature.group lazy

@@ -15,17 +15,20 @@
 	org.eclipse.emf.codegen.ecore.ui.feature.group lazy

 	org.eclipse.emf.databinding.feature.group lazy

 	org.eclipse.emf.databinding.edit.feature.group lazy

+	org.eclipse.emf.converter.feature.group lazy

+}

+

+location eclipse "http://download.eclipse.org/releases/2018-12/" {	

 	org.eclipse.emf.workspace.feature.group lazy

 	org.eclipse.emf.transaction.feature.group lazy

 	org.eclipse.emf.query.feature.group lazy

 	org.eclipse.emf.validation.feature.group lazy

-	org.eclipse.emf.converter.feature.group lazy

+	org.eclipse.sdk.feature.group lazy

 	org.eclipse.jdt.feature.group lazy

 	org.eclipse.pde.feature.group lazy

 	org.eclipse.platform.feature.group lazy

 	org.eclipse.m2m.atl.feature.group lazy

 	org.eclipse.uml2.uml.feature.group lazy

-	

 	org.eclipse.equinox.executable.feature.group lazy

 }