From d87ed2f8ca583b501fc9609a885634fbbf7902db Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Wed, 23 Feb 2011 09:47:52 +0000
Subject: [PATCH] removed sub-classing of unicase.metamodel
---
org.fortiss.tooling.base/trunk/build.properties | 4 ++--
org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF | 1 -
org.fortiss.tooling.kernel/trunk/model/kernel.ecore | 6 +++---
org.fortiss.tooling.kernel/trunk/model/kernel.genmodel | 7 +++----
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/org.fortiss.tooling.base/trunk/build.properties b/org.fortiss.tooling.base/trunk/build.properties
index 79662f1b9..10df9f605 100644
--- a/org.fortiss.tooling.base/trunk/build.properties
+++ b/org.fortiss.tooling.base/trunk/build.properties
@@ -10,5 +10,5 @@ bin.includes = .,\
plugin.xml,\
plugin.properties
jars.compile.order = .
-source.. = generated-src/
-output.. = bin/
+source.. = generated-src/, src/
+output.. = build/
diff --git a/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF b/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF
index df3627d23..5bfccf320 100644
--- a/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.kernel/trunk/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Bundle-Vendor: fortiss
Require-Bundle: org.eclipse.ui;visibility:=reexport,
org.eclipse.core.runtime;visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="2.6.1";visibility:=reexport,
- org.unicase.metamodel;bundle-version="0.0.1";visibility:=reexport,
org.conqat.ide.commons;bundle-version="2.7.0";visibility:=reexport,
org.conqat.ide.commons.ui;bundle-version="2.7.0";visibility:=reexport,
org.unicase.workspace;bundle-version="1.0.0",
diff --git a/org.fortiss.tooling.kernel/trunk/model/kernel.ecore b/org.fortiss.tooling.kernel/trunk/model/kernel.ecore
index 4893393b4..ac5a93211 100644
--- a/org.fortiss.tooling.kernel/trunk/model/kernel.ecore
+++ b/org.fortiss.tooling.kernel/trunk/model/kernel.ecore
@@ -4,7 +4,7 @@
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="platform:/plugin/org.unicase.metamodel/model/metamodel.ecore#//ModelElementId">
+ eSuperTypes="#//IIdLabeled">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="INamedCommentedElement" abstract="true"
@@ -17,7 +17,7 @@
<details key="documentation" value="IProjectRootElement is the super class of all root elements contained in emfStore projects."/>
</eAnnotations>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Deppal" eSuperTypes="platform:/plugin/org.unicase.metamodel/model/metamodel.ecore#//ModelElementId">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="test" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eClassifiers xsi:type="ecore:EClass" name="IIdLabeled" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel b/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel
index c24c46fb6..0404bf71f 100644
--- a/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel
+++ b/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel
@@ -7,8 +7,7 @@
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"
- usedGenPackages="platform:/plugin/org.unicase.metamodel/model/metamodel.genmodel#//metamodel">
+ containmentProxies="true" arrayAccessors="true" complianceLevel="5.0" copyrightFields="false">
<foreignModel>kernel.ecore</foreignModel>
<genPackages prefix="FortissToolingKernel" basePackage="org.fortiss.tooling.kernel"
disposableProviderFactory="true" ecorePackage="kernel.ecore#/">
@@ -19,8 +18,8 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//INamedCommentedElement/comment"/>
</genClasses>
<genClasses image="false" ecoreClass="kernel.ecore#//IProjectRootElement"/>
- <genClasses ecoreClass="kernel.ecore#//Deppal">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//Deppal/test"/>
+ <genClasses image="false" ecoreClass="kernel.ecore#//IIdLabeled">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//IIdLabeled/id"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
--
GitLab