From 134075dc27955fbf905d3719fb5d66eaed4ad5fd Mon Sep 17 00:00:00 2001 From: Dongyue Mou <mou@fortiss.org> Date: Thu, 26 Apr 2012 08:08:28 +0000 Subject: [PATCH] replaced platform://plugin with ../.. in all relevant ecore model to avoid name conflict removed dummy component from testing model cleaned directory --- org.fortiss.tooling.base/trunk/model/base.ecore | 6 +++--- org.fortiss.tooling.base/trunk/model/base.genmodel | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.fortiss.tooling.base/trunk/model/base.ecore b/org.fortiss.tooling.base/trunk/model/base.ecore index c7a15f016..000c0a097 100644 --- a/org.fortiss.tooling.base/trunk/model/base.ecore +++ b/org.fortiss.tooling.base/trunk/model/base.ecore @@ -261,8 +261,8 @@ <eSubpackages name="base" nsURI="http://www.fortiss.org/tooling/base/model/base" nsPrefix="org-fortiss-tooling-base-model-base"> <eClassifiers xsi:type="ecore:EClass" name="HierarchicElementBase" abstract="true" - eSuperTypes="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement #//element/IHierarchicElement #//layout/ILayoutedModelElement"/> - <eClassifiers xsi:type="ecore:EClass" name="ConnectorBase" abstract="true" eSuperTypes="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement #//element/IConnector #//layout/ILayoutedModelElement"/> + eSuperTypes="../../org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement #//element/IHierarchicElement #//layout/ILayoutedModelElement"/> + <eClassifiers xsi:type="ecore:EClass" name="ConnectorBase" abstract="true" eSuperTypes="../../org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement #//element/IConnector #//layout/ILayoutedModelElement"/> <eClassifiers xsi:type="ecore:EClass" name="EntryConnectorBase" abstract="true" eSuperTypes="#//base/ConnectorBase"/> <eClassifiers xsi:type="ecore:EClass" name="ExitConnectorBase" abstract="true" @@ -270,6 +270,6 @@ <eClassifiers xsi:type="ecore:EClass" name="LocalConnectorBase" abstract="true" eSuperTypes="#//base/ConnectorBase"/> <eClassifiers xsi:type="ecore:EClass" name="ConnectionSegmentBase" abstract="true" - eSuperTypes="platform:/plugin/org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement #//element/IConnection #//layout/ILayoutedModelElement"/> + eSuperTypes="../../org.fortiss.tooling.kernel/model/kernel.ecore#//INamedCommentedElement #//element/IConnection #//layout/ILayoutedModelElement"/> </eSubpackages> </ecore:EPackage> diff --git a/org.fortiss.tooling.base/trunk/model/base.genmodel b/org.fortiss.tooling.base/trunk/model/base.genmodel index c4edb8b0e..88030026a 100644 --- a/org.fortiss.tooling.base/trunk/model/base.genmodel +++ b/org.fortiss.tooling.base/trunk/model/base.genmodel @@ -4,7 +4,7 @@ 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"> + usedGenPackages="../../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#/"> -- GitLab