401703: Create adl4eclipse profile

https://bugs.eclipse.org/bugs/show_bug.cgi?id=401703

9 files changed, 521 insertions, 8 deletions

diff --git a/doc/DevelopperDocuments/extraplugins/ADL4eclipse/docs/ADL4EclipseDevelopperDoc.docx b/doc/DevelopperDocuments/extraplugins/ADL4eclipse/docs/ADL4EclipseDevelopperDoc.docx
index abda766ff83..48591d02f44 100644
--- a/doc/DevelopperDocuments/extraplugins/ADL4eclipse/docs/ADL4EclipseDevelopperDoc.docx
+++ b/doc/DevelopperDocuments/extraplugins/ADL4eclipse/docs/ADL4EclipseDevelopperDoc.docx
diff --git a/doc/DevelopperDocuments/extraplugins/ADL4eclipse/model/adl4eclipse.notation b/doc/DevelopperDocuments/extraplugins/ADL4eclipse/model/adl4eclipse.notation
index 7eb1128e74b..52f269a7ee3 100644
--- a/doc/DevelopperDocuments/extraplugins/ADL4eclipse/model/adl4eclipse.notation
+++ b/doc/DevelopperDocuments/extraplugins/ADL4eclipse/model/adl4eclipse.notation
@@ -36,7 +36,7 @@
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZJQ2gg74EeORvsuYlq1ltw"/>

           </children>

           <element xmi:type="uml:UseCase" href="adl4eclipse.uml#_ZHCB4A74EeORvsuYlq1ltw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZINtoQ74EeORvsuYlq1ltw" x="170" y="32"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZINtoQ74EeORvsuYlq1ltw" x="194" y="32"/>

         </children>

         <children xmi:type="notation:Shape" xmi:id="_bUzhAA74EeORvsuYlq1ltw" type="3009" fillColor="8454016">

           <children xmi:type="notation:DecorationNode" xmi:id="_bUzhAg74EeORvsuYlq1ltw" type="5018"/>

@@ -87,7 +87,7 @@
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gUqtQg74EeORvsuYlq1ltw"/>

           </children>

           <element xmi:type="uml:UseCase" href="adl4eclipse.uml#_gToLcA74EeORvsuYlq1ltw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gT7GYQ74EeORvsuYlq1ltw" x="165" y="367"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gT7GYQ74EeORvsuYlq1ltw" x="186" y="367"/>

         </children>

         <children xmi:type="notation:Shape" xmi:id="_kBqjcA74EeORvsuYlq1ltw" type="3009" fillColor="8454016">

           <children xmi:type="notation:DecorationNode" xmi:id="_kBqjcg74EeORvsuYlq1ltw" type="5018"/>

@@ -104,7 +104,7 @@
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kCaKUg74EeORvsuYlq1ltw"/>

           </children>

           <element xmi:type="uml:UseCase" href="adl4eclipse.uml#_kBXogA74EeORvsuYlq1ltw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kBqjcQ74EeORvsuYlq1ltw" x="175" y="132"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kBqjcQ74EeORvsuYlq1ltw" x="194" y="132"/>

         </children>

         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pg5OFA74EeORvsuYlq1ltw"/>

       </children>

@@ -129,7 +129,7 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UuSgBw74EeORvsuYlq1ltw" x="20" y="80"/>

       </children>

       <element xmi:type="uml:Actor" href="adl4eclipse.uml#_UtP-MA74EeORvsuYlq1ltw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UuSgAQ74EeORvsuYlq1ltw" x="325" y="165"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UuSgAQ74EeORvsuYlq1ltw" x="399" y="206"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_XK8vsA74EeORvsuYlq1ltw" type="2011">

       <children xmi:type="notation:DecorationNode" xmi:id="_XK8vsg74EeORvsuYlq1ltw" type="5014">

