refactored base.ecore: added hidden specification and annotated specification

org.fortiss.tooling.base/trunk/model/base.ecore

@@ -3,61 +3,46 @@
     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" nsPrefix="org-fortiss-tooling-base">
+  <eClassifiers xsi:type="ecore:EClass" name="IModelElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="specifications" upperBound="-1"
+        eType="#//IModelElementSpecification" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedBy" upperBound="-1"
+        eType="#//IModelElementReference" eOpposite="#//IModelElementReference/reference"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IModelElementSpecification" abstract="true"
+      interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="IModelElementReference" abstract="true"
+      interface="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="#//IModelElement"
+        eOpposite="#//IModelElement/referencedBy"/>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElement" abstract="true"
-      interface="true" eSuperTypes="#//IHierarchicElementContainer">
+      interface="true" eSuperTypes="#//IHierarchicElementContainer #//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="connections" upperBound="-1"
         eType="#//IConnection" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="connectors" upperBound="-1"
         eType="#//IConnector" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="specifications" upperBound="-1"
-        eType="#//IHierarchicElementSpecification" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedBy" upperBound="-1"
-        eType="#//IHierarchicElementReference" eOpposite="#//IHierarchicElementReference/reference"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElementContainer" abstract="true"
       interface="true">
     <eStructuralFeatures xsi:type="ecore:EReference" name="containedElements" upperBound="-1"
         eType="#//IHierarchicElement" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElementReference" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="#//IHierarchicElement"
-        eOpposite="#//IHierarchicElement/referencedBy"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IHierarchicElementSpecification" abstract="true"
-      interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IConnector" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="specifications" upperBound="-1"
-        eType="#//IConnectorSpecification" containment="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="IConnector" abstract="true" interface="true"
+      eSuperTypes="#//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="incoming" upperBound="-1"
         eType="#//IConnection" eOpposite="#//IConnection/target"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="outgoing" upperBound="-1"
         eType="#//IConnection" eOpposite="#//IConnection/source"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedBy" upperBound="-1"
-        eType="#//IConnectorReference" eOpposite="#//IConnectorReference/reference"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IConnectorSpecification" abstract="true"
-      interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IConnectorReference" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="#//IConnector"
-        eOpposite="#//IConnector/referencedBy"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IConnection" abstract="true" interface="true">
+  <eClassifiers xsi:type="ecore:EClass" name="IConnection" abstract="true" interface="true"
+      eSuperTypes="#//IModelElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//IConnector"
         eOpposite="#//IConnector/outgoing"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//IConnector"
         eOpposite="#//IConnector/incoming"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedBy" upperBound="-1"
-        eType="#//IConnectionReference" eOpposite="#//IConnectionReference/reference"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="specifications" upperBound="-1"
-        eType="#//IConnectionSpecification" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IConnectionReference" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" upperBound="-1"
-        eType="#//IConnection" eOpposite="#//IConnection/referencedBy"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IConnectionSpecification" abstract="true"
-      interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="IHiddenSpecification" abstract="true"
+      interface="true" eSuperTypes="#//IModelElementSpecification"/>
+  <eClassifiers xsi:type="ecore:EClass" name="IAnnotatedSpecification" eSuperTypes="#//IHiddenSpecification"/>
 </ecore:EPackage>

org.fortiss.tooling.base/trunk/plugin.xml

@@ -17,7 +17,7 @@
             genModel="model/base.genmodel"/>
    </extension>
    <extension
-         point="org.unicase.ecp.model.ecpModelPackage">
+         point="org.eclipse.emf.ecp.model.ecppackage">
       <modelPackage
             modelPackage="http://www.fortiss.org/tooling/base">
       </modelPackage>