fix typo and set entity as supertype

DataFlowAnalysis · Jan 15, 2024 · b56035f · b56035f
1 parent c976c28
commit b56035f
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 14 deletions.
diff --git a/bundles/org.dataflowanalysis.pcm.extension.nodecharacteristics.edit/META-INF/MANIFEST.MF b/bundles/org.dataflowanalysis.pcm.extension.nodecharacteristics.edit/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.dataflowanalysis.pcm.extension.nodecharacteristics.nodecharacteristics.provider.NodeCharacteristicsEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.dataflowanalysis.pcm.extension.nodecharacteristics.nodecharacteristics.provider
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.cdo.edit;visibility:=reexport,

diff --git a/...cteristics.edit/icons/full/ctool16/CreateAssignments_assignee_UsageAssignee.gif b/...cteristics.edit/icons/full/ctool16/CreateAssignments_assignee_UsageAssignee.gif
diff --git a/...lysis.pcm.extension.nodecharacteristics.edit/icons/full/obj16/UsageAssignee.gif b/...lysis.pcm.extension.nodecharacteristics.edit/icons/full/obj16/UsageAssignee.gif
diff --git a/bundles/org.dataflowanalysis.pcm.extension.nodecharacteristics.edit/plugin.properties b/bundles/org.dataflowanalysis.pcm.extension.nodecharacteristics.edit/plugin.properties
@@ -28,3 +28,5 @@ _UI_AbstractAssignee_characteristics_feature = Characteristics
 _UI_Assignments_assignee_feature = Assignee
 _UI_Unknown_feature = Unspecified
 
+_UI_UsageAssignee_type = Usage Assignee
+_UI_UsageAssignee_usagescenario_feature = Usagescenario
diff --git a/bundles/org.dataflowanalysis.pcm.extension.nodecharacteristics.edit/plugin.xml b/bundles/org.dataflowanalysis.pcm.extension.nodecharacteristics.edit/plugin.xml
@@ -9,7 +9,7 @@
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <!-- @generated nodeCharacteristics -->
       <factory
-            uri="http://www.example.org/nodeCharacteristics"
+            uri="http://dataflowanalysis.org/pcm/extension/nodecharacteristics/0.1.0"
             class="org.dataflowanalysis.pcm.extension.nodecharacteristics.nodecharacteristics.provider.NodeCharacteristicsItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

diff --git a/bundles/org.dataflowanalysis.pcm.extension.nodecharacteristics.editor/META-INF/MANIFEST.MF b/bundles/org.dataflowanalysis.pcm.extension.nodecharacteristics.editor/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.dataflowanalysis.pcm.extension.nodecharacteristics.nodecharacteristics.presentation.NodeCharacteristicsEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.dataflowanalysis.pcm.extension.nodecharacteristics.nodecharacteristics.presentation
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;visibility:=reexport,

diff --git a/bundles/org.dataflowanalysis.pcm.extension.nodecharacteristics/META-INF/MANIFEST.MF b/bundles/org.dataflowanalysis.pcm.extension.nodecharacteristics/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 0.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.dataflowanalysis.pcm.extension.nodecharacteristics.nodecharacteristics,
  org.dataflowanalysis.pcm.extension.nodecharacteristics.nodecharacteristics.impl,
  org.dataflowanalysis.pcm.extension.nodecharacteristics.nodecharacteristics.util

diff --git a/...es/org.dataflowanalysis.pcm.extension.nodecharacteristics/model/nodeCharacteristics.ecore b/...es/org.dataflowanalysis.pcm.extension.nodecharacteristics/model/nodeCharacteristics.ecore
@@ -2,19 +2,19 @@
 <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="nodecharacteristics" nsURI="http://dataflowanalysis.org/pcm/extension/nodecharacteristics/0.1.0"
     nsPrefix="nodecharacteristics">
-  <eClassifiers xsi:type="ecore:EClass" name="UsageAssignee" eSuperTypes="#//AbstractAssignee platform:/plugin/de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
+  <eClassifiers xsi:type="ecore:EClass" name="UsageAssignee" eSuperTypes="#//AbstractAssignee">
     <eStructuralFeatures xsi:type="ecore:EReference" name="usagescenario" lowerBound="1"
         eType="ecore:EClass ../../org.palladiosimulator.pcm/model/pcm.ecore#//usagemodel/UsageScenario"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RessourceAssignee" eSuperTypes="#//AbstractAssignee platform:/plugin/de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
+  <eClassifiers xsi:type="ecore:EClass" name="ResourceAssignee" eSuperTypes="#//AbstractAssignee">
     <eStructuralFeatures xsi:type="ecore:EReference" name="resourcecontainer" lowerBound="1"
         eType="ecore:EClass ../../org.palladiosimulator.pcm/model/pcm.ecore#//resourceenvironment/ResourceContainer"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AssemblyAssignee" eSuperTypes="#//AbstractAssignee platform:/plugin/de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
+  <eClassifiers xsi:type="ecore:EClass" name="AssemblyAssignee" eSuperTypes="#//AbstractAssignee">
     <eStructuralFeatures xsi:type="ecore:EReference" name="assemblycontext" lowerBound="1"
         eType="ecore:EClass ../../org.palladiosimulator.pcm/model/pcm.ecore#//core/composition/AssemblyContext"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractAssignee" abstract="true">
+  <eClassifiers xsi:type="ecore:EClass" name="AbstractAssignee" abstract="true" eSuperTypes="../../org.palladiosimulator.pcm/model/pcm.ecore#//core/entity/Entity">
     <eStructuralFeatures xsi:type="ecore:EReference" name="characteristics" upperBound="-1"
         eType="ecore:EClass ../../org.dataflowanalysis.pcm.extension.model/model/dataFlowConfidentiality.ecore#//characteristics/EnumCharacteristic"
         containment="true"/>

diff --git a/...org.dataflowanalysis.pcm.extension.nodecharacteristics/model/nodeCharacteristics.genmodel b/...org.dataflowanalysis.pcm.extension.nodecharacteristics/model/nodeCharacteristics.genmodel
@@ -18,19 +18,19 @@
   <genPackages prefix="NodeCharacteristics" basePackage="org.dataflowanalysis.pcm.extension.nodecharacteristics"
       resource="XMI" disposableProviderFactory="true" extensibleProviderFactory="true"
       ecorePackage="nodeCharacteristics.ecore#/">
-    <genClasses ecoreClass="nodeCharacteristics.ecore#//UsageAssignee">
+    <genClasses image="false" ecoreClass="nodeCharacteristics.ecore#//UsageAssignee">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nodeCharacteristics.ecore#//UsageAssignee/usagescenario"/>
     </genClasses>
-    <genClasses ecoreClass="nodeCharacteristics.ecore#//RessourceAssignee">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nodeCharacteristics.ecore#//RessourceAssignee/resourcecontainer"/>
+    <genClasses image="false" ecoreClass="nodeCharacteristics.ecore#//ResourceAssignee">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nodeCharacteristics.ecore#//ResourceAssignee/resourcecontainer"/>
     </genClasses>
-    <genClasses ecoreClass="nodeCharacteristics.ecore#//AssemblyAssignee">
+    <genClasses image="false" ecoreClass="nodeCharacteristics.ecore#//AssemblyAssignee">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference nodeCharacteristics.ecore#//AssemblyAssignee/assemblycontext"/>
     </genClasses>
     <genClasses image="false" ecoreClass="nodeCharacteristics.ecore#//AbstractAssignee">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nodeCharacteristics.ecore#//AbstractAssignee/characteristics"/>
     </genClasses>
-    <genClasses ecoreClass="nodeCharacteristics.ecore#//Assignments">
+    <genClasses image="false" ecoreClass="nodeCharacteristics.ecore#//Assignments">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference nodeCharacteristics.ecore#//Assignments/assignee"/>
     </genClasses>
   </genPackages>

diff --git a/bundles/org.dataflowanalysis.pcm.extension.nodecharacteristics/plugin.xml b/bundles/org.dataflowanalysis.pcm.extension.nodecharacteristics/plugin.xml
@@ -9,7 +9,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated nodeCharacteristics -->
       <package
-            uri="http://www.example.org/nodeCharacteristics"
+            uri="http://dataflowanalysis.org/pcm/extension/nodecharacteristics/0.1.0"
             class="org.dataflowanalysis.pcm.extension.nodecharacteristics.nodecharacteristics.NodeCharacteristicsPackage"
             genModel="model/nodeCharacteristics.genmodel"/>
    </extension>