@@ -142,7 +142,7 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_XK8vtw74EeORvsuYlq1ltw" x="20" y="80"/>

       </children>

       <element xmi:type="uml:Actor" href="adl4eclipse.uml#_XKzlwA74EeORvsuYlq1ltw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XK8vsQ74EeORvsuYlq1ltw" x="310" y="320"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XK8vsQ74EeORvsuYlq1ltw" x="399" y="410"/>

     </children>

     <styles xmi:type="notation:DiagramStyle" xmi:id="_OPhFwQ74EeORvsuYlq1ltw"/>

     <element xmi:type="uml:Package" href="adl4eclipse.uml#_vHt8wA72EeORvsuYlq1ltw"/>

diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.png b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.png
new file mode 100644
index 00000000000..597790b0c2d
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.png
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.svg b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.svg
new file mode 100644
index 00000000000..bffe0c3e0f5
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.svg
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.2"
+   width="460.62991"
+   height="283.46457"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="papyrus.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1306"
+     inkscape:window-height="767"
+     id="namedview53"
+     showgrid="false"
+     inkscape:zoom="0.76200001"
+     inkscape:cx="176.05836"
+     inkscape:cy="233.31647"
+     inkscape:window-x="493"
+     inkscape:window-y="93"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3908">
+      <stop
+         style="stop-color:#1a171a;stop-opacity:1;"
+         offset="0"
+         id="stop3910" />
+      <stop
+         style="stop-color:#9c9e9f;stop-opacity:1;"
+         offset="1"
+         id="stop3912" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3818">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3820" />
+      <stop
+         style="stop-color:#98bf06;stop-opacity:1;"
+         offset="1"
+         id="stop3822" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3818"
+       id="radialGradient3832"
+       cx="622.66229"
+       cy="107.15185"
+       fx="622.66229"
+       fy="107.15185"
+       r="125.38313"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3818-1"
+       id="radialGradient3832-3"
+       cx="622.66229"
+       cy="107.15185"
+       fx="622.66229"
+       fy="107.15185"
+       r="125.38313"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3818-1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3820-6" />
+      <stop
+         style="stop-color:#009bba;stop-opacity:1;"
+         offset="1"
+         id="stop3822-8" />
+    </linearGradient>
+    <radialGradient
+       r="125.38313"
+       fy="107.15185"
+       fx="622.66229"
+       cy="107.15185"
+       cx="622.66229"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3849"
+       xlink:href="#linearGradient3818-1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3914"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3916"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3918"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3920"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3922"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3925"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893"
+       gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3928"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893"
+       gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3931"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893"
+       gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3934"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893"
+       gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3940"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3946"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3958"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3818-1"
+       id="radialGradient3970"
+       gradientUnits="userSpaceOnUse"
+       cx="622.66229"
+       cy="107.15185"
+       fx="622.66229"
+       fy="107.15185"
+       r="125.38313" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3818"
+       id="radialGradient3972"
+       gradientUnits="userSpaceOnUse"
+       cx="622.66229"
+       cy="107.15185"
+       fx="622.66229"
+       fy="107.15185"
+       r="125.38313" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3974"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3976"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3978"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3980"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-768.89631)"
+     id="layer2" />
+  <g
+     id="g3960"
+     transform="matrix(0.93318676,0,0,0.93318676,8.4148818,11.649074)"
+     inkscape:export-xdpi="5.8753209"
+     inkscape:export-ydpi="5.8753209">
+    <path
+       d="m 796.19109,174.89305 c 0,65.08738 -52.76374,117.85113 -117.85112,117.85113 -65.08738,0 -117.85113,-52.76375 -117.85113,-117.85113 0,-65.08738 52.76375,-117.851126 117.85113,-117.851126 65.08738,0 117.85112,52.763746 117.85112,117.851126 z"
+       sodipodi:ry="117.85113"
+       sodipodi:rx="117.85113"
+       sodipodi:cy="174.89305"
+       sodipodi:cx="678.33997"
+       id="path3030-8"
+       style="opacity:0.98999999;fill:url(#radialGradient3970);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       transform="translate(-451.91733,-35.262539)" />
+    <path
+       transform="translate(-437.79032,-35.262539)"
+       d="m 796.19109,174.89305 c 0,65.08738 -52.76374,117.85113 -117.85112,117.85113 -65.08738,0 -117.85113,-52.76375 -117.85113,-117.85113 0,-65.08738 52.76375,-117.851126 117.85113,-117.851126 65.08738,0 117.85112,52.763746 117.85112,117.851126 z"
+       sodipodi:ry="117.85113"
+       sodipodi:rx="117.85113"
+       sodipodi:cy="174.89305"
+       sodipodi:cx="678.33997"
+       id="path3030"
+       style="opacity:0.98999999;fill:url(#radialGradient3972);fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3868"
+       d="m 125.32217,164.47792 c 0.48084,2.47664 1.1607,4.92485 1.82692,7.375 l 244.0633,0 0,-7.375 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3974);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3868-2"
+       d="m 122.84277,145.44667 c 0.0647,2.45833 0.31139,4.91667 0.56547,7.375 l 247.80415,0 0,-7.375 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3976);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3868-7"
+       d="m 123.42274,126.44667 c -0.33255,2.44792 -0.44679,4.89583 -0.59447,7.34375 l 248.38412,0 0,-7.34375 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3978);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3868-71"
+       d="m 127.14909,107.41542 c -0.76224,2.48347 -1.29841,4.92927 -1.83417,7.375 l 245.89747,0 0,-7.375 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3980);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  </g>
+</svg>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.xml b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.xml
index def080bbc37..5c136eb316b 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.xml
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.xml
@@ -14,9 +14,10 @@
          point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile">

       <profile

             description="ADL4Eclipse profile"

