Revert "Revert "Bug 538299 - Update EMF models to EPL 2.0""
This reverts commit c4779025919bf4c7969fcc34cf9c86de94594eeb.
Change-Id: Ia10ce1d36bcc1d112b31fc081888769a21c79ce7
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/model/ModelFragment.ecore b/bundles/org.eclipse.e4.ui.model.workbench/model/ModelFragment.ecore
index 0f300bb..11c768d 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/model/ModelFragment.ecore
+++ b/bundles/org.eclipse.e4.ui.model.workbench/model/ModelFragment.ecore
@@ -7,8 +7,7 @@
<details key="documentation" value="<p>
<strong>Developers</strong>:
Add more detailed documentation by editing this comment in 
/org.eclipse.e4.ui.model.workbench/model/ModelFragment.ecore. 
There is a GenModel/documentation node under each type and attribute.
</p>
@since 1.0"/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"
- eType="ecore:EClass platform:/plugin/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ApplicationElement"
- containment="true">
+ eType="ecore:EClass UIElements.ecore#//ApplicationElement" containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="<p>
<strong>Developers</strong>:
Add more detailed documentation by editing this comment in 
/org.eclipse.e4.ui.model.workbench/model/ModelFragment.ecore. 
There is a GenModel/documentation node under each type and attribute.
</p>"/>
</eAnnotations>
@@ -24,15 +23,14 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="<p>
<strong>Developers</strong>:
Add more detailed documentation by editing this comment in 
/org.eclipse.e4.ui.model.workbench/model/ModelFragment.ecore. 
There is a GenModel/documentation node under each type and attribute.
</p>
@since 1.0"/>
</eAnnotations>
- <eOperations name="merge" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ApplicationElement">
+ <eOperations name="merge" upperBound="-1" eType="ecore:EClass UIElements.ecore#//ApplicationElement">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="<p>
<strong>Developers</strong>:
Add more detailed documentation by editing this comment in 
/org.eclipse.e4.ui.model.workbench/model/ModelFragment.ecore. 
There is a GenModel/documentation node under each type and attribute.
</p>"/>
</eAnnotations>
- <eParameters name="application" eType="ecore:EClass platform:/plugin/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//Application"/>
+ <eParameters name="application" eType="ecore:EClass UIElements.ecore#//Application"/>
</eOperations>
<eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"
- eType="ecore:EClass platform:/plugin/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ApplicationElement"
- containment="true">
+ eType="ecore:EClass UIElements.ecore#//ApplicationElement" containment="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="<p>
<strong>Developers</strong>:
Add more detailed documentation by editing this comment in 
/org.eclipse.e4.ui.model.workbench/model/ModelFragment.ecore. 
There is a GenModel/documentation node under each type and attribute.
</p>"/>
</eAnnotations>
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/model/ModelFragment.genmodel b/bundles/org.eclipse.e4.ui.model.workbench/model/ModelFragment.genmodel
index a412fd8..dfaa5d6 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/model/ModelFragment.genmodel
+++ b/bundles/org.eclipse.e4.ui.model.workbench/model/ModelFragment.genmodel
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2013 BestSolution.at and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html

Contributors:
 Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
 IBM Corporation - initial API and implementation"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 BestSolution.at and others.

 This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
https://www.eclipse.org/legal/epl-2.0/
SPDX-License-Identifier: EPL-2.0

Contributors:
 Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
 IBM Corporation - initial API and implementation"
modelDirectory="/org.eclipse.e4.ui.model.workbench/src" modelPluginID="org.eclipse.e4.ui.model.workbench"
modelName="ModelFragment" nonNLSMarkers="true" rootExtendsInterface="" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container"
suppressEMFTypes="true" suppressEMFMetaData="true" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.e4.ui.model.workbench/model/UIElements.genmodel#//application"
+ complianceLevel="5.0" copyrightFields="false" usedGenPackages="UIElements.genmodel#//application"
interfaceNamePattern="M{0}" importOrganizing="true">
<foreignModel>ModelFragment.ecore</foreignModel>
<genPackages prefix="Fragment" basePackage="org.eclipse.e4.ui.model" disposableProviderFactory="true"
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.genmodel b/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.genmodel
index ab796d7..a71fa99 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.genmodel
+++ b/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.genmodel
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2008, 2016 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html

Contributors:
 IBM Corporation - initial API and implementation
 vogella GmbH - ongoing maintenance"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 IBM Corporation and others.

 This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
https://www.eclipse.org/legal/epl-2.0/
SPDX-License-Identifier: EPL-2.0

Contributors:
 IBM Corporation - initial API and implementation
 vogella GmbH - ongoing maintenance"
modelDirectory="/org.eclipse.e4.ui.model.workbench/src" modelPluginID="org.eclipse.e4.ui.model.workbench"
templateDirectory="" modelName="UIElements" updateClasspath="false" nonNLSMarkers="true"
rootExtendsInterface="" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container"
