From 1c553d72d7b0e34404e9610197a50864811d694d Mon Sep 17 00:00:00 2001 From: Florian Hoelzl <hoelzl@fortiss.org> Date: Sat, 30 Jun 2012 10:22:24 +0000 Subject: [PATCH] undid Juno ecore changed refs 674 --- org.fortiss.tooling.base/trunk/model/base.ecore | 6 ++++-- org.fortiss.tooling.base/trunk/model/base.genmodel | 10 ++++++---- org.fortiss.tooling.kernel/trunk/model/kernel.ecore | 6 ++++-- .../trunk/model/kernel.genmodel | 12 +++++++----- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/org.fortiss.tooling.base/trunk/model/base.ecore b/org.fortiss.tooling.base/trunk/model/base.ecore index fc87f3748..c7a15f016 100644 --- a/org.fortiss.tooling.base/trunk/model/base.ecore +++ b/org.fortiss.tooling.base/trunk/model/base.ecore @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://www.fortiss.org/tooling/base/model" nsPrefix="org-fortiss-tooling-base-model"> +<ecore:EPackage xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" + nsURI="http://www.fortiss.org/tooling/base/model" nsPrefix="org-fortiss-tooling-base-model"> <eSubpackages name="element" nsURI="http://www.fortiss.org/tooling/base/model/element" nsPrefix="org-fortiss-tooling-base-model-element"> <eClassifiers xsi:type="ecore:EClass" name="IModelElement"> diff --git a/org.fortiss.tooling.base/trunk/model/base.genmodel b/org.fortiss.tooling.base/trunk/model/base.genmodel index 53d3eea65..c4edb8b0e 100644 --- a/org.fortiss.tooling.base/trunk/model/base.genmodel +++ b/org.fortiss.tooling.base/trunk/model/base.genmodel @@ -1,8 +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" modelDirectory="/org.fortiss.tooling.base/generated-src" modelPluginID="org.fortiss.tooling.base" - modelName="Base" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true" - arrayAccessors="true" complianceLevel="6.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.genmodel#//model"> +<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" modelDirectory="/org.fortiss.tooling.base/generated-src" + modelPluginID="org.fortiss.tooling.base" modelName="Base" importerID="org.eclipse.emf.importer.ecore" + containmentProxies="true" arrayAccessors="true" complianceLevel="6.0" copyrightFields="false" + usedGenPackages="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.genmodel#//model"> <foreignModel>base.ecore</foreignModel> <genPackages prefix="Base" basePackage="org.fortiss.tooling.base" disposableProviderFactory="true" ecorePackage="base.ecore#/"> diff --git a/org.fortiss.tooling.kernel/trunk/model/kernel.ecore b/org.fortiss.tooling.kernel/trunk/model/kernel.ecore index c82943dad..a84e422af 100644 --- a/org.fortiss.tooling.kernel/trunk/model/kernel.ecore +++ b/org.fortiss.tooling.kernel/trunk/model/kernel.ecore @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://www.fortiss.org/tooling/kernel" nsPrefix="org-fortiss-tooling-kernel"> +<ecore:EPackage xmi:version="2.0" + xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" + nsURI="http://www.fortiss.org/tooling/kernel" nsPrefix="org-fortiss-tooling-kernel"> <eClassifiers xsi:type="ecore:EClass" name="INamedElement" abstract="true" interface="true" eSuperTypes="#//IIdLabeled"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> diff --git a/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel b/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel index 2418eba35..2d1c3b6c7 100644 --- a/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel +++ b/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel @@ -1,9 +1,11 @@ <?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="(c) 2011 ForTISS GmbH" modelDirectory="/org.fortiss.tooling.kernel/generated-src" - editDirectory="org.fortiss.tooling.kernel.edit/src" editorDirectory="/org.fortiss.tooling.kernel.editor/src" - modelPluginID="org.fortiss.tooling.kernel" modelName="Model" modelPluginClass="" - editPluginClass="org.fortiss.tooling.kernel.model.provider.ModelEditPlugin" editorPluginClass="org.fortiss.tooling.kernel.model.presentation.ModelEditorPlugin" +<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="(c) 2011 ForTISS GmbH" + modelDirectory="/org.fortiss.tooling.kernel/generated-src" editDirectory="org.fortiss.tooling.kernel.edit/src" + editorDirectory="/org.fortiss.tooling.kernel.editor/src" modelPluginID="org.fortiss.tooling.kernel" + modelName="Model" modelPluginClass="" editPluginClass="org.fortiss.tooling.kernel.model.provider.ModelEditPlugin" + editorPluginClass="org.fortiss.tooling.kernel.model.presentation.ModelEditorPlugin" testsDirectory="/org.fortiss.tooling.kernel.tests/test-src" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true" arrayAccessors="true" complianceLevel="5.0" copyrightFields="false"> <foreignModel>kernel.ecore</foreignModel> -- GitLab