+            iconpath="img/adl.png"

             name="ADL4Eclipse"

             path="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml"

             provider="Eclipse.org">

       </profile>

    </extension>

-</plugin>
\ No newline at end of file
+</plugin>

diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
index 3ba9bd4b24c..bc567661bd3 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
@@ -85,7 +85,7 @@
            point="org.eclipse.ui.importWizards">

         <category

               id="org.eclipse.papyrus.editor.category"

-              name="papyrus">

+              name="Papyrus">

         </category>

         <wizard

               category="org.eclipse.papyrus.editor.category"

@@ -96,6 +96,13 @@
         </wizard>

         <wizard

               category="org.eclipse.papyrus.editor.category"

+              class="org.eclipse.papyrus.adl4eclipsetool.assistant.AdvancePluginImport"

+              icon="img/adl.png"

+              id="org.eclipse.papyrus.adl4eclipsetool.assistant.wizard1"

+              name="Advanced Plugins architecture snapshot">

+        </wizard>

+        <wizard

+              category="org.eclipse.papyrus.editor.category"

               class="org.eclipse.papyrus.adl4eclipsetool.assistant.SimpleFeatureImport"

               icon="img/adl.png"

               id="org.eclipse.papyrus.adl4eclipsetool.assistant.wizard1"

diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java
new file mode 100644
index 00000000000..6bc31b2c56f
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java
@@ -0,0 +1,149 @@
+/*****************************************************************************

+ * 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.adl4eclipsetool.assistant;

+

+import java.util.ArrayList;

+import java.util.Iterator;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.papyrus.adltool.command.CompletePluginsArchitectureSnapshotCommand;

+import org.eclipse.papyrus.adltool.command.SimplePluginsArchitectureSnapshotCommand;

+import org.eclipse.papyrus.adltool.designer.ArchitectureSnapshotDesigner;

+import org.eclipse.papyrus.adltool.designer.wizard.BundleSelectionPage;

+import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;

+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.ServiceUtilsForSelection;

+import org.eclipse.ui.IImportWizard;

+import org.eclipse.ui.ISelectionService;

+import org.eclipse.ui.IWorkbench;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.Package;

+

+/**

+ * this class is used to do the retro engineering from workspaceplugin. It adds only in the platform dependencies.

+ *

+ */

