Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.di6
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.notation268
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.uml221
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/src/org/eclipse/papyrus/adl4eclipse/org/IADL4ECLIPSE_Stereotype.java60
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml54
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ModelCompleteFeatureArchitectureHandler.java78
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ModelCompletePluginArchitectureHandler.java (renamed from extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/CompleteArchitectureHandler.java)13
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ModelFeatureArchitectureFromWorkspaceHandler.java78
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ModelPluginArchitectureFromWorkspaceHandler.java (renamed from extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/SimpleArchitecrureHandler.java)12
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/CompleteFeaturesArchitectureSnapshotCommand.java48
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/CompletePluginsArchitectureSnapshotCommand.java (renamed from extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/CompleteArchitectureSnapshotCommand.java)4
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/SimpleFeaturesArchitectureSnapshotCommand.java48
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/SimplePluginsArchitectureSnapshotCommand.java (renamed from extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/SimpleArchitectureSnapshotCommand.java)4
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java291
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteArchitectureSnapshotDesigner.java5
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteFeatureArchitectureSnapshotDesigner.java66
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/SimpleArchitectureSnapshotDesigner.java15
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/SimpleFeatureArchitectureSnapshotDesigner.java53
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/BundleDesignerRegistry.java18
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/BundleLabelProvider.java5
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/FeatureDescriptionDesigner.java33
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/LoadedBundleDescriptionDesigner.java4
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/WorkspaceBundleDescriptionDesigner.java2
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/wizard/FeatureArchitectureWizard.java44
-rw-r--r--extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/wizard/PluginArchitectureWizard.java (renamed from extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/wizard/BundleArchitectureWizard.java)9
25 files changed, 1259 insertions, 180 deletions
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.di b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.di
index b662bab20a8..bba9e292ceb 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.di
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.di
@@ -7,6 +7,9 @@
<availablePage>
<emfPageIdentifier href="adl4eclipse.profile.notation#_vNr94IGIEeKWufV7WxSyhw"/>
</availablePage>
+ <availablePage>
+ <emfPageIdentifier href="adl4eclipse.profile.notation#_5XfK4NT3EeKj0Lzrn2trlQ"/>
+ </availablePage>
</pageList>
<sashModel currentSelection="//@sashModel/@windows.0/@children.0">
<windows>
@@ -17,6 +20,9 @@
<children>
<emfPageIdentifier href="adl4eclipse.profile.notation#_vNr94IGIEeKWufV7WxSyhw"/>
</children>
+ <children>
+ <emfPageIdentifier href="adl4eclipse.profile.notation#_5XfK4NT3EeKj0Lzrn2trlQ"/>
+ </children>
</children>
</windows>
</sashModel>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.notation b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.notation
index 56cf99b636a..7de5f914b38 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.notation
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.notation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
<notation:Diagram xmi:id="_nE-wwHz7EeKfO4elN3J5Fw" type="PapyrusUMLProfileDiagram" name="Overview" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_vjaVoHz7EeKfO4elN3J5Fw" type="1026" gradient="10011046, -1, 0">
<children xmi:type="notation:DecorationNode" xmi:id="_vjaVonz7EeKfO4elN3J5Fw" type="1034"/>
@@ -66,6 +66,13 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_vjaVq3z7EeKfO4elN3J5Fw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_vjaVrHz7EeKfO4elN3J5Fw"/>
</children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tXDe4NT3EeKj0Lzrn2trlQ" visible="false" type="compartment_shape_display">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tXWZ0NT3EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tXWZ0dT3EeKj0Lzrn2trlQ" key="mutable" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_tXDe4dT3EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tXDe4tT3EeKj0Lzrn2trlQ"/>
+ </children>
<element xmi:type="uml:Stereotype" href="adl4eclipse.profile.uml#_vi0fwHz7EeKfO4elN3J5Fw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_vjaVoXz7EeKfO4elN3J5Fw" x="410" y="250"/>
</children>
@@ -93,6 +100,13 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_ygqw-3z7EeKfO4elN3J5Fw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_ygqw_Hz7EeKfO4elN3J5Fw"/>
</children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tXgK0NT3EeKj0Lzrn2trlQ" visible="false" type="compartment_shape_display">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tXgK09T3EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tXgK1NT3EeKj0Lzrn2trlQ" key="mutable" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_tXgK0dT3EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tXgK0tT3EeKj0Lzrn2trlQ"/>
+ </children>
<element xmi:type="uml:Stereotype" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_esaOUHtxEeKcL-wrhM9ICg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_ygqw8Xz7EeKfO4elN3J5Fw" x="415" y="85" width="546" height="55"/>
</children>
@@ -121,6 +135,13 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_d7QEyXz-EeKfO4elN3J5Fw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_d7QEynz-EeKfO4elN3J5Fw"/>
</children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tXpUwNT3EeKj0Lzrn2trlQ" visible="false" type="compartment_shape_display">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tXpUw9T3EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tXpUxNT3EeKj0Lzrn2trlQ" key="mutable" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_tXpUwdT3EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tXpUwtT3EeKj0Lzrn2trlQ"/>
+ </children>
<element xmi:type="uml:Stereotype" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_VklNMHzcEeKDPtIRpgUgbg"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_d7PdsXz-EeKfO4elN3J5Fw" x="1110" y="83" width="142" height="53"/>
</children>
@@ -151,6 +172,13 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_hO94SHz-EeKfO4elN3J5Fw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_hO94SXz-EeKfO4elN3J5Fw"/>
</children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tXpUxdT3EeKj0Lzrn2trlQ" visible="false" type="compartment_shape_display">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tXpUyNT3EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tXpUydT3EeKj0Lzrn2trlQ" key="mutable" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_tXpUxtT3EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tXpUx9T3EeKj0Lzrn2trlQ"/>
+ </children>
<element xmi:type="uml:Stereotype" href="adl4eclipse.profile.uml#_hOsLcHz-EeKfO4elN3J5Fw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_hO9RMXz-EeKfO4elN3J5Fw" x="880" y="245" width="381" height="61"/>
</children>
@@ -163,6 +191,18 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sy28yXz_EeKfO4elN3J5Fw" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_sy28wnz_EeKfO4elN3J5Fw" type="1084"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tYGAsNT3EeKj0Lzrn2trlQ" visible="false" type="AppliedStereotypeCompartement">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_tYGAsdT3EeKj0Lzrn2trlQ" showTitle="true"/>
+ <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sk8N0KtKEeGF4uwJob34Mw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tYGAstT3EeKj0Lzrn2trlQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tYGAs9T3EeKj0Lzrn2trlQ" visible="false" type="compartment_shape_display">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tYGAttT3EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tYGAt9T3EeKj0Lzrn2trlQ" key="mutable" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_tYGAtNT3EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tYGAtdT3EeKj0Lzrn2trlQ"/>
+ </children>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_sy28w3z_EeKfO4elN3J5Fw" x="950" y="415"/>
</children>
@@ -205,6 +245,13 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_en_kFn0AEeKfO4elN3J5Fw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_en_kF30AEeKfO4elN3J5Fw"/>
</children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tYGAuNT3EeKj0Lzrn2trlQ" visible="false" type="compartment_shape_display">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tYGAu9T3EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tYGAvNT3EeKj0Lzrn2trlQ" key="mutable" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_tYGAudT3EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tYGAutT3EeKj0Lzrn2trlQ"/>
+ </children>
<element xmi:type="uml:Enumeration" href="adl4eclipse.profile.uml#_ensCEH0AEeKfO4elN3J5Fw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_en_kEX0AEeKfO4elN3J5Fw" x="33" y="358" width="168"/>
</children>
@@ -227,6 +274,13 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_mMxHpn0BEeKfO4elN3J5Fw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_mMxHp30BEeKfO4elN3J5Fw"/>
</children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_tYGAvdT3EeKj0Lzrn2trlQ" visible="false" type="compartment_shape_display">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tYGAwNT3EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tYGAwdT3EeKj0Lzrn2trlQ" key="mutable" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_tYGAvtT3EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tYGAv9T3EeKj0Lzrn2trlQ"/>
+ </children>
<element xmi:type="uml:Enumeration" href="adl4eclipse.profile.uml#_mMdloH0BEeKfO4elN3J5Fw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_mMxHoX0BEeKfO4elN3J5Fw" x="35" y="220" width="166"/>
</children>
@@ -369,10 +423,222 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_vyukqYGIEeKWufV7WxSyhw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_vyukqoGIEeKWufV7WxSyhw"/>
</children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_taB6YNT3EeKj0Lzrn2trlQ" visible="false" type="compartment_shape_display">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_taB6Y9T3EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_taB6ZNT3EeKj0Lzrn2trlQ" key="mutable" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_taB6YdT3EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_taB6YtT3EeKj0Lzrn2trlQ"/>
+ </children>
<element xmi:type="uml:Stereotype" href="adl4eclipse.profile.uml#_vi0fwHz7EeKfO4elN3J5Fw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_vylasYGIEeKWufV7WxSyhw" x="440" y="130"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_vNr94YGIEeKWufV7WxSyhw"/>
<element xmi:type="uml:Profile" href="adl4eclipse.profile.uml#_nE1m0Hz7EeKfO4elN3J5Fw"/>
</notation:Diagram>
+ <notation:Diagram xmi:id="_5XfK4NT3EeKj0Lzrn2trlQ" type="PapyrusUMLProfileDiagram" name="Feature" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_6M5v8NT3EeKj0Lzrn2trlQ" type="1026">
+ <children xmi:type="notation:DecorationNode" xmi:id="_6M5v8tT3EeKj0Lzrn2trlQ" type="1034"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_6M5v89T3EeKj0Lzrn2trlQ" type="1071">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6NC54NT3EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6NC54dT3EeKj0Lzrn2trlQ" key="showTitle" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:Shape" xmi:id="_E-CXQNT4EeKj0Lzrn2trlQ" type="3002">
+ <element xmi:type="uml:Property" href="adl4eclipse.profile.uml#_E8GdkNT4EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_E-CXQdT4EeKj0Lzrn2trlQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_NKxvMNT4EeKj0Lzrn2trlQ" type="3002">
+ <element xmi:type="uml:Property" href="adl4eclipse.profile.uml#_NKe0QNT4EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_NKxvMdT4EeKj0Lzrn2trlQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_RgGwsNT4EeKj0Lzrn2trlQ" type="3002">
+ <element xmi:type="uml:Property" href="adl4eclipse.profile.uml#_Rf9mwNT4EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_RgGwsdT4EeKj0Lzrn2trlQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_VqlNENT4EeKj0Lzrn2trlQ" type="3002">
+ <element xmi:type="uml:Property" href="adl4eclipse.profile.uml#_VqbcENT4EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_VqlNEdT4EeKj0Lzrn2trlQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_ad9cgNT4EeKj0Lzrn2trlQ" type="3002">
+ <element xmi:type="uml:Property" href="adl4eclipse.profile.uml#_ad0SkNT4EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_ad9cgdT4EeKj0Lzrn2trlQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_fugJENT4EeKj0Lzrn2trlQ" type="3002">
+ <element xmi:type="uml:Property" href="adl4eclipse.profile.uml#_fuW_INT4EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_fugJEdT4EeKj0Lzrn2trlQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_21MiYNT5EeKj0Lzrn2trlQ" type="3002">
+ <element xmi:type="uml:Property" href="adl4eclipse.profile.uml#_21DYcNT5EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_21MiYdT5EeKj0Lzrn2trlQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_7Rz3oNT5EeKj0Lzrn2trlQ" type="3002">
+ <element xmi:type="uml:Property" href="adl4eclipse.profile.uml#_7Rg8sNT5EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_7Rz3odT5EeKj0Lzrn2trlQ"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_C1x_YNT6EeKj0Lzrn2trlQ" type="3002">
+ <element xmi:type="uml:Property" href="adl4eclipse.profile.uml#_C1oOYNT6EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_C1x_YdT6EeKj0Lzrn2trlQ"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_6M5v9NT3EeKj0Lzrn2trlQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_6M5v9dT3EeKj0Lzrn2trlQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_6M5v9tT3EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6M5v99T3EeKj0Lzrn2trlQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_6M5v-NT3EeKj0Lzrn2trlQ" visible="false" type="1019">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6NC54tT3EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6NC549T3EeKj0Lzrn2trlQ" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_6M5v-dT3EeKj0Lzrn2trlQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_6M5v-tT3EeKj0Lzrn2trlQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_6M5v-9T3EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6M5v_NT3EeKj0Lzrn2trlQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_6NMq4NT3EeKj0Lzrn2trlQ" visible="false" type="compartment_shape_display">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6NMq49T3EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6NMq5NT3EeKj0Lzrn2trlQ" key="mutable" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_6NMq4dT3EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6NMq4tT3EeKj0Lzrn2trlQ"/>
+ </children>
+ <element xmi:type="uml:Stereotype" href="adl4eclipse.profile.uml#_6MKJENT3EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6M5v8dT3EeKj0Lzrn2trlQ" x="460" y="285"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_ATlaUNT4EeKj0Lzrn2trlQ" type="1031">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ATlaVNT4EeKj0Lzrn2trlQ" source="Stereotype_Annotation">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ATlaVdT4EeKj0Lzrn2trlQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ATlaVtT4EeKj0Lzrn2trlQ" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ATlaV9T4EeKj0Lzrn2trlQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ATlaWNT4EeKj0Lzrn2trlQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ATlaWdT4EeKj0Lzrn2trlQ" key="StereotypePropertyLocation" value="Compartment"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_ATlaUtT4EeKj0Lzrn2trlQ" type="1084"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_ATvLUNT4EeKj0Lzrn2trlQ" visible="false" type="AppliedStereotypeCompartement">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_ATvLUdT4EeKj0Lzrn2trlQ" showTitle="true"/>
+ <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sh6H8KtKEeGF4uwJob34Mw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ATvLUtT4EeKj0Lzrn2trlQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_ATvLU9T4EeKj0Lzrn2trlQ" visible="false" type="compartment_shape_display">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ATvLVtT4EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ATvLV9T4EeKj0Lzrn2trlQ" key="mutable" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_ATvLVNT4EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ATvLVdT4EeKj0Lzrn2trlQ"/>
+ </children>
+ <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ATlaU9T4EeKj0Lzrn2trlQ" x="480" y="110"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_29ZRkNT4EeKj0Lzrn2trlQ" type="1026">
+ <children xmi:type="notation:DecorationNode" xmi:id="_29ZRktT4EeKj0Lzrn2trlQ" type="1034"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_29ZRk9T4EeKj0Lzrn2trlQ" type="1071">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_29ZRndT4EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_29ZRntT4EeKj0Lzrn2trlQ" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_29ZRlNT4EeKj0Lzrn2trlQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_29ZRldT4EeKj0Lzrn2trlQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_29ZRltT4EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_29ZRl9T4EeKj0Lzrn2trlQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_29ZRmNT4EeKj0Lzrn2trlQ" visible="false" type="1019">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_29ZRn9T4EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_29ZRoNT4EeKj0Lzrn2trlQ" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_29ZRmdT4EeKj0Lzrn2trlQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_29ZRmtT4EeKj0Lzrn2trlQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_29ZRm9T4EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_29ZRnNT4EeKj0Lzrn2trlQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_29ibgNT4EeKj0Lzrn2trlQ" visible="false" type="compartment_shape_display">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_29ibg9T4EeKj0Lzrn2trlQ" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_29ibhNT4EeKj0Lzrn2trlQ" key="mutable" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_29ibgdT4EeKj0Lzrn2trlQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_29ibgtT4EeKj0Lzrn2trlQ"/>
+ </children>
+ <element xmi:type="uml:Stereotype" href="adl4eclipse.profile.uml#_vi0fwHz7EeKfO4elN3J5Fw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_29ZRkdT4EeKj0Lzrn2trlQ" x="845" y="320" height="161"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_5XfK4dT3EeKj0Lzrn2trlQ"/>
+ <element xmi:type="uml:Profile" href="adl4eclipse.profile.uml#_nE1m0Hz7EeKfO4elN3J5Fw"/>
+ <edges xmi:type="notation:Connector" xmi:id="_BBHOsNT4EeKj0Lzrn2trlQ" type="1013" source="_6M5v8NT3EeKj0Lzrn2trlQ" target="_ATlaUNT4EeKj0Lzrn2trlQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_BBHOsdT4EeKj0Lzrn2trlQ"/>
+ <element xmi:type="uml:Extension" href="adl4eclipse.profile.uml#_BAN20dT4EeKj0Lzrn2trlQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BBHOstT4EeKj0Lzrn2trlQ" points="[-7, -14, -13, 206]$[-44, -212, -50, 8]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BBQ_sNT4EeKj0Lzrn2trlQ" id="(0.48717948717948717,0.03571428571428571)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_4wsbMNT4EeKj0Lzrn2trlQ" type="4001" source="_6M5v8NT3EeKj0Lzrn2trlQ" target="_29ZRkNT4EeKj0Lzrn2trlQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_4wsbM9T4EeKj0Lzrn2trlQ" visible="false" type="6001">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_4wsbNNT4EeKj0Lzrn2trlQ" y="60"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_4wsbNdT4EeKj0Lzrn2trlQ" visible="false" type="6002">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_4wsbNtT4EeKj0Lzrn2trlQ" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_4wsbN9T4EeKj0Lzrn2trlQ" type="6003">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_4wsbONT4EeKj0Lzrn2trlQ" x="-60" y="26"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_4wsbOdT4EeKj0Lzrn2trlQ" visible="false" type="6005">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_4wsbOtT4EeKj0Lzrn2trlQ" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_4wsbO9T4EeKj0Lzrn2trlQ" visible="false" type="6033">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_4wsbPNT4EeKj0Lzrn2trlQ" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_4wsbPdT4EeKj0Lzrn2trlQ" type="6034">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_4wsbPtT4EeKj0Lzrn2trlQ" y="-20"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_4wsbMdT4EeKj0Lzrn2trlQ"/>
+ <element xmi:type="uml:Association" href="adl4eclipse.profile.uml#_4vp5Y9T4EeKj0Lzrn2trlQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4wsbMtT4EeKj0Lzrn2trlQ" points="[17, -4, -248, 0]$[246, -13, -19, -9]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4w_WINT4EeKj0Lzrn2trlQ" id="(0.8910256410256411,0.45454545454545453)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4w_WIdT4EeKj0Lzrn2trlQ" id="(0.19,0.40993788819875776)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_CEsWINT5EeKj0Lzrn2trlQ" type="4001" source="_6M5v8NT3EeKj0Lzrn2trlQ" target="_6M5v8NT3EeKj0Lzrn2trlQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_CEsWI9T5EeKj0Lzrn2trlQ" visible="false" type="6001">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_CEsWJNT5EeKj0Lzrn2trlQ" y="60"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_CEsWJdT5EeKj0Lzrn2trlQ" visible="false" type="6002">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_CEsWJtT5EeKj0Lzrn2trlQ" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_CEsWJ9T5EeKj0Lzrn2trlQ" type="6003">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_CEsWKNT5EeKj0Lzrn2trlQ" x="-24" y="23"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_CEsWKdT5EeKj0Lzrn2trlQ" visible="false" type="6005">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_CEsWKtT5EeKj0Lzrn2trlQ" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_CEsWK9T5EeKj0Lzrn2trlQ" visible="false" type="6033">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_CEsWLNT5EeKj0Lzrn2trlQ" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_CEsWLdT5EeKj0Lzrn2trlQ" type="6034">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_CEsWLtT5EeKj0Lzrn2trlQ" y="-20"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_CEsWIdT5EeKj0Lzrn2trlQ"/>
+ <element xmi:type="uml:Association" href="adl4eclipse.profile.uml#_CEjMMNT5EeKj0Lzrn2trlQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CEsWItT5EeKj0Lzrn2trlQ" points="[6, 0, 32, -4]$[68, 0, 94, -4]$[68, 108, 94, 104]$[-33, 108, -7, 104]$[-33, 46, -7, 42]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CE_RENT5EeKj0Lzrn2trlQ" id="(0.9615384615384616,0.7954545454545454)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CE_REdT5EeKj0Lzrn2trlQ" id="(0.7948717948717948,0.8125)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_gjwgoNT5EeKj0Lzrn2trlQ" type="4001" source="_6M5v8NT3EeKj0Lzrn2trlQ" target="_6M5v8NT3EeKj0Lzrn2trlQ">
+ <children xmi:type="notation:DecorationNode" xmi:id="_gjwgo9T5EeKj0Lzrn2trlQ" visible="false" type="6001">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gjwgpNT5EeKj0Lzrn2trlQ" y="60"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_gjwgpdT5EeKj0Lzrn2trlQ" visible="false" type="6002">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gjwgptT5EeKj0Lzrn2trlQ" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_gjwgp9T5EeKj0Lzrn2trlQ" type="6003">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gjwgqNT5EeKj0Lzrn2trlQ" x="-34" y="-38"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_gjwgqdT5EeKj0Lzrn2trlQ" visible="false" type="6005">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gjwgqtT5EeKj0Lzrn2trlQ" y="-20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_gjwgq9T5EeKj0Lzrn2trlQ" visible="false" type="6033">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gjwgrNT5EeKj0Lzrn2trlQ" y="20"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_gjwgrdT5EeKj0Lzrn2trlQ" type="6034">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_gjwgrtT5EeKj0Lzrn2trlQ" y="-20"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_gjwgodT5EeKj0Lzrn2trlQ"/>
+ <element xmi:type="uml:Association" href="adl4eclipse.profile.uml#_gjmvoNT5EeKj0Lzrn2trlQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gjwgotT5EeKj0Lzrn2trlQ" points="[-9, 27, 14, 72]$[-9, 77, 14, 122]$[-114, 77, -91, 122]$[-114, -42, -91, 3]$[-24, -42, -1, 3]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gkDbkNT5EeKj0Lzrn2trlQ" id="(0.15384615384615385,0.8806818181818182)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gkDbkdT5EeKj0Lzrn2trlQ" id="(0.00641025641025641,0.6818181818181818)"/>
+ </edges>
+ </notation:Diagram>
</xmi:XMI>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.uml b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.uml
index 8dee72a501b..8727e23f04f 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.uml
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/resource/adl4eclipse.profile.uml
@@ -1,6 +1,117 @@
<?xml version="1.0" encoding="UTF-8"?>
-<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_nE1m0Hz7EeKfO4elN3J5Fw" name="ADL4Eclipse" metaclassReference="_sykB0Hz_EeKfO4elN3J5Fw" metamodelReference="_nE1m0Xz7EeKfO4elN3J5Fw">
+<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_nE1m0Hz7EeKfO4elN3J5Fw" name="ADL4Eclipse" metaclassReference="_sykB0Hz_EeKfO4elN3J5Fw _ATcQYNT4EeKj0Lzrn2trlQ" metamodelReference="_nE1m0Xz7EeKfO4elN3J5Fw">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qBs8MX9OEeKfO4elN3J5Fw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <contents xmi:type="ecore:EPackage" xmi:id="_jDF0YdT6EeKj0Lzrn2trlQ" name="ADL4Eclipse" nsURI="http:///schemas/ADL4Eclipse/_jDF0YNT6EeKj0Lzrn2trlQ/2" nsPrefix="ADL4Eclipse">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jDF0YtT6EeKj0Lzrn2trlQ" source="http://www.eclipse.org/uml2/4.0.0/UML">
+ <references xmi:type="uml:Profile" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_YbhfEHtxEeKcL-wrhM9ICg"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jElCINT6EeKj0Lzrn2trlQ" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jElCIdT6EeKj0Lzrn2trlQ" key="Version" value="0.0.3"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jElCItT6EeKj0Lzrn2trlQ" key="Comment" value="Add feature notions"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jElCI9T6EeKj0Lzrn2trlQ" key="Copyright" value="CEA LIST"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jElCJNT6EeKj0Lzrn2trlQ" key="Date" value="2013-06-14"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jElCJdT6EeKj0Lzrn2trlQ" key="Author" value="P. Tessier"/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_jDF0Y9T6EeKj0Lzrn2trlQ" name="Plugin">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jDF0ZNT6EeKj0Lzrn2trlQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_vi0fwHz7EeKfO4elN3J5Fw"/>
+ <eSuperTypes xmi:type="ecore:EClass" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_0xRiUYDEEeKQG4TlBAn6bg"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF0ZdT6EeKj0Lzrn2trlQ" name="isIncubation" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF0Z9T6EeKj0Lzrn2trlQ" name="lazyStart" ordered="false">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_jDF0adT6EeKj0Lzrn2trlQ" name="lazyStartException" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF0a9T6EeKj0Lzrn2trlQ" name="platformFilter" ordered="false">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF0bdT6EeKj0Lzrn2trlQ" name="buddyPolicy" ordered="false" upperBound="-1" eType="_jDF00NT6EeKj0Lzrn2trlQ"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF0b9T6EeKj0Lzrn2trlQ" name="extensibleAPI" ordered="false">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF0cdT6EeKj0Lzrn2trlQ" name="bundleShape" ordered="false" eType="_jDF02dT6EeKj0Lzrn2trlQ"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF0c9T6EeKj0Lzrn2trlQ" name="capability" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF0ddT6EeKj0Lzrn2trlQ" name="requireCapability" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF0d9T6EeKj0Lzrn2trlQ" name="genericCapabilityAlias" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EEnum" xmi:id="_jDF0sNT6EeKj0Lzrn2trlQ" name="OSGI_ModuleLayer_BundleCategory">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jDF0sdT6EeKj0Lzrn2trlQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="uml:Enumeration" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_Fa8iUHw7EeKcL-wrhM9ICg"/>
+ </eAnnotations>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_jDF0stT6EeKj0Lzrn2trlQ" name="osgi"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_jDF0s9T6EeKj0Lzrn2trlQ" name="test" value="1"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_jDF0tNT6EeKj0Lzrn2trlQ" name="nursery" value="2"/>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EEnum" xmi:id="_jDF00NT6EeKj0Lzrn2trlQ" name="BuddyPolicyEnumeration">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jDF00dT6EeKj0Lzrn2trlQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ensCEH0AEeKfO4elN3J5Fw"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_jDF00tT6EeKj0Lzrn2trlQ" name="dependent"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_jDF009T6EeKj0Lzrn2trlQ" name="global" value="1"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_jDF01NT6EeKj0Lzrn2trlQ" name="registered" value="2"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_jDF01dT6EeKj0Lzrn2trlQ" name="app" value="3"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_jDF01tT6EeKj0Lzrn2trlQ" name="ext" value="4"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_jDF019T6EeKj0Lzrn2trlQ" name="boot" value="5"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_jDF02NT6EeKj0Lzrn2trlQ" name="parent" value="6"/>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EEnum" xmi:id="_jDF02dT6EeKj0Lzrn2trlQ" name="BundleShapeEnumeration">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jDF02tT6EeKj0Lzrn2trlQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_mMdloH0BEeKfO4elN3J5Fw"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_jDF029T6EeKj0Lzrn2trlQ" name="jar"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_jDF03NT6EeKj0Lzrn2trlQ" name="dir" value="1"/>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_jDF03dT6EeKj0Lzrn2trlQ" name="EclipseExportedPackage">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jDF03tT6EeKj0Lzrn2trlQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hOsLcHz-EeKfO4elN3J5Fw"/>
+ <eSuperTypes xmi:type="ecore:EClass" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_0xRinYDEEeKQG4TlBAn6bg"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF039T6EeKj0Lzrn2trlQ" name="isInternal" ordered="false" defaultValueLiteral="false">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_jDF04dT6EeKj0Lzrn2trlQ" name="friend" ordered="false" upperBound="-1">
+ <eType xmi:type="ecore:EClass" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_0xRiUYDEEeKQG4TlBAn6bg"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_jDF05NT6EeKj0Lzrn2trlQ" name="Feature">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jDF05dT6EeKj0Lzrn2trlQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_6MKJENT3EeKj0Lzrn2trlQ"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_jDF05tT6EeKj0Lzrn2trlQ" name="base_Class" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF06NT6EeKj0Lzrn2trlQ" name="description" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF06tT6EeKj0Lzrn2trlQ" name="copyright" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF07NT6EeKj0Lzrn2trlQ" name="license" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF07tT6EeKj0Lzrn2trlQ" name="provider" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF08NT6EeKj0Lzrn2trlQ" name="image" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF08tT6EeKj0Lzrn2trlQ" name="url" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_jDF09NT6EeKj0Lzrn2trlQ" name="plugins" ordered="false" upperBound="-1" eType="_jDF0Y9T6EeKj0Lzrn2trlQ"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_jDF09tT6EeKj0Lzrn2trlQ" name="includedFeatures" ordered="false" upperBound="-1" eType="_jDF05NT6EeKj0Lzrn2trlQ"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_jDF0-NT6EeKj0Lzrn2trlQ" name="importedFeatures" ordered="false" upperBound="-1" eType="_jDF05NT6EeKj0Lzrn2trlQ"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF0-tT6EeKj0Lzrn2trlQ" name="label" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF0_NT6EeKj0Lzrn2trlQ" name="id" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_jDF0_tT6EeKj0Lzrn2trlQ" name="version" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ </contents>
<contents xmi:type="ecore:EPackage" xmi:id="_kVUQsIGJEeKWufV7WxSyhw" name="ADL4Eclipse" nsURI="http:///schemas/ADL4Eclipse/_kVQmUIGJEeKWufV7WxSyhw/1" nsPrefix="ADL4Eclipse">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_kVUQsYGJEeKWufV7WxSyhw" source="http://www.eclipse.org/uml2/4.0.0/UML">
<references xmi:type="uml:Profile" href="pathmap://OSGI_PROFILES/osgi.profile.uml#_YbhfEHtxEeKcL-wrhM9ICg"/>
@@ -166,6 +277,9 @@
<elementImport xmi:type="uml:ElementImport" xmi:id="_sykB0Hz_EeKfO4elN3J5Fw" alias="Package">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
</elementImport>
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_ATcQYNT4EeKj0Lzrn2trlQ" alias="Class">
+ <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+ </elementImport>
<packageImport xmi:type="uml:PackageImport" xmi:id="_nE1m0Xz7EeKfO4elN3J5Fw">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
</packageImport>
@@ -270,4 +384,109 @@
<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ntBZcH0BEeKfO4elN3J5Fw" name="jar"/>
<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_qjug0H0BEeKfO4elN3J5Fw" name="dir"/>
</packagedElement>
+ <packagedElement xmi:type="uml:Stereotype" xmi:id="_6MKJENT3EeKj0Lzrn2trlQ" name="Feature">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_BAN20NT4EeKj0Lzrn2trlQ" name="base_Class" association="_BAN20dT4EeKj0Lzrn2trlQ">
+ <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_E8GdkNT4EeKj0Lzrn2trlQ" name="description" visibility="public">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Jr6boNT4EeKj0Lzrn2trlQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Jr6bodT4EeKj0Lzrn2trlQ" value="1"/>
+ <defaultValue xmi:type="uml:LiteralString" xmi:id="_JsgRgNT4EeKj0Lzrn2trlQ">
+ <value xsi:nil="true"/>
+ </defaultValue>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_NKe0QNT4EeKj0Lzrn2trlQ" name="copyright" visibility="public">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QAJZ0NT4EeKj0Lzrn2trlQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QATK0NT4EeKj0Lzrn2trlQ" value="1"/>
+ <defaultValue xmi:type="uml:LiteralString" xmi:id="_QAmFwNT4EeKj0Lzrn2trlQ">
+ <value xsi:nil="true"/>
+ </defaultValue>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_Rf9mwNT4EeKj0Lzrn2trlQ" name="license" visibility="public">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_T4BDQNT4EeKj0Lzrn2trlQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_T4K0QNT4EeKj0Lzrn2trlQ" value="1"/>
+ <defaultValue xmi:type="uml:LiteralString" xmi:id="_T4dvMNT4EeKj0Lzrn2trlQ">
+ <value xsi:nil="true"/>
+ </defaultValue>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VqbcENT4EeKj0Lzrn2trlQ" name="provider" visibility="public">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZCT94NT4EeKj0Lzrn2trlQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZCdu4NT4EeKj0Lzrn2trlQ" value="1"/>
+ <defaultValue xmi:type="uml:LiteralString" xmi:id="_ZCwp0NT4EeKj0Lzrn2trlQ">
+ <value xsi:nil="true"/>
+ </defaultValue>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_ad0SkNT4EeKj0Lzrn2trlQ" name="image">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_fuW_INT4EeKj0Lzrn2trlQ" name="url" visibility="public">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gT244NT4EeKj0Lzrn2trlQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gUAp4NT4EeKj0Lzrn2trlQ" value="1"/>
+ <defaultValue xmi:type="uml:LiteralString" xmi:id="_gUJz0NT4EeKj0Lzrn2trlQ">
+ <value xsi:nil="true"/>
+ </defaultValue>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_4vp5YNT4EeKj0Lzrn2trlQ" name="plugins" type="_vi0fwHz7EeKfO4elN3J5Fw" association="_4vp5Y9T4EeKj0Lzrn2trlQ">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4vp5YdT4EeKj0Lzrn2trlQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4vp5YtT4EeKj0Lzrn2trlQ" value="*"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_CEZbMNT5EeKj0Lzrn2trlQ" name="includedFeatures" type="_6MKJENT3EeKj0Lzrn2trlQ" association="_CEjMMNT5EeKj0Lzrn2trlQ">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CEZbMdT5EeKj0Lzrn2trlQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CEZbMtT5EeKj0Lzrn2trlQ" value="*"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gjdlsNT5EeKj0Lzrn2trlQ" name="importedFeatures" type="_6MKJENT3EeKj0Lzrn2trlQ" association="_gjmvoNT5EeKj0Lzrn2trlQ">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gjdlsdT5EeKj0Lzrn2trlQ"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gjdlstT5EeKj0Lzrn2trlQ" value="*"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_21DYcNT5EeKj0Lzrn2trlQ" name="label" visibility="public">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6tEL0NT5EeKj0Lzrn2trlQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6tNVwNT5EeKj0Lzrn2trlQ" value="1"/>
+ <defaultValue xmi:type="uml:LiteralString" xmi:id="_6tgQsNT5EeKj0Lzrn2trlQ">
+ <value xsi:nil="true"/>
+ </defaultValue>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_7Rg8sNT5EeKj0Lzrn2trlQ" name="id" visibility="public">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9UuxoNT5EeKj0Lzrn2trlQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9UuxodT5EeKj0Lzrn2trlQ" value="1"/>
+ <defaultValue xmi:type="uml:LiteralString" xmi:id="_9VBskNT5EeKj0Lzrn2trlQ">
+ <value xsi:nil="true"/>
+ </defaultValue>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_C1oOYNT6EeKj0Lzrn2trlQ" name="version" visibility="public">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_E4kWgNT6EeKj0Lzrn2trlQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E4kWgdT6EeKj0Lzrn2trlQ" value="1"/>
+ <defaultValue xmi:type="uml:LiteralString" xmi:id="_E5BCcNT6EeKj0Lzrn2trlQ">
+ <value xsi:nil="true"/>
+ </defaultValue>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_BAN20dT4EeKj0Lzrn2trlQ" name="E_Feature_Class1" memberEnd="_BAN20tT4EeKj0Lzrn2trlQ _BAN20NT4EeKj0Lzrn2trlQ">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_BAN20tT4EeKj0Lzrn2trlQ" name="extension_Feature" type="_6MKJENT3EeKj0Lzrn2trlQ" aggregation="composite" association="_BAN20dT4EeKj0Lzrn2trlQ"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Association" xmi:id="_4vp5Y9T4EeKj0Lzrn2trlQ" name="feature_plugin_1" memberEnd="_4vp5ZNT4EeKj0Lzrn2trlQ _4vp5YNT4EeKj0Lzrn2trlQ">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_4vp5ZNT4EeKj0Lzrn2trlQ" name="feature" type="_6MKJENT3EeKj0Lzrn2trlQ" association="_4vp5Y9T4EeKj0Lzrn2trlQ">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4vp5ZdT4EeKj0Lzrn2trlQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4vp5ZtT4EeKj0Lzrn2trlQ" value="1"/>
+ </ownedEnd>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Association" xmi:id="_CEjMMNT5EeKj0Lzrn2trlQ" name="feature_feature_1" memberEnd="_CEjMMdT5EeKj0Lzrn2trlQ _CEZbMNT5EeKj0Lzrn2trlQ">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_CEjMMdT5EeKj0Lzrn2trlQ" name="feature" type="_6MKJENT3EeKj0Lzrn2trlQ" association="_CEjMMNT5EeKj0Lzrn2trlQ">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CEjMMtT5EeKj0Lzrn2trlQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CEjMM9T5EeKj0Lzrn2trlQ" value="1"/>
+ </ownedEnd>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Association" xmi:id="_gjmvoNT5EeKj0Lzrn2trlQ" name="importedFeatures" memberEnd="_gjmvodT5EeKj0Lzrn2trlQ _gjdlsNT5EeKj0Lzrn2trlQ">
+ <ownedEnd xmi:type="uml:Property" xmi:id="_gjmvodT5EeKj0Lzrn2trlQ" name="feature" type="_6MKJENT3EeKj0Lzrn2trlQ" association="_gjmvoNT5EeKj0Lzrn2trlQ">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gjmvotT5EeKj0Lzrn2trlQ" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gjmvo9T5EeKj0Lzrn2trlQ" value="1"/>
+ </ownedEnd>
+ </packagedElement>
</uml:Profile>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/src/org/eclipse/papyrus/adl4eclipse/org/IADL4ECLIPSE_Stereotype.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/src/org/eclipse/papyrus/adl4eclipse/org/IADL4ECLIPSE_Stereotype.java
index 690ea15ef8e..9995c68ba32 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/src/org/eclipse/papyrus/adl4eclipse/org/IADL4ECLIPSE_Stereotype.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/src/org/eclipse/papyrus/adl4eclipse/org/IADL4ECLIPSE_Stereotype.java
@@ -14,33 +14,33 @@
package org.eclipse.papyrus.adl4eclipse.org;
public interface IADL4ECLIPSE_Stereotype {
- /** Qualified name of the Plugin */
+ /** Qualified name of the stereotype Plugin */
public static final String PLUGIN_STEREOTYPE = "ADL4Eclipse::Plugin";
- /** name of property isIncubation of the stereotype Plugin */
+ /** name of property isIncubation of the stereoype Plugin */
public static final String PLUGIN_ISINCUBATION_ATT = "isIncubation";
- /** name of property lazyStart of the stereotype Plugin */
+ /** name of property lazyStart of the stereoype Plugin */
public static final String PLUGIN_LAZYSTART_ATT = "lazyStart";
- /** name of property lazyStartException of the stereotype Plugin */
+ /** name of property lazyStartException of the stereoype Plugin */
public static final String PLUGIN_LAZYSTARTEXCEPTION_ATT = "lazyStartException";
- /** name of property platformFilter of the stereotype Plugin */
+ /** name of property platformFilter of the stereoype Plugin */
public static final String PLUGIN_PLATFORMFILTER_ATT = "platformFilter";
- /** name of property buddyPolicy of the stereotype Plugin */
+ /** name of property buddyPolicy of the stereoype Plugin */
public static final String PLUGIN_BUDDYPOLICY_ATT = "buddyPolicy";
- /** name of property extensibleAPI of the stereotype Plugin */
+ /** name of property extensibleAPI of the stereoype Plugin */
public static final String PLUGIN_EXTENSIBLEAPI_ATT = "extensibleAPI";
- /** name of property bundleShape of the stereotype Plugin */
+ /** name of property bundleShape of the stereoype Plugin */
public static final String PLUGIN_BUNDLESHAPE_ATT = "bundleShape";
- /** name of property capability of the stereotype Plugin */
+ /** name of property capability of the stereoype Plugin */
public static final String PLUGIN_CAPABILITY_ATT = "capability";
- /** name of property requireCapability of the stereotype Plugin */
+ /** name of property requireCapability of the stereoype Plugin */
public static final String PLUGIN_REQUIRECAPABILITY_ATT = "requireCapability";
- /** name of property genericCapabilityAlias of the stereotype Plugin */
+ /** name of property genericCapabilityAlias of the stereoype Plugin */
public static final String PLUGIN_GENERICCAPABILITYALIAS_ATT = "genericCapabilityAlias";
- /** Qualified name of the EclipseExportedPackage */
- public static final String ECLIPSEEXPORTEDPACKAGE_ = "ADL4Eclipse::EclipseExportedPackage";
- /** name of property isInternal of the stereotype EclipseExportedPackage */
+ /** Qualified name of the stereotype EclipseExportedPackage */
+ public static final String ECLIPSEEXPORTEDPACKAGE_STEREOTYPE = "ADL4Eclipse::EclipseExportedPackage";
+ /** name of property isInternal of the stereoype EclipseExportedPackage */
public static final String ECLIPSEEXPORTEDPACKAGE_ISINTERNAL_ATT = "isInternal";
- /** name of property friend of the stereotype EclipseExportedPackage */
+ /** name of property friend of the stereoype EclipseExportedPackage */
public static final String ECLIPSEEXPORTEDPACKAGE_FRIEND_ATT = "friend";
/** name of literal dependent of the Enumeration BuddyPolicyEnumeration */
public static final String BUDDYPOLICYENUMERATION_DEPENDENT_ENUM = "dependent";
@@ -60,4 +60,32 @@ public interface IADL4ECLIPSE_Stereotype {
public static final String BUNDLESHAPEENUMERATION_JAR_ENUM = "jar";
/** name of literal dir of the Enumeration BundleShapeEnumeration */
public static final String BUNDLESHAPEENUMERATION_DIR_ENUM = "dir";
- } \ No newline at end of file
+ /** Qualified name of the stereotype Feature */
+ public static final String FEATURE_STEREOTYPE = "ADL4Eclipse::Feature";
+ /** name of property base_Class of the stereoype Feature */
+ public static final String FEATURE_BASE_CLASS_ATT = "base_Class";
+ /** name of property description of the stereoype Feature */
+ public static final String FEATURE_DESCRIPTION_ATT = "description";
+ /** name of property copyright of the stereoype Feature */
+ public static final String FEATURE_COPYRIGHT_ATT = "copyright";
+ /** name of property license of the stereoype Feature */
+ public static final String FEATURE_LICENSE_ATT = "license";
+ /** name of property provider of the stereoype Feature */
+ public static final String FEATURE_PROVIDER_ATT = "provider";
+ /** name of property image of the stereoype Feature */
+ public static final String FEATURE_IMAGE_ATT = "image";
+ /** name of property url of the stereoype Feature */
+ public static final String FEATURE_URL_ATT = "url";
+ /** name of property plugins of the stereoype Feature */
+ public static final String FEATURE_PLUGINS_ATT = "plugins";
+ /** name of property includedFeatures of the stereoype Feature */
+ public static final String FEATURE_INCLUDEDFEATURES_ATT = "includedFeatures";
+ /** name of property importedFeatures of the stereoype Feature */
+ public static final String FEATURE_IMPORTEDFEATURES_ATT = "importedFeatures";
+ /** name of property label of the stereoype Feature */
+ public static final String FEATURE_LABEL_ATT = "label";
+ /** name of property id of the stereoype Feature */
+ public static final String FEATURE_ID_ATT = "id";
+ /** name of property version of the stereoype Feature */
+ public static final String FEATURE_VERSION_ATT = "version";
+}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
index b49d94fdaa0..2f76edd5d0b 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
@@ -20,18 +20,32 @@
allPopups="false"
locationURI="popup:com.cea.papyrus.adl4eclipse.menu">
<command
- commandId="org.eclipse.papyrus.adltool.assistant.BundlesImportHandler"
- id="org.eclipse.papyrus.adltool.assistant.BundlesImportHandler.popup"
- label="Simple Architecture Snapshot"
+ commandId="org.eclipse.papyrus.adltool.assistant.SimplePluginModelHandler"
+ id="org.eclipse.papyrus.adltool.assistant.SimplePluginModelHandler.popup"
+ label="Model plugin architecture from Workspace"
style="push"
- tooltip="Architecture Snapshot from the workspace">
+ tooltip="Model Plugin Architecture from Workspace">
</command>
<command
- commandId="org.eclipse.papyrus.adltool.assistant.CompleteArchitectureHandler"
- id="org.eclipse.papyrus.adltool.assistant.CompleteArchitectureHandler.popup"
- label="Complete Architecture Snapshot"
+ commandId="org.eclipse.papyrus.adltool.assistant.CompletePluginModelHandler"
+ id="org.eclipse.papyrus.adltool.assistantCompletePluginModelHandler.popup"
+ label="Model plugin architecture from all possible plugins"
style="push"
- tooltip="Architecture Snapshot from the workspace">
+ tooltip="Model Plugin Architecture from all possible plugins (workpace + platform)">
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.adltool.assistant.SimpleFeatureModelHandler"
+ id="org.eclipse.papyrus.adltool.assistant.SimpleFeatureModelHandler.popup"
+ label="Model features architecture from Workspace"
+ style="push"
+ tooltip="Model features architecture from Workspace">
+ </command>
+ <command
+ commandId="org.eclipse.papyrus.adltool.assistant.ModelCompleteFeatureArchitectureHandler"
+ id="org.eclipse.papyrus.adltool.assistant.ModelCompleteFeatureArchitectureHandler.popup"
+ label="Model features architecture"
+ style="push"
+ tooltip="Model features architecture ( Workspace + Platform)">
</command>
</menuContribution>
</extension>
@@ -39,15 +53,27 @@
point="org.eclipse.ui.commands">
<command
categoryId="org.eclipse.papyrus.editor.category"
- defaultHandler="org.eclipse.papyrus.adltool.assistant.SimpleArchitecrureHandler"
- id="org.eclipse.papyrus.adltool.assistant.BundlesImportHandler"
- name="Simple Architecture Snapshot">
+ defaultHandler="org.eclipse.papyrus.adltool.assistant.ModelPluginArchitectureFromWorkspaceHandler"
+ id="org.eclipse.papyrus.adltool.assistant.SimplePluginModelHandler"
+ name="Simple plugins architecture snapshot">
+ </command>
+ <command
+ categoryId="org.eclipse.papyrus.editor.category"
+ defaultHandler="org.eclipse.papyrus.adltool.assistant.ModelCompletePluginArchitectureHandler"
+ id="org.eclipse.papyrus.adltool.assistant.CompletePluginModelHandler"
+ name="Complete plugins architecture snapshot">
+ </command>
+ <command
+ categoryId="org.eclipse.papyrus.editor.category"
+ defaultHandler="org.eclipse.papyrus.adltool.assistant.ModelFeatureArchitectureFromWorkspaceHandler"
+ id="org.eclipse.papyrus.adltool.assistant.SimpleFeatureModelHandler"
+ name="Simple Feature architecture snapshot">
</command>
<command
categoryId="org.eclipse.papyrus.editor.category"
- defaultHandler="org.eclipse.papyrus.adltool.assistant.CompleteArchitectureHandler"
- id="org.eclipse.papyrus.adltool.assistant.CompleteArchitectureHandler"
- name="Complete Architecture Snapshot">
+ defaultHandler="org.eclipse.papyrus.adltool.assistant.ModelCompleteFeatureArchitectureHandler"
+ id="org.eclipse.papyrus.adltool.assistant.ModelCompleteFeatureArchitectureHandler"
+ name="Complete Feature architecture snapshot">
</command>
</extension>
<extension
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ModelCompleteFeatureArchitectureHandler.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ModelCompleteFeatureArchitectureHandler.java
new file mode 100644
index 00000000000..0d8d5521c7e
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ModelCompleteFeatureArchitectureHandler.java
@@ -0,0 +1,78 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.adltool.assistant;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.papyrus.adltool.command.CompleteFeaturesArchitectureSnapshotCommand;
+import org.eclipse.papyrus.adltool.designer.wizard.FeatureArchitectureWizard;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Package;
+
+
+/**
+ * this handler is used to generate the feature and plugin architecture from workspace
+ *
+ */
+public class ModelCompleteFeatureArchitectureHandler extends ADLToolAbstractHandler {
+
+ public ModelCompleteFeatureArchitectureHandler() {
+ }
+
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ Element selectedElement=getSelection();
+ ServicesRegistry registry=null;
+ try {
+ registry = ServiceUtilsForHandlers.getInstance().getServiceRegistry(event);
+ } catch (ServiceException e1) {
+ e1.printStackTrace();
+ }
+ ModelSet modelSet;
+ try {
+ modelSet = registry.getService(ModelSet.class);
+ } catch (ServiceException e) {
+ throw new ExecutionException("Can't get ModelSet", e);
+ }
+ FeatureArchitectureWizard bWizard=new FeatureArchitectureWizard(false);
+ WizardDialog wizardDialog = new WizardDialog(new Shell(),bWizard);
+ if (wizardDialog.open() == Window.OK) {
+ TransactionalEditingDomain dom = modelSet.getTransactionalEditingDomain();
+ if( selectedElement instanceof Package){
+ CompleteFeaturesArchitectureSnapshotCommand comd= new CompleteFeaturesArchitectureSnapshotCommand(dom, (Package)selectedElement, bWizard.getSelectedBundle());
+ dom.getCommandStack().execute(comd);
+ }
+ }
+
+
+ return null;
+ }
+ /**
+ *
+ * @see org.eclipse.core.commands.AbstractHandler#isEnabled()
+ *
+ * @return
+ */
+ @Override
+ public boolean isEnabled() {
+ return true;
+ }
+}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/CompleteArchitectureHandler.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ModelCompletePluginArchitectureHandler.java
index 0ce0182e9ce..dbc46fb4c53 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/CompleteArchitectureHandler.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ModelCompletePluginArchitectureHandler.java
@@ -19,9 +19,8 @@ import org.eclipse.core.commands.ExecutionException;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.papyrus.adltool.command.CompleteArchitectureSnapshotCommand;
-import org.eclipse.papyrus.adltool.command.SimpleArchitectureSnapshotCommand;
-import org.eclipse.papyrus.adltool.designer.wizard.BundleArchitectureWizard;
+import org.eclipse.papyrus.adltool.command.CompletePluginsArchitectureSnapshotCommand;
+import org.eclipse.papyrus.adltool.designer.wizard.PluginArchitectureWizard;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
@@ -32,9 +31,9 @@ import org.eclipse.uml2.uml.Package;
-public class CompleteArchitectureHandler extends ADLToolAbstractHandler {
+public class ModelCompletePluginArchitectureHandler extends ADLToolAbstractHandler {
- public CompleteArchitectureHandler() {
+ public ModelCompletePluginArchitectureHandler() {
}
public Object execute(ExecutionEvent event) throws ExecutionException {
@@ -51,12 +50,12 @@ public class CompleteArchitectureHandler extends ADLToolAbstractHandler {
} catch (ServiceException e) {
throw new ExecutionException("Can't get ModelSet", e);
}
- BundleArchitectureWizard bWizard=new BundleArchitectureWizard(false);
+ PluginArchitectureWizard bWizard=new PluginArchitectureWizard(false);
WizardDialog wizardDialog = new WizardDialog(new Shell(),bWizard);
if (wizardDialog.open() == Window.OK) {
TransactionalEditingDomain dom = modelSet.getTransactionalEditingDomain();
if( selectedElement instanceof Package){
- CompleteArchitectureSnapshotCommand comd= new CompleteArchitectureSnapshotCommand(dom, (Package)selectedElement,bWizard.getSelectedBundle());
+ CompletePluginsArchitectureSnapshotCommand comd= new CompletePluginsArchitectureSnapshotCommand(dom, (Package)selectedElement,bWizard.getSelectedBundle());
dom.getCommandStack().execute(comd);
}
}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ModelFeatureArchitectureFromWorkspaceHandler.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ModelFeatureArchitectureFromWorkspaceHandler.java
new file mode 100644
index 00000000000..012376f3fb7
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ModelFeatureArchitectureFromWorkspaceHandler.java
@@ -0,0 +1,78 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.adltool.assistant;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.papyrus.adltool.command.SimpleFeaturesArchitectureSnapshotCommand;
+import org.eclipse.papyrus.adltool.designer.wizard.FeatureArchitectureWizard;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Package;
+
+
+/**
+ * this handler is used to generate the feature and plugin architecture from workspace
+ *
+ */
+public class ModelFeatureArchitectureFromWorkspaceHandler extends ADLToolAbstractHandler {
+
+ public ModelFeatureArchitectureFromWorkspaceHandler() {
+ }
+
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ Element selectedElement=getSelection();
+ ServicesRegistry registry=null;
+ try {
+ registry = ServiceUtilsForHandlers.getInstance().getServiceRegistry(event);
+ } catch (ServiceException e1) {
+ e1.printStackTrace();
+ }
+ ModelSet modelSet;
+ try {
+ modelSet = registry.getService(ModelSet.class);
+ } catch (ServiceException e) {
+ throw new ExecutionException("Can't get ModelSet", e);
+ }
+ FeatureArchitectureWizard bWizard=new FeatureArchitectureWizard(true);
+ WizardDialog wizardDialog = new WizardDialog(new Shell(),bWizard);
+ if (wizardDialog.open() == Window.OK) {
+ TransactionalEditingDomain dom = modelSet.getTransactionalEditingDomain();
+ if( selectedElement instanceof Package){
+ SimpleFeaturesArchitectureSnapshotCommand comd= new SimpleFeaturesArchitectureSnapshotCommand(dom, (Package)selectedElement, bWizard.getSelectedBundle());
+ dom.getCommandStack().execute(comd);
+ }
+ }
+
+
+ return null;
+ }
+ /**
+ *
+ * @see org.eclipse.core.commands.AbstractHandler#isEnabled()
+ *
+ * @return
+ */
+ @Override
+ public boolean isEnabled() {
+ return true;
+ }
+}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/SimpleArchitecrureHandler.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ModelPluginArchitectureFromWorkspaceHandler.java
index 382fbe5853e..2f870f942fc 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/SimpleArchitecrureHandler.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adltool/assistant/ModelPluginArchitectureFromWorkspaceHandler.java
@@ -18,8 +18,8 @@ import org.eclipse.core.commands.ExecutionException;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.papyrus.adltool.command.SimpleArchitectureSnapshotCommand;
-import org.eclipse.papyrus.adltool.designer.wizard.BundleArchitectureWizard;
+import org.eclipse.papyrus.adltool.command.SimplePluginsArchitectureSnapshotCommand;
+import org.eclipse.papyrus.adltool.designer.wizard.PluginArchitectureWizard;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
@@ -33,9 +33,9 @@ import org.eclipse.uml2.uml.Package;
* this handler is used to generate the architecture from workspace
*
*/
-public class SimpleArchitecrureHandler extends ADLToolAbstractHandler {
+public class ModelPluginArchitectureFromWorkspaceHandler extends ADLToolAbstractHandler {
- public SimpleArchitecrureHandler() {
+ public ModelPluginArchitectureFromWorkspaceHandler() {
}
public Object execute(ExecutionEvent event) throws ExecutionException {
@@ -52,12 +52,12 @@ public class SimpleArchitecrureHandler extends ADLToolAbstractHandler {
} catch (ServiceException e) {
throw new ExecutionException("Can't get ModelSet", e);
}
- BundleArchitectureWizard bWizard=new BundleArchitectureWizard(true);
+ PluginArchitectureWizard bWizard=new PluginArchitectureWizard(true);
WizardDialog wizardDialog = new WizardDialog(new Shell(),bWizard);
if (wizardDialog.open() == Window.OK) {
TransactionalEditingDomain dom = modelSet.getTransactionalEditingDomain();
if( selectedElement instanceof Package){
- SimpleArchitectureSnapshotCommand comd= new SimpleArchitectureSnapshotCommand(dom, (Package)selectedElement, bWizard.getSelectedBundle());
+ SimplePluginsArchitectureSnapshotCommand comd= new SimplePluginsArchitectureSnapshotCommand(dom, (Package)selectedElement, bWizard.getSelectedBundle());
dom.getCommandStack().execute(comd);
}
}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/CompleteFeaturesArchitectureSnapshotCommand.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/CompleteFeaturesArchitectureSnapshotCommand.java
new file mode 100644
index 00000000000..8001b072cab
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/CompleteFeaturesArchitectureSnapshotCommand.java
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.adltool.command;
+
+import java.util.ArrayList;
+
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.adltool.designer.CompleteFeatureArchitectureSnapshotDesigner;
+import org.eclipse.uml2.uml.Package;
+
+
+/**
+ * this purpose of this comment is to import all the architecture from the currentworkspace
+ *
+ */
+public class CompleteFeaturesArchitectureSnapshotCommand extends RecordingCommand {
+
+ protected Package rootPackage;
+ protected ArrayList<Object> bundleList=null;
+
+ public CompleteFeaturesArchitectureSnapshotCommand(TransactionalEditingDomain domain,Package rootPackage, ArrayList<Object> bundleList) {
+ super(domain,"Import Bundles", "Model Feature architecture from current workspace");
+ this.rootPackage=rootPackage;
+ this.bundleList=bundleList;
+ }
+
+
+
+ @Override
+ protected void doExecute() {
+ CompleteFeatureArchitectureSnapshotDesigner snapshotDesigner= new CompleteFeatureArchitectureSnapshotDesigner(rootPackage, bundleList);
+ snapshotDesigner.runImportBundles();
+ }
+
+
+}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/CompleteArchitectureSnapshotCommand.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/CompletePluginsArchitectureSnapshotCommand.java
index c3498b4b0ba..e175b651f7d 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/CompleteArchitectureSnapshotCommand.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/CompletePluginsArchitectureSnapshotCommand.java
@@ -25,11 +25,11 @@ import org.eclipse.uml2.uml.Package;
* this purpose of this comment is to import all the architecture from the currentworkspace
*
*/
-public class CompleteArchitectureSnapshotCommand extends RecordingCommand {
+public class CompletePluginsArchitectureSnapshotCommand extends RecordingCommand {
protected ArrayList<Object> bundleList=null;
protected Package rootPackage;
- public CompleteArchitectureSnapshotCommand(TransactionalEditingDomain domain,Package rootPackage, ArrayList<Object> bundleList) {
+ public CompletePluginsArchitectureSnapshotCommand(TransactionalEditingDomain domain,Package rootPackage, ArrayList<Object> bundleList) {
super(domain,"Import Bundles", "Model architecture from current workspace");
this.rootPackage=rootPackage;
this.bundleList=bundleList;
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/SimpleFeaturesArchitectureSnapshotCommand.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/SimpleFeaturesArchitectureSnapshotCommand.java
new file mode 100644
index 00000000000..c21c5541bea
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/SimpleFeaturesArchitectureSnapshotCommand.java
@@ -0,0 +1,48 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.adltool.command;
+
+import java.util.ArrayList;
+
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.adltool.designer.SimpleFeatureArchitectureSnapshotDesigner;
+import org.eclipse.uml2.uml.Package;
+
+
+/**
+ * this purpose of this comment is to import all the architecture from the currentworkspace
+ *
+ */
+public class SimpleFeaturesArchitectureSnapshotCommand extends RecordingCommand {
+
+ protected Package rootPackage;
+ protected ArrayList<Object> bundleList=null;
+
+ public SimpleFeaturesArchitectureSnapshotCommand(TransactionalEditingDomain domain,Package rootPackage, ArrayList<Object> bundleList) {
+ super(domain,"Import Bundles", "Model Feature architecture from current workspace");
+ this.rootPackage=rootPackage;
+ this.bundleList=bundleList;
+ }
+
+
+
+ @Override
+ protected void doExecute() {
+ SimpleFeatureArchitectureSnapshotDesigner snapshotDesigner= new SimpleFeatureArchitectureSnapshotDesigner(rootPackage, bundleList);
+ snapshotDesigner.runImportBundles();
+ }
+
+
+}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/SimpleArchitectureSnapshotCommand.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/SimplePluginsArchitectureSnapshotCommand.java
index 4f6c5ed4e0d..0ece183e722 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/SimpleArchitectureSnapshotCommand.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/command/SimplePluginsArchitectureSnapshotCommand.java
@@ -25,12 +25,12 @@ import org.eclipse.uml2.uml.Package;
* this purpose of this comment is to import all the architecture from the currentworkspace
*
*/
-public class SimpleArchitectureSnapshotCommand extends RecordingCommand {
+public class SimplePluginsArchitectureSnapshotCommand extends RecordingCommand {
protected Package rootPackage;
protected ArrayList<Object> bundleList=null;
- public SimpleArchitectureSnapshotCommand(TransactionalEditingDomain domain,Package rootPackage, ArrayList<Object> bundleList) {
+ public SimplePluginsArchitectureSnapshotCommand(TransactionalEditingDomain domain,Package rootPackage, ArrayList<Object> bundleList) {
super(domain,"Import Bundles", "Model architecture from current workspace");
this.rootPackage=rootPackage;
this.bundleList=bundleList;
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java
index 0e5f92292b9..efe620f1732 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java
@@ -14,6 +14,7 @@
package org.eclipse.papyrus.adltool.designer;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
@@ -32,6 +33,8 @@ import org.eclipse.papyrus.uml.extensionpoints.utils.Util;
import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
import org.eclipse.pde.core.project.IBundleProjectDescription;
import org.eclipse.pde.core.project.IBundleProjectService;
+import org.eclipse.pde.internal.core.PDECore;
+import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
import org.eclipse.uml2.uml.Component;
import org.eclipse.uml2.uml.Dependency;
import org.eclipse.uml2.uml.Package;
@@ -42,38 +45,50 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.VersionRange;
-
+//CreateFeatureProjectOperation
+//PDECore.getDefault().getFeatureModelManager()
/**
- * this purpose of this class is to provide mechanism to import bundle inot model
+ * this purpose of this class is to provide mechanism to import bundle into model
*
*/
public abstract class ArchitectureSnapshotDesigner{
protected HashMap<String, Component> createdBundleIndex=null;
protected HashMap<String, Object> bundlesIndex=null;
+ protected HashMap<String, Object> featureIndex=null;
protected BundleDesignerRegistry bundleDesignerRegistry=null;
protected int dependenciesN=0;
protected ArrayList<Object>bundleInitialList=null;
+
/**
* The key used to designate the buddy loader associated with a given bundle.
*/
protected Package rootPackage;
- public ArchitectureSnapshotDesigner (Package rootPackage) {
+ private ArchitectureSnapshotDesigner (Package rootPackage) {
this.rootPackage=rootPackage;
createdBundleIndex= new HashMap<String, Component>();
+ featureIndex= new HashMap<String, Object>();
bundleDesignerRegistry= new BundleDesignerRegistry();
}
+ /**
+ *
+ * Constructor.
+ *
+ * @param rootPackage
+ * @param bundleInitialList must not be null
+ */
public ArchitectureSnapshotDesigner (Package rootPackage, ArrayList<Object>bundleInitialList) {
this(rootPackage);
+ assert(bundleInitialList!=null);
this.bundleInitialList=bundleInitialList;
-
+
}
-
+
public abstract void runImportBundles();
/**
@@ -114,144 +129,194 @@ public abstract class ArchitectureSnapshotDesigner{
return bundleProjectList;
}
+ /**
+ *
+ * @return the list of bundle description contained in the workspace
+ */
+ public static ArrayList<Object>getWorkspaceFeature(){
+ ArrayList<Object> featureList= new ArrayList<Object>();
+ IFeatureModel[] featureModels=PDECore.getDefault().getFeatureModelManager().getWorkspaceModels();
+ featureList.addAll(Arrays.asList(featureModels));
+ return featureList;
+ }
-
+ /**
+ *
+ * @return the list of bundle description contained in the workspace
+ */
+ public static ArrayList<Object>getFeature(){
+ ArrayList<Object> featureList= new ArrayList<Object>();
+ IFeatureModel[] featureModels=PDECore.getDefault().getFeatureModelManager().getModels();
+ featureList.addAll(Arrays.asList(featureModels));
+ return featureList;
+ }
/**
* model all bundle contained in the workspaces
* @param pluginPackage the name of UML package that represent the plugin
*/
- protected void modelPlugins(Package pluginPackage){
+ protected void modelBundles(Package pluginPackage){
ArrayList<Object> bundleProjects= new ArrayList<Object>();
- if(bundleInitialList==null){
- bundleProjects.addAll(getWorkspaceBundle());
- }
- else{
- bundleProjects.addAll(bundleInitialList);
- }
+ bundleProjects.addAll(bundleInitialList);
Iterator<Object> bundleProjectsIterator= bundleProjects.iterator();
while(bundleProjectsIterator.hasNext()) {
Object bundleProject = (Object)bundleProjectsIterator.next();
- modelPlugin(pluginPackage, bundleProject);
+ modelBundle(pluginPackage, bundleProject);
}
System.out.println("created bundles numbers: "+createdBundleIndex.keySet().size());
System.out.println("dependenciess: "+dependenciesN);
}
+// protected void modelWorkspaceFeatures(Package pluginPackage, boolean createAll){
+// // IFeatureModel[] featureModels=PDECore.getDefault().getFeatureModelManager().getModels();
+// IFeatureModel[] featureModels=PDECore.getDefault().getFeatureModelManager().getWorkspaceModels();
+// for(int i = 0; i < featureModels.length; i++) {
+// modelAFeature(pluginPackage,featureModels[i], createAll);
+// }
+//
+// }
+// protected void modelPlatformFeatures(Package pluginPackage, boolean createAll){
+// // IFeatureModel[] featureModels=PDECore.getDefault().getFeatureModelManager().getModels();
+// IFeatureModel[] featureModels=PDECore.getDefault().getFeatureModelManager().getModels();
+// for(int i = 0; i < featureModels.length; i++) {
+// modelAFeature(pluginPackage,featureModels[i], createAll);
+// }
+//
+// }
+// protected void modelAFeature(Package pluginPackage, IFeatureModel featureModel, boolean createAll){
+//
+// Component bundleComponent= UMLFactory.eINSTANCE.createComponent();
+// bundleComponent.setName(featureModel.getFeature().getId());
+// pluginPackage.getPackagedElements().add(bundleComponent);
+// Stereotype featureStereotype=bundleComponent.getApplicableStereotype(IADL4ECLIPSE_Stereotype.FEATURE_STEREOTYPE);
+// bundleComponent.applyStereotype(featureStereotype);
+// bundleComponent.setValue(featureStereotype, IADL4ECLIPSE_Stereotype.FEATURE_ID_ATT,featureModel.getFeature().getId());
+// bundleComponent.setValue(featureStereotype, IADL4ECLIPSE_Stereotype.FEATURE_VERSION_ATT,featureModel.getFeature().getVersion());
+// //bundleComponent.setValue(featureStereotype, IADL4ECLIPSE_Stereotype.FEATURE_COPYRIGHT_ATT,featureModel.getFeature().getVersion());
+// //bundleComponent.setValue(featureStereotype, IADL4ECLIPSE_Stereotype.FEATURE_DESCRIPTION_ATT,featureModel.getFeature().get);
+// bundleComponent.setValue(featureStereotype, IADL4ECLIPSE_Stereotype.FEATURE_IMAGE_ATT,featureModel.getFeature().getImageName());
+// bundleComponent.setValue(featureStereotype, IADL4ECLIPSE_Stereotype.FEATURE_LABEL_ATT,featureModel.getFeature().getLabel());
+// bundleComponent.setValue(featureStereotype, IADL4ECLIPSE_Stereotype.FEATURE_LICENSE_ATT,featureModel.getFeature().getLicenseFeatureID());
+// bundleComponent.setValue(featureStereotype, IADL4ECLIPSE_Stereotype.FEATURE_PROVIDER_ATT,featureModel.getFeature().getProviderName());
+// //bundleComponent.setValue(featureStereotype, IADL4ECLIPSE_Stereotype.FEATURE_URL_ATT,featureModel.getFeature().getURL());
+//
+// }
- /**
- * Model a bundle into the plugins packages:
- * <UL>
- * <LI> model the bundle as a stereotyped UML component
- * <LI>add links to required bundle
- * <LI> fill information about exported packages
- * </UL>
- *
- *
- * @param pluginPackage
- * @param bundleProjectsIterator
- */
- protected void modelPlugin(Package pluginPackage, Object bundleProject) {
-
- if(!createdBundleIndex.containsKey(bundleDesignerRegistry.getSymbolicName(bundleProject))){
- Component bundleComponent= UMLFactory.eINSTANCE.createComponent();
- System.out.println("-->"+bundleDesignerRegistry.getSymbolicName(bundleProject));
- bundleComponent.setName(bundleDesignerRegistry.getSymbolicName(bundleProject));
- pluginPackage.getPackagedElements().add(bundleComponent);
- Stereotype pluginStereotype=bundleComponent.getApplicableStereotype(IADL4ECLIPSE_Stereotype.PLUGIN_STEREOTYPE);
- bundleComponent.applyStereotype(pluginStereotype);
- //add in the index of bundles
- createdBundleIndex.put(bundleDesignerRegistry.getSymbolicName(bundleProject), bundleComponent);
- fillRequiredBundle(bundleComponent, bundleProject, pluginPackage);
- bundleDesignerRegistry.fillPluginProperties(bundleComponent, bundleProject);
- bundleDesignerRegistry.fillExportedPackages(bundleComponent, bundleProject);
- }
+
+
+/**
+ * Model a bundle into the plugins packages:
+ * <UL>
+ * <LI> model the bundle as a stereotyped UML component
+ * <LI>add links to required bundle
+ * <LI> fill information about exported packages
+ * </UL>
+ *
+ *
+ * @param pluginPackage
+ * @param bundleProjectsIterator
+ */
+protected void modelBundle(Package pluginPackage, Object bundleProject) {
+
+ if(!createdBundleIndex.containsKey(bundleDesignerRegistry.getSymbolicName(bundleProject))){
+ Component bundleComponent= UMLFactory.eINSTANCE.createComponent();
+ System.out.println("-->"+bundleDesignerRegistry.getSymbolicName(bundleProject));
+ bundleComponent.setName(bundleDesignerRegistry.getSymbolicName(bundleProject));
+ pluginPackage.getPackagedElements().add(bundleComponent);
+ Stereotype pluginStereotype=bundleComponent.getApplicableStereotype(IADL4ECLIPSE_Stereotype.PLUGIN_STEREOTYPE);
+ bundleComponent.applyStereotype(pluginStereotype);
+ //add in the index of bundles
+ createdBundleIndex.put(bundleDesignerRegistry.getSymbolicName(bundleProject), bundleComponent);
+ fillRequiredBundle(bundleComponent, bundleProject, pluginPackage);
+ bundleDesignerRegistry.fillPluginProperties(bundleComponent, bundleProject);
+ bundleDesignerRegistry.fillExportedPackages(bundleComponent, bundleProject);
}
+}
- /**
- * Ensure that the profile ADL4 eclipse has been applied
- */
- protected void initModel(){
- RegisteredProfile registeredProfile=RegisteredProfile.getRegisteredProfile("ADL4Eclipse");
- if(registeredProfile!=null){
- URI modelUri = registeredProfile.uri;
- final Resource modelResource = Util.getResourceSet(rootPackage).getResource(modelUri, true);
- Profile adl4eclipseprofile=(Profile) modelResource.getContents().get(0);
- PackageUtil.applyProfile(rootPackage, adl4eclipseprofile, false);
- }
+/**
+ * Ensure that the profile ADL4 eclipse has been applied
+ */
+protected void initModel(){
+ RegisteredProfile registeredProfile=RegisteredProfile.getRegisteredProfile("ADL4Eclipse");
+ if(registeredProfile!=null){
+ URI modelUri = registeredProfile.uri;
+ final Resource modelResource = Util.getResourceSet(rootPackage).getResource(modelUri, true);
+ Profile adl4eclipseprofile=(Profile) modelResource.getContents().get(0);
+ PackageUtil.applyProfile(rootPackage, adl4eclipseprofile, false);
}
+}
- protected Object getBundle(String name){
- if(bundlesIndex==null){
- bundlesIndex= new HashMap<String, Object>();
- //loaded bundle
- BundleContext context = Activator.getDefault().getBundleContext();
- org.osgi.framework.Bundle[] bundles = context.getBundles();
- for(int i = 0; i < bundles.length; i++) {
- bundlesIndex.put(bundleDesignerRegistry.getSymbolicName(bundles[i]), bundles[i]);
- }
- IProject[] project=ResourcesPlugin.getWorkspace().getRoot().getProjects();
- //bundle Workspace
- ServiceReference<?> ref = context.getServiceReference(IBundleProjectService.class.getName());
- IBundleProjectService BundleProjectservice = (IBundleProjectService)context.getService(ref);
- for(int i = 0; i < project.length; i++) {
- try {
- if((project[i].getNature(IBundleProjectDescription.PLUGIN_NATURE))!=null){
- IBundleProjectDescription bundleDescription=BundleProjectservice.getDescription(project[i]);
- bundlesIndex.put(bundleDesignerRegistry.getSymbolicName(bundleDescription), bundleDescription);
- }
- } catch (CoreException e) {
- e.printStackTrace();
+protected Object getBundle(String name){
+ if(bundlesIndex==null){
+ bundlesIndex= new HashMap<String, Object>();
+ //loaded bundle
+ BundleContext context = Activator.getDefault().getBundleContext();
+ org.osgi.framework.Bundle[] bundles = context.getBundles();
+ for(int i = 0; i < bundles.length; i++) {
+ bundlesIndex.put(bundleDesignerRegistry.getSymbolicName(bundles[i]), bundles[i]);
+ }
+ IProject[] project=ResourcesPlugin.getWorkspace().getRoot().getProjects();
+ //bundle Workspace
+ ServiceReference<?> ref = context.getServiceReference(IBundleProjectService.class.getName());
+ IBundleProjectService BundleProjectservice = (IBundleProjectService)context.getService(ref);
+ for(int i = 0; i < project.length; i++) {
+ try {
+ if((project[i].getNature(IBundleProjectDescription.PLUGIN_NATURE))!=null){
+ IBundleProjectDescription bundleDescription=BundleProjectservice.getDescription(project[i]);
+ bundlesIndex.put(bundleDesignerRegistry.getSymbolicName(bundleDescription), bundleDescription);
}
+ } catch (CoreException e) {
+ e.printStackTrace();
}
-
}
- return bundlesIndex.get(name);
-
}
- /**
- * Model the required bundle. if it not exist the bundle is modeling.
- * It create a stereotyped dependency to the required element
- * @param bundleComponent the description of the bundle
- * @param bundleProject
- */
- protected void fillRequiredBundle(Component bundleComponent,Object bundleProject,Package library ) {
- ArrayList<ReferencedOSGIElement> requiredBundleNameList=bundleDesignerRegistry.getRequiredBundle(bundleComponent, bundleProject);
- Iterator<ReferencedOSGIElement> bundleNameIterator= requiredBundleNameList.iterator();
- while(bundleNameIterator.hasNext()) {
- dependenciesN++;
- ReferencedOSGIElement bundleRef = (ReferencedOSGIElement)bundleNameIterator.next();
- if(!(createdBundleIndex.containsKey(bundleRef.getSymbolicName()))){
- modelPlugin(library, getBundle(bundleRef.getSymbolicName()));
- }
- Component requiredComponent=createdBundleIndex.get(bundleRef.getSymbolicName());
- Dependency dependency=UMLFactory.eINSTANCE.createDependency();
- dependency.setName(requiredComponent.getName());
- bundleComponent.getPackagedElements().add(dependency);
- dependency.getClients().add(bundleComponent);
- dependency.getSuppliers().add(requiredComponent);
- Stereotype bRef_stereotype= dependency.getApplicableStereotype(IOSGIStereotype.BUNDLEREFERENCE_);
- dependency.applyStereotype(bRef_stereotype);
- VersionRange versionRange=bundleRef.getVersion();
- if( versionRange!=null){
- if( versionRange.getRight()==null){
- dependency.setValue(bRef_stereotype, IOSGIStereotype.VERSIONRANGE_ATLEAST_ATT, versionRange.getLeft().toString());
- System.out.println(" "+versionRange.getLeft());
- }
- else{
- dependency.setValue(bRef_stereotype, IOSGIStereotype.VERSIONRANGE_FLOOR_ATT, versionRange.getLeft().toString());
- dependency.setValue(bRef_stereotype, IOSGIStereotype.VERSIONRANGE_CEILING_ATT, versionRange.getRight().toString());
- dependency.setValue(bRef_stereotype, IOSGIStereotype.VERSIONRANGE_INCLUDEFLOOR_ATT, versionRange.getRightType()==VersionRange.LEFT_OPEN);
- dependency.setValue(bRef_stereotype, IOSGIStereotype.VERSIONRANGE_INCLUDECEILING_ATT, versionRange.getRightType()==VersionRange.RIGHT_OPEN);
- System.out.println(" "+versionRange.getRight()+" "+versionRange.getLeft());
- }
- }
+
+ return bundlesIndex.get(name);
+
+}
+/**
+ * Model the required bundle. if it not exist the bundle is modeling.
+ * It create a stereotyped dependency to the required element
+ * @param bundleComponent the description of the bundle
+ * @param bundleProject
+ */
+protected void fillRequiredBundle(Component bundleComponent,Object bundleProject,Package library ) {
+ ArrayList<ReferencedOSGIElement> requiredBundleNameList=bundleDesignerRegistry.getRequiredBundle(bundleComponent, bundleProject);
+ Iterator<ReferencedOSGIElement> bundleNameIterator= requiredBundleNameList.iterator();
+ while(bundleNameIterator.hasNext()) {
+ dependenciesN++;
+ ReferencedOSGIElement bundleRef = (ReferencedOSGIElement)bundleNameIterator.next();
+ if(!(createdBundleIndex.containsKey(bundleRef.getSymbolicName()))){
+ modelBundle(library, getBundle(bundleRef.getSymbolicName()));
+ }
+ Component requiredComponent=createdBundleIndex.get(bundleRef.getSymbolicName());
+ Dependency dependency=UMLFactory.eINSTANCE.createDependency();
+ dependency.setName(requiredComponent.getName());
+ bundleComponent.getPackagedElements().add(dependency);
+ dependency.getClients().add(bundleComponent);
+ dependency.getSuppliers().add(requiredComponent);
+ Stereotype bRef_stereotype= dependency.getApplicableStereotype(IOSGIStereotype.BUNDLEREFERENCE_);
+ dependency.applyStereotype(bRef_stereotype);
+ VersionRange versionRange=bundleRef.getVersion();
+ if( versionRange!=null){
+ if( versionRange.getRight()==null){
+ dependency.setValue(bRef_stereotype, IOSGIStereotype.VERSIONRANGE_ATLEAST_ATT, versionRange.getLeft().toString());
+ System.out.println(" "+versionRange.getLeft());
+ }
+ else{
+ dependency.setValue(bRef_stereotype, IOSGIStereotype.VERSIONRANGE_FLOOR_ATT, versionRange.getLeft().toString());
+ dependency.setValue(bRef_stereotype, IOSGIStereotype.VERSIONRANGE_CEILING_ATT, versionRange.getRight().toString());
+ dependency.setValue(bRef_stereotype, IOSGIStereotype.VERSIONRANGE_INCLUDEFLOOR_ATT, versionRange.getRightType()==VersionRange.LEFT_OPEN);
+ dependency.setValue(bRef_stereotype, IOSGIStereotype.VERSIONRANGE_INCLUDECEILING_ATT, versionRange.getRightType()==VersionRange.RIGHT_OPEN);
+ System.out.println(" "+versionRange.getRight()+" "+versionRange.getLeft());
+ }
}
}
+}
}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteArchitectureSnapshotDesigner.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteArchitectureSnapshotDesigner.java
index 50e1788529f..1d9a0ee5f50 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteArchitectureSnapshotDesigner.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteArchitectureSnapshotDesigner.java
@@ -24,9 +24,6 @@ import org.eclipse.uml2.uml.Package;
public class CompleteArchitectureSnapshotDesigner extends ArchitectureSnapshotDesigner {
- public CompleteArchitectureSnapshotDesigner(Package rootPackage) {
- super(rootPackage);
- }
public CompleteArchitectureSnapshotDesigner(Package rootPackage, ArrayList<Object>bundleInitialList) {
super(rootPackage, bundleInitialList);
@@ -39,6 +36,6 @@ import org.eclipse.uml2.uml.Package;
@Override
public void runImportBundles() {
initModel();
- modelPlugins(rootPackage);
+ modelBundles(rootPackage);
}
}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteFeatureArchitectureSnapshotDesigner.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteFeatureArchitectureSnapshotDesigner.java
new file mode 100644
index 00000000000..f5c413b5b11
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteFeatureArchitectureSnapshotDesigner.java
@@ -0,0 +1,66 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.adltool.designer;
+
+import java.util.ArrayList;
+
+import org.eclipse.papyrus.adl4eclipse.org.IADL4ECLIPSE_Stereotype;
+import org.eclipse.uml2.uml.Component;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * designer to construct the architecture of feature from the workspace and platform
+ *
+ */
+public class CompleteFeatureArchitectureSnapshotDesigner extends ArchitectureSnapshotDesigner {
+
+ public CompleteFeatureArchitectureSnapshotDesigner(Package rootPackage, ArrayList<Object> bundleInitialList) {
+ super(rootPackage, bundleInitialList);
+ }
+ @Override
+ public void runImportBundles() {
+ initModel();
+ modelBundles(rootPackage);
+ }
+ /**
+ * Model a bundle into the plugins packages:
+ * <UL>
+ * <LI> model the bundle as a stereotyped UML component
+ * <LI>add links to required bundle
+ * <LI> fill information about exported packages
+ * </UL>
+ *
+ *
+ * @param pluginPackage
+ * @param bundleProjectsIterator
+ */
+ protected void modelBundle(Package pluginPackage, Object bundleProject) {
+
+ if(!createdBundleIndex.containsKey(bundleDesignerRegistry.getSymbolicName(bundleProject))){
+ Component bundleComponent= UMLFactory.eINSTANCE.createComponent();
+ System.out.println("-->"+bundleDesignerRegistry.getSymbolicName(bundleProject));
+ bundleComponent.setName(bundleDesignerRegistry.getSymbolicName(bundleProject));
+ pluginPackage.getPackagedElements().add(bundleComponent);
+ Stereotype pluginStereotype=bundleComponent.getApplicableStereotype(IADL4ECLIPSE_Stereotype.FEATURE_STEREOTYPE);
+ bundleComponent.applyStereotype(pluginStereotype);
+ //add in the index of bundles
+ createdBundleIndex.put(bundleDesignerRegistry.getSymbolicName(bundleProject), bundleComponent);
+ fillRequiredBundle(bundleComponent, bundleProject, pluginPackage);
+ //bundleDesignerRegistry.fillPluginProperties(bundleComponent, bundleProject);
+ //bundleDesignerRegistry.fillExportedPackages(bundleComponent, bundleProject);
+ }
+ }
+}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/SimpleArchitectureSnapshotDesigner.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/SimpleArchitectureSnapshotDesigner.java
index 9a9182d698d..e1b1eddf297 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/SimpleArchitectureSnapshotDesigner.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/SimpleArchitectureSnapshotDesigner.java
@@ -27,9 +27,8 @@ public class SimpleArchitectureSnapshotDesigner extends ArchitectureSnapshotDesi
protected Package architecture;
protected Package platform;
- public SimpleArchitectureSnapshotDesigner(Package rootPackage) {
- super(rootPackage);
- }
+ protected Package architecturefeature;
+ protected Package platformfeature;
public SimpleArchitectureSnapshotDesigner(Package rootPackage, ArrayList<Object>bundleInitialList) {
@@ -41,21 +40,23 @@ public class SimpleArchitectureSnapshotDesigner extends ArchitectureSnapshotDesi
super.initModel();
architecture=rootPackage.createNestedPackage("Architecture");
platform=rootPackage.createNestedPackage("Platform");
+
}
@Override
public void runImportBundles() {
initModel();
- modelPlugins(architecture);
+ modelBundles(architecture);
+
}
@Override
- protected void modelPlugin(Package pluginPackage, Object bundleProject) {
+ protected void modelBundle(Package pluginPackage, Object bundleProject) {
if (bundleProject instanceof Bundle){
- super.modelPlugin(platform, bundleProject);
+ super.modelBundle(platform, bundleProject);
}
else{
- super.modelPlugin(architecture, bundleProject);
+ super.modelBundle(architecture, bundleProject);
}
}
}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/SimpleFeatureArchitectureSnapshotDesigner.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/SimpleFeatureArchitectureSnapshotDesigner.java
new file mode 100644
index 00000000000..1bedd942c28
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/SimpleFeatureArchitectureSnapshotDesigner.java
@@ -0,0 +1,53 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.adltool.designer;
+
+import java.util.ArrayList;
+
+import org.eclipse.uml2.uml.Package;
+
+/**
+ * Designer to construct the architecture of feature from the workspace.
+ *
+ */
+public class SimpleFeatureArchitectureSnapshotDesigner extends CompleteFeatureArchitectureSnapshotDesigner {
+
+
+ protected Package architecture;
+ protected Package platform;
+ protected Package architecturefeature;
+ protected Package platformfeature;
+
+ public SimpleFeatureArchitectureSnapshotDesigner(Package rootPackage, ArrayList<Object> bundleInitialList) {
+ super(rootPackage, bundleInitialList);
+ }
+
+
+
+ @Override
+ protected void initModel() {
+ super.initModel();
+ architecture=rootPackage.createNestedPackage("Architecture");
+ platform=rootPackage.createNestedPackage("Platform");
+
+ }
+
+ @Override
+ public void runImportBundles() {
+ initModel();
+ modelBundles(architecture);
+
+ }
+
+}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/BundleDesignerRegistry.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/BundleDesignerRegistry.java
index dd90bb9d1d6..d82f53cc44c 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/BundleDesignerRegistry.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/BundleDesignerRegistry.java
@@ -16,6 +16,7 @@ package org.eclipse.papyrus.adltool.designer.bundle;
import java.util.ArrayList;
import org.eclipse.pde.core.project.IBundleProjectDescription;
+import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
import org.eclipse.uml2.uml.Component;
import org.osgi.framework.Bundle;
@@ -27,11 +28,13 @@ import org.osgi.framework.Bundle;
public class BundleDesignerRegistry implements IBundleDescriptionDesigner{
protected WorkspaceBundleDescriptionDesigner workspaceBundleDescriptionDesigner;
protected LoadedBundleDescriptionDesigner loadedBundleDescriptionDesigner;
+ protected FeatureDescriptionDesigner featureDescriptionDesigner;
public BundleDesignerRegistry() {
workspaceBundleDescriptionDesigner= new WorkspaceBundleDescriptionDesigner();
loadedBundleDescriptionDesigner= new LoadedBundleDescriptionDesigner();
+ featureDescriptionDesigner =new FeatureDescriptionDesigner();
}
/**
@@ -50,6 +53,9 @@ public class BundleDesignerRegistry implements IBundleDescriptionDesigner{
else if(bundleProject instanceof Bundle){
return loadedBundleDescriptionDesigner.getBundleValue(bundleProject, key);
}
+ else if(bundleProject instanceof IFeatureModel){
+ return featureDescriptionDesigner.getBundleValue(bundleProject, key);
+ }
return null;
}
@@ -68,6 +74,9 @@ public class BundleDesignerRegistry implements IBundleDescriptionDesigner{
else if(bundleProject instanceof Bundle){
loadedBundleDescriptionDesigner.fillPluginProperties(bundleComponent, bundleProject);
}
+ else if(bundleProject instanceof IFeatureModel){
+ featureDescriptionDesigner.fillPluginProperties(bundleComponent, bundleProject);
+ }
}
/**
@@ -85,6 +94,9 @@ public class BundleDesignerRegistry implements IBundleDescriptionDesigner{
else if(bundleProject instanceof Bundle){
return loadedBundleDescriptionDesigner.getSymbolicName(bundleProject);
}
+ else if(bundleProject instanceof IFeatureModel){
+ return featureDescriptionDesigner.getSymbolicName(bundleProject);
+ }
return null;
}
@@ -103,6 +115,9 @@ public class BundleDesignerRegistry implements IBundleDescriptionDesigner{
else if(bundleProject instanceof Bundle){
loadedBundleDescriptionDesigner.fillExportedPackages(bundleComponent, bundleProject);
}
+ else if(bundleProject instanceof IFeatureModel){
+ featureDescriptionDesigner.fillExportedPackages(bundleComponent, bundleProject);
+ }
}
/**
@@ -121,6 +136,9 @@ public class BundleDesignerRegistry implements IBundleDescriptionDesigner{
else if(bundleProject instanceof Bundle){
return loadedBundleDescriptionDesigner.getRequiredBundle(bundleComponent, bundleProject);
}
+ else if(bundleProject instanceof IFeatureModel){
+ return featureDescriptionDesigner.getRequiredBundle(bundleComponent, bundleProject);
+ }
return new ArrayList<ReferencedOSGIElement>();
}
}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/BundleLabelProvider.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/BundleLabelProvider.java
index a5d36452bce..4f39509bc1f 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/BundleLabelProvider.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/BundleLabelProvider.java
@@ -17,6 +17,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.pde.core.project.IBundleProjectDescription;
+import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.Bundle;
@@ -37,6 +38,10 @@ public class BundleLabelProvider extends LabelProvider {
else if(bundleProject instanceof Bundle){
return getImage("img/bundle_obj.gif");
}
+ else if(bundleProject instanceof IFeatureModel){
+ return getImage("img/bundle_obj.gif");
+ }
+
return super.getImage(bundleProject);
}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/FeatureDescriptionDesigner.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/FeatureDescriptionDesigner.java
new file mode 100644
index 00000000000..8ca8939fe4f
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/FeatureDescriptionDesigner.java
@@ -0,0 +1,33 @@
+package org.eclipse.papyrus.adltool.designer.bundle;
+
+import java.util.ArrayList;
+
+import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
+import org.eclipse.uml2.uml.Component;
+
+
+public class FeatureDescriptionDesigner extends AbstractBundleDescriptionDesigner {
+
+ public String getSymbolicName(Object bundleProject) {
+ if(bundleProject instanceof IFeatureModel){
+ return ((IFeatureModel)bundleProject).getFeature().getId();
+ }
+ return null;
+ }
+
+ public void fillExportedPackages(Component bundleComponent, Object bundleProject) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public ArrayList<ReferencedOSGIElement> getRequiredBundle(Component bundleComponent, Object bundleProject) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getBundleValue(Object bundleProject, String key) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/LoadedBundleDescriptionDesigner.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/LoadedBundleDescriptionDesigner.java
index 09c2256c8d2..a0876921e9d 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/LoadedBundleDescriptionDesigner.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/LoadedBundleDescriptionDesigner.java
@@ -19,8 +19,6 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.osgi.util.ManifestElement;
import org.eclipse.papyrus.adl4eclipse.org.IADL4ECLIPSE_Stereotype;
import org.eclipse.papyrus.osgi.profile.IOSGIStereotype;
-import org.eclipse.pde.core.project.IBundleProjectDescription;
-import org.eclipse.pde.core.project.IPackageExportDescription;
import org.eclipse.uml2.uml.Component;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.Stereotype;
@@ -70,7 +68,7 @@ public class LoadedBundleDescriptionDesigner extends AbstractBundleDescriptionDe
UMLPackage.setName(manisfests[i].getValue());
bundleComponent.getPackagedElements().add(UMLPackage);
- Stereotype exportedPackageStereotype=UMLPackage.getApplicableStereotype(IADL4ECLIPSE_Stereotype.ECLIPSEEXPORTEDPACKAGE_);
+ Stereotype exportedPackageStereotype=UMLPackage.getApplicableStereotype(IADL4ECLIPSE_Stereotype.ECLIPSEEXPORTEDPACKAGE_STEREOTYPE);
UMLPackage.applyStereotype(exportedPackageStereotype);
if((manisfests[i].getDirective("x-internal"))!=null){
String booleanString=(manisfests[i].getDirective("x-internal"));
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/WorkspaceBundleDescriptionDesigner.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/WorkspaceBundleDescriptionDesigner.java
index fc592b963b1..8348e041a6e 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/WorkspaceBundleDescriptionDesigner.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/bundle/WorkspaceBundleDescriptionDesigner.java
@@ -89,7 +89,7 @@ public class WorkspaceBundleDescriptionDesigner extends AbstractBundleDescriptio
Package UMLPackage=UMLFactory.eINSTANCE.createPackage();
UMLPackage.setName(packageExportDescription[i].getName());
bundleComponent.getPackagedElements().add(UMLPackage);
- Stereotype exportedPackageStereotype=UMLPackage.getApplicableStereotype(IADL4ECLIPSE_Stereotype.ECLIPSEEXPORTEDPACKAGE_);
+ Stereotype exportedPackageStereotype=UMLPackage.getApplicableStereotype(IADL4ECLIPSE_Stereotype.ECLIPSEEXPORTEDPACKAGE_STEREOTYPE);
UMLPackage.applyStereotype(exportedPackageStereotype);
UMLPackage.setValue(exportedPackageStereotype, IADL4ECLIPSE_Stereotype.ECLIPSEEXPORTEDPACKAGE_ISINTERNAL_ATT, !packageExportDescription[i].isApi());
//TODO:friends
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/wizard/FeatureArchitectureWizard.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/wizard/FeatureArchitectureWizard.java
new file mode 100644
index 00000000000..1b6d01646a9
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/wizard/FeatureArchitectureWizard.java
@@ -0,0 +1,44 @@
+/*****************************************************************************
+ * Copyright (c) 2013 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Patrick Tessier (CEA LIST) patrick.tessier@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.adltool.designer.wizard;
+
+import java.util.ArrayList;
+
+import org.eclipse.papyrus.adltool.designer.ArchitectureSnapshotDesigner;
+
+/**
+ * this wizard is used to display feature from workspace and the platform
+ *
+ */
+public class FeatureArchitectureWizard extends PluginArchitectureWizard {
+
+ public FeatureArchitectureWizard(boolean onlyWorkspace) {
+ super(onlyWorkspace);
+ }
+
+ @Override
+ public void addPages() {
+ ArrayList<Object> bundleList= new ArrayList<Object>();
+ if(onlyWorkspace){
+ bundleList.addAll(ArchitectureSnapshotDesigner.getWorkspaceFeature());
+ }
+ else{
+ bundleList.addAll(ArchitectureSnapshotDesigner.getFeature());
+ }
+ bundleSelectionPage = new BundleSelectionPage(bundleList);
+ addPage(bundleSelectionPage);
+ }
+
+}
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/wizard/BundleArchitectureWizard.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/wizard/PluginArchitectureWizard.java
index 0582ae0048e..0e31f5dde22 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/wizard/BundleArchitectureWizard.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/wizard/PluginArchitectureWizard.java
@@ -20,14 +20,17 @@ import java.util.ArrayList;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.papyrus.adltool.designer.ArchitectureSnapshotDesigner;
+/**
+ * this wizard is used to display plugin from workspace and the platform
+ *
+ */
-
-public class BundleArchitectureWizard extends Wizard {
+public class PluginArchitectureWizard extends Wizard {
protected BundleSelectionPage bundleSelectionPage;
protected boolean onlyWorkspace=true;
- public BundleArchitectureWizard(boolean onlyWorkspace) {
+ public PluginArchitectureWizard(boolean onlyWorkspace) {
super();
setNeedsProgressMonitor(true);
this.onlyWorkspace=onlyWorkspace;

Back to the top