+public class AdvancePluginImport extends Wizard implements IImportWizard {

+

+	protected BundleSelectionPage bundleSelectionPage;

+	protected TransactionalEditingDomain transactionalEditingDomain=null;

+	protected PapyrusMultiDiagramEditor papyrusEditor;

+	protected ModelSet modelSet;

+

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 */

+	public AdvancePluginImport() {

+		super();

+		setNeedsProgressMonitor(true);

+	}

+

+	@Override

+	public void addPages() {

+		//look for all plugins from the workspace

+		ArrayList<Object> bundleList= new ArrayList<Object>();

+		bundleList.addAll(ArchitectureSnapshotDesigner.getLoadedBundles());

+		bundleSelectionPage = new BundleSelectionPage(bundleList);

+		addPage(bundleSelectionPage);

+	}

+

+	/**

+	 * 

+	 * @return the list of selected bundle from the page

+	 */

+	public ArrayList<Object> getSelectedBundle(){

+		return bundleSelectionPage.getResult();

+	}

+	@Override

+	public boolean performFinish() {

+		

+		// one bundle must be selected

+		if(getSelectedBundle().size()>0){

+			// get the domain in order to launche the command

+			TransactionalEditingDomain dom = modelSet.getTransactionalEditingDomain();

+			ArrayList<Element> selection=getSelectionSet();

+			

+			if( (selection.size()==1) &&(selection.get(0)instanceof Package)){

+				//launch the simple retro engineering

+				CompletePluginsArchitectureSnapshotCommand comd= new CompletePluginsArchitectureSnapshotCommand(dom, (Package)selection.get(0), getSelectedBundle());

+				dom.getCommandStack().execute(comd);

+			}

+			return true;

+		}

+		return false;

+	}

+

+	public void init(IWorkbench workbench, IStructuredSelection selection) {

+		

+		//get the service registry of papyrus from the selection

+		ServicesRegistry registry=null;

+		try {

+			registry = ServiceUtilsForSelection.getInstance().getServiceRegistry(selection);

+		} catch (ServiceException e1) {

+			e1.printStackTrace();

+		}

+		try {

+			modelSet = registry.getService(ModelSet.class);

+		} catch (ServiceException e) {

+			e.printStackTrace();

+		}

+		

+	}

+	

+	/**

+	 * getSelected element in the diagram or in the model explorer

+	 * @return Element or null

+	 */

+	protected ArrayList<Element> getSelectionSet(){

+		ArrayList<Element> selectedSet =new ArrayList<Element>();

+		ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();

+		ISelection selection = selectionService.getSelection();

+

+

+		if(selection instanceof IStructuredSelection) {

+			@SuppressWarnings("rawtypes")

+			Iterator selectedobjectIteractor = ((IStructuredSelection)selection).iterator();

+			while (selectedobjectIteractor.hasNext()) {

+				Object currentSelection = selectedobjectIteractor.next();

+				if(currentSelection instanceof GraphicalEditPart) {

+					Object graphicalElement = ((GraphicalEditPart)currentSelection).getModel();

+					if((graphicalElement instanceof View) && ((View)graphicalElement).getElement() instanceof org.eclipse.uml2.uml.Element) {

+						selectedSet.add( (org.eclipse.uml2.uml.Element)((View)graphicalElement).getElement());

+					}

+				}

+				else if(currentSelection instanceof IAdaptable) {

+					EObject selectedEObject = (EObject)((IAdaptable)currentSelection).getAdapter(EObject.class);

+					if (selectedEObject instanceof org.eclipse.uml2.uml.Element){

+						selectedSet.add((Element)selectedEObject);

+					}

+				}

+			}

+

+		}

+		return selectedSet;

+	}

+

+}

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 2f43ecd34d9..313b3f69519 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
@@ -63,7 +63,7 @@ public abstract class ArchitectureSnapshotDesigner{
 	protected BundleDesignerRegistry bundleDesignerRegistry=null;

 	protected int dependenciesN=0;

 	protected ArrayList<Object>bundleInitialList=null;

-	protected int dependencyLevelMax=15; 

+	protected int dependencyLevelMax=1; 

 

 

 

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 ad342151c70..73a714482ce 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
@@ -33,6 +33,7 @@ import org.eclipse.uml2.uml.Package;
 	 */

 	public CompleteArchitectureSnapshotDesigner(Package rootPackage, ArrayList<Object>bundleInitialList) {

 		super(rootPackage, bundleInitialList);

+		dependencyLevelMax=30;

 	}

 	@Override

 	protected void initModel() {