[424609] Move the Sirius perspective classes and declaration from

org.eclipse.sirius.ui to org.eclipse.sirius.editor.

Change-Id: I41053801c2a7e9330f428675f9fb6a2f48042415

9 files changed, 60 insertions, 39 deletions

diff --git a/plugins/org.eclipse.sirius.doc/doc/Release Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release Notes.html
index ef1a7d7989..587ae5e2a3 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release Notes.html
@@ -38,30 +38,41 @@
 				<code>org.eclipse.sirius.tools.api.command.IDiagramCommandFactory.setAutoRefreshDView()</code> method was removed. It had no effect, any code which called it can simply be removed.
 			</li>
 		</ul>
+		<h4 id="Changesinorg.eclipse.sirius.ui">Changes in 
+			<code>org.eclipse.sirius.ui</code>
+		</h4>
+		<ul>
+			<li>The 
+				<code>org.eclipse.sirius.ui.tools.api.perspectives.DesignPerspective</code> interface has been moved to 
+				<code>org.eclipse.sirius.editor.tools.api.perspectives</code> package in 
+				<code>org.eclipse.sirius.editor</code> plugin. This perspective is now provided through the 
+				<code>org.eclipse.sirius.editor</code> plugin. The perspective ID is kept unchanged for a compatibility reason.
+			</li>
+		</ul>
 		<h2 id="sirius1.0M5">Changes in Sirius 1.0.0M5 (from Sirius 1.0M4)</h2>
 		<h3 id="UserVisibleChanges">User-Visible Changes</h3>
 		<ul>
-			<li>The table csv export has been improved to handle cropped label. In some specific cases, the cell label is automatically cropped and &#8249;...&#8250; is concatenated to the resulting value. This cropped displayed label was previously exported, now the complete semantic value is exported.</li>
+			<li>The table csv export has been improved to handle cropped label. In some specific cases, the cell label is automatically cropped and &#8216;...&#8217; is concatenated to the resulting value. This cropped displayed label was previously exported, now the complete semantic value is exported.</li>
 		</ul>
 		<h3 id="APIChanges2">API Changes</h3>
 		<h4 id="LibraryExtensions">Library Extensions</h4>
-		<p>This milestone (Sirius 1.0M5) introduces several new plug-ins, collectively called &#171;library extensions&#187;. They are all named 
+		<p>This milestone (Sirius 1.0M5) introduces several new plug-ins, collectively called &#8220;library extensions&#8221;. They are all named 
 			<code>org.eclipse.sirius.ext.LIB</code>, where 
-			<code>LIB</code> is the name of a library or component Sirius depends on. These plug-ins are used to isolate generic code which extends existing libraries with features and helpers needed for Sirius, but which do not depend on Sirius themselves. A relatively large part of the code in Sirius is of this kind: things that could/should be in EMF, GMF, Eclipse itself, etc. and which are not Sirius-specific but which make it easier to build Sirius itself. Sirius 1.0M5 introduces several of these library extensions and starts to fill them with existing classes which were &#171;hidden&#187; inside Sirius and are now exposed in library extensions. Most of the time, existing code which used the Sirius API will only need to:
+			<code>LIB</code> is the name of a library or component Sirius depends on. These plug-ins are used to isolate generic code which extends existing libraries with features and helpers needed for Sirius, but which do not depend on Sirius themselves. A relatively large part of the code in Sirius is of this kind: things that could/should be in EMF, GMF, Eclipse itself, etc. and which are not Sirius-specific but which make it easier to build Sirius itself. Sirius 1.0M5 introduces several of these library extensions and starts to fill them with existing classes which were &#8220;hidden&#8221; inside Sirius and are now exposed in library extensions. Most of the time, existing code which used the Sirius API will only need to:
 		</p>
 		<ol>
 			<li>Add the necessary 
 				<code>Import-Package</code> (recommended) or 
 				<code>Require-Bundle</code> to depend on the library extension(s) where the code they use now lives;
 			</li>
-			<li>Perform a simple &#171;Organize Imports&#187; operation, which should find the classes and interfaces in their new locations.</li>
+			<li>Perform a simple &#8220;Organize Imports&#8221; operation, which should find the classes and interfaces in their new locations.</li>
 		</ol>
 		<h4 id="MovediagramspecificEClassesintoaseparateEPackage">Move diagram-specific EClasses into a separate EPackage</h4>
 		<p>For historical reasons, the core Sirius metamodels defined in viewpoint.ecore contain both generic (dialect-independant like Viewpoint, RepresentationDescription, DAnalysis...) concepts and diagram-specific ones (e.g. DNode, EdgeStyle, ContainerCreationDescription...). The table and tree metamodels are more cleanly separated.
 			<br/>This milestone (Sirius 1.0M5) includes the first step towards a full separation of the diagram-specific stuff out of the core of Sirius. So many EClasses have been moved. 
 		</p>
-		<p>Most of the time, existing code which used these Sirius EClasses will only need to perform a simple &#171;Organize Imports&#187; operation, which should find the classes and interfaces in their new locations.
-			<br/>The &#171;Organize imports&#187; is not sufficient in case of imported classes existing several time in different packages (
+		<p>Most of the time, existing code which used these Sirius EClasses will only need to perform a simple &#8220;Organize Imports&#8221; operation, which should find the classes and interfaces in their new locations.
+			<br/>The &#8220;Organize imports&#8221; is not sufficient in case of imported classes existing several time in different packages (
 			<code>EFactory</code> classes for example with 
 			<code>DescriptionFactory</code>, or 
 			<code>EPackage</code> classes for example with 
@@ -157,7 +168,7 @@
 				<code>DCellQuery.getExportableLabel()</code> to compute the cell labels used in HTML export.
 			</li>
 		</ul>
-		<h4 id="Changesinorg.eclipse.sirius.ui">Changes in 
+		<h4 id="Changesinorg.eclipse.sirius.ui2">Changes in 
 			<code>org.eclipse.sirius.ui</code>
 		</h4>
 		<ul>
@@ -407,7 +418,7 @@
 				<code>ECrossReferenceAdapter</code> can be null.
 			</li>
 		</ul>
-		<h4 id="Changesinorg.eclipse.sirius.ui2">Changes in  
+		<h4 id="Changesinorg.eclipse.sirius.ui3">Changes in  
 			<code>org.eclipse.sirius.ui</code>
 		</h4>
 		<ul>
@@ -468,7 +479,7 @@
 			</li>
 		</ul>
 		<h2 id="sirius0.9">Changes in Sirius 0.9.0</h2>
-		<p>Version 0.9.0 is the first release under the Sirius name and under the Eclipse Foundation umbrella. Except for the few cases mentioned below (in the &#171;Other API Changes&#187;, &#171;Specifier-Visible Changes&#187; and &#171;User-Visible Changes&#187; sections), Sirius 0.9.0 is functionally equivalent to the latest version of Viewpoint (version 6.10), which was the name of the project before it was open sourced at Eclipse. See the rest of the documentation for the complete list of feature of the Sirius platform.</p>
+		<p>Version 0.9.0 is the first release under the Sirius name and under the Eclipse Foundation umbrella. Except for the few cases mentioned below (in the &#8220;Other API Changes&#8221;, &#8220;Specifier-Visible Changes&#8221; and &#8220;User-Visible Changes&#8221; sections), Sirius 0.9.0 is functionally equivalent to the latest version of Viewpoint (version 6.10), which was the name of the project before it was open sourced at Eclipse. See the rest of the documentation for the complete list of feature of the Sirius platform.</p>
 		<h3 id="MigratingfromObeoDesignerorViewpointtoSirius">Migrating from Obeo Designer or Viewpoint to Sirius</h3>
 		<p>If you have existing projects which used this technology before it became Eclipse Sirius and want to migrate to Sirius, you must:</p>
 		<ol>
@@ -492,9 +503,9 @@
 				<code>org.eclipse.sirius.componentization</code> extension point id. The identifier changes for the other extension points follow the same rules as the name changes of the plug-ins they are defined in.
 			</li>
 			<li>The migration of your VSMs (
-				<code>*.odesign</code> files) is automatic: simply open your files once in the VSM editor, perform some no-op change to make the editor &#171;dirty&#187; and save it. The saved version will have been migrated to Sirius.
+				<code>*.odesign</code> files) is automatic: simply open your files once in the VSM editor, perform some no-op change to make the editor &#8220;dirty&#8221; and save it. The saved version will have been migrated to Sirius.
 			</li>
-			<li>If you had Java code which used the Viewpoint APIs, you will need to update it to use the Sirius APIs. A simple &#171;Source &gt; Organize Imports&#187; on your source folders should find most classes you used in their new namespace. The Viewpoint code base and APIs used the term &#171;Viewpoint&#187; both for the name of the product and for the name of the concept. When it refered to the name of the product, the names were changed to use &#171;Sirius&#187; instead, so you may need to adjust some names in your code beyond just updating the imports (for example, 
+			<li>If you had Java code which used the Viewpoint APIs, you will need to update it to use the Sirius APIs. A simple &#8220;Source &gt; Organize Imports&#8221; on your source folders should find most classes you used in their new namespace. The Viewpoint code base and APIs used the term &#8220;Viewpoint&#8221; both for the name of the product and for the name of the concept. When it refered to the name of the product, the names were changed to use &#8220;Sirius&#8221; instead, so you may need to adjust some names in your code beyond just updating the imports (for example, 
 				<code>ViewpointControlCommand</code> is now 
 				<code>SiriusControlCommand</code>).
 			</li>
@@ -509,7 +520,7 @@
 		<h4 id="MigratingModelingProjectsandRepresentationFiles">Migrating Modeling Projects and Representation Files</h4>
 		<ul>
 			<li>First migrate any modeler definitions used by your modeling projects and representation files (see the section above).</li>
-			<li>Modeling projects created using Viewpoint will not be recognized directly by Sirius, because the nature identfier has changed. You must use the &#171;Configure/Convert to Modeling Project&#187; action in the project&#8217;s context menu to make it a Sirius-compatible modeling project (see the section below for the technical details of the change).</li>
+			<li>Modeling projects created using Viewpoint will not be recognized directly by Sirius, because the nature identfier has changed. You must use the &#8220;Configure/Convert to Modeling Project&#8221; action in the project&#8217;s context menu to make it a Sirius-compatible modeling project (see the section below for the technical details of the change).</li>
 			<li>The migration of you representation files (
 				<code>*.aird</code>) is performed automatically when they are loaded in memory. It will become permanent the first time you save it (you can force this by opening a representation, making some arbitrary change and saving the session).
 			</li>
@@ -685,20 +696,20 @@
 			</tr>
 		</table>
 		<h4 id="JavaPackagesandClassesNames">Java Packages and Classes Names</h4>
-		<p>The Java package names have changed to start with the identifier of the plug-in they are defined in (which has changed).  A simple &#171;Source &gt; Organize Imports&#187; on your source folders should find most classes you used in their new namespace.</p>
-		<p>The Viewpoint code base and APIs used the term &#171;Viewpoint&#187; both for the name of the product and for the name of the concept. When it refered to the name of the product, the names where changed to use &#171;Sirius&#187; instead (for example, 
+		<p>The Java package names have changed to start with the identifier of the plug-in they are defined in (which has changed).  A simple &#8220;Source &gt; Organize Imports&#8221; on your source folders should find most classes you used in their new namespace.</p>
+		<p>The Viewpoint code base and APIs used the term &#8220;Viewpoint&#8221; both for the name of the product and for the name of the concept. When it refered to the name of the product, the names where changed to use &#8220;Sirius&#8221; instead (for example, 
 			<code>ViewpointControlCommand</code> is now 
 			<code>SiriusControlCommand</code>).
 		</p>
 		<h4 id="ModelsnamespaceURIs">Models namespace URIs</h4>
-		<p>All namespace URIs have also been changed from &#171;http://www.obeo.fr/dsl/viewpoint*&#187; to &#171;http://www.eclipse.org/sirius/&#187;.</p>
+		<p>All namespace URIs have also been changed from &#8220;http://www.obeo.fr/dsl/viewpoint*&#8221; to &#8220;http://www.eclipse.org/sirius/&#8221;.</p>
 		<p>If you have created VSM file (.odesign) or representations file (.aird) with Viewpoint, the changes of the namespace URIs will be automatically migrated during the loading of your VSM or your representations file. These new nsURIs will be stored physically in the file during the first save. If the file is not saved, the automatic migration will be replayed at the next opening.</p>
 		<h3 id="NatureID">Nature ID </h3>
 		<p>The modeling project has a specific nature (
 			<code>org.eclipse.sirius.nature.modelingproject</code>). 
-			<br/>If you have modeling project created with Viewpoint, you must launch the action &#171;Configure/Convert to Modeling Project&#187; to replace old nature id (
+			<br/>If you have modeling project created with Viewpoint, you must launch the action &#8220;Configure/Convert to Modeling Project&#8221; to replace old nature id (
 			<code>fr.obeo.dsl.viewpoint.nature.modelingproject</code>) by the new one.
-			<br/>If you have many modeling projects to &#171;migrate&#187;, you can easily make a script to replace 
+			<br/>If you have many modeling projects to &#8220;migrate&#8221;, you can easily make a script to replace 
 			<code>fr.obeo.dsl.viewpoint.nature.modelingproject</code> by 
 			<code>org.eclipse.sirius.nature.modelingproject</code> in all 
 			<code>.project</code> file of each modeling projects.
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile
index d79fe9961a..3909ca1c9d 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile
@@ -12,6 +12,10 @@ h4. Changes in @org.eclipse.sirius@
 
 * The @org.eclipse.sirius.tools.api.command.IDiagramCommandFactory.setAutoRefreshDView()@ method was removed. It had no effect, any code which called it can simply be removed.
 
+h4. Changes in @org.eclipse.sirius.ui@
+
+* The @org.eclipse.sirius.ui.tools.api.perspectives.DesignPerspective@ interface has been moved to @org.eclipse.sirius.editor.tools.api.perspectives@ package in @org.eclipse.sirius.editor@ plugin. This perspective is now provided through the @org.eclipse.sirius.editor@ plugin. The perspective ID is kept unchanged for a compatibility reason.
+
 h2(#sirius1.0M5). Changes in Sirius 1.0.0M5 (from Sirius 1.0M4)
 
 h3. User-Visible Changes
diff --git a/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
index 1d41f3bb29..983a45d0b7 100644
--- a/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.editor/META-INF/MANIFEST.MF
@@ -295,19 +295,21 @@ Export-Package: org.eclipse.sirius.editor.assist.content;version="1.0.0",
  org.eclipse.sirius.editor.tools.api.assist;version="1.0.0",
  org.eclipse.sirius.editor.tools.api.editor;version="1.0.0",
  org.eclipse.sirius.editor.tools.api.menu;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.actions;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.assist;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.color;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.editor;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.marker;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.menu;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.menu.child;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.menu.refactoring;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.menu.refactoring.border;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.presentation;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.property.filter;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.property.section;x-internal:=true;version="1.0.0",
- org.eclipse.sirius.editor.tools.internal.wizards;x-internal:=true;version="1.0.0",
+ org.eclipse.sirius.editor.tools.api.perspectives;version="1.0.0",
+ org.eclipse.sirius.editor.tools.internal.actions;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.assist;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.color;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.editor;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.marker;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.menu;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.menu.child;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.menu.refactoring;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.menu.refactoring.border;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.perspectives;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.presentation;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.property.filter;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.property.section;version="1.0.0";x-internal:=true,
+ org.eclipse.sirius.editor.tools.internal.wizards;version="1.0.0";x-internal:=true,
  org.eclipse.sirius.editor.utils;version="1.0.0",
  org.eclipse.sirius.editor.wizards;version="1.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.sirius.editor/icons/full/obj16/Sirius.gif b/plugins/org.eclipse.sirius.editor/icons/full/obj16/Sirius.gif
new file mode 100644
index 0000000000..aa2c8c8e3b
--- /dev/null
+++ b/plugins/org.eclipse.sirius.editor/icons/full/obj16/Sirius.gif
diff --git a/plugins/org.eclipse.sirius.editor/icons/license.txt b/plugins/org.eclipse.sirius.editor/icons/license.txt
index 8551c60145..5178ae3221 100644
--- a/plugins/org.eclipse.sirius.editor/icons/license.txt
+++ b/plugins/org.eclipse.sirius.editor/icons/license.txt
@@ -22,6 +22,7 @@ icons/full/obj16/ModelFile.gif - org.eclipse.emf.cdo.security.edit - org.eclipse
 icons/full/obj16/ViewpointSpecificationProject.gif - org.eclipse.ui - org.eclipse.ui/icons/obj16/prj_obj.gif
 icons/full/obj16/file_odesign.gif - org.eclipse.sirius.editor - org.eclipse.sirius.editor/icons/full/obj16/file_odesign.gif
 icons/full/obj16/folder.gif - org.eclipse.e4.ui.workbench.swt - org.eclipse.e4.ui.workbench.swt/icons/full/obj16/fldr_obj.gif
+icons/full/obj16/Sirius.gif - org.eclipse.sirius.ui - org.eclipse.sirius.ui/icons/full/obj16/Sirius.gif
 icons/full/wizban/NewModel.gif - org.eclipse.emf.eef.codegen.ecore - org.eclipse.emf.eef.codegen.ecore/templates/editor/NewModel.gif
 icons/full/wizban/banner_odesign.png - org.eclipse.sirius.editor - org.eclipse.sirius.editor/icons/full/wizban/banner_odesign.png
 icons/full/wizban/banner_viewpoint_specification_project - org.eclipse.cdt.debug.ui - org.eclipse.cdt.debug.ui/icons/wizban/add_prj_source_location_wiz
diff --git a/plugins/org.eclipse.sirius.editor/plugin.xml b/plugins/org.eclipse.sirius.editor/plugin.xml
index e05c10eb22..79c73808c7 100644
--- a/plugins/org.eclipse.sirius.editor/plugin.xml
+++ b/plugins/org.eclipse.sirius.editor/plugin.xml
@@ -2432,6 +2432,15 @@
      <customizer
            class="org.eclipse.sirius.editor.tools.internal.editor.SiriusEditorCustomization"></customizer>
   </extension>
+      <extension
+          point="org.eclipse.ui.perspectives">
+       <perspective
+             class="org.eclipse.sirius.editor.tools.internal.perspectives.DesignerDesignPerspective"
+             icon="icons/full/obj16/Sirius.gif"
+             id="org.eclipse.sirius.ui.tools.perspective.design"
+             name="Sirius">
+       </perspective>
+    </extension>
 
  <!-- End of user code plugin.xml end specifics  -->
 </plugin>
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/perspectives/DesignPerspective.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/api/perspectives/DesignPerspective.java
index 3e62f7400d..3543a7887c 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/api/perspectives/DesignPerspective.java
+++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/api/perspectives/DesignPerspective.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.ui.tools.api.perspectives;
+package org.eclipse.sirius.editor.tools.api.perspectives;
 
 /**
  * This interface is usefull to get perspective id from others plug-ins.
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/perspectives/DesignerDesignPerspective.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/perspectives/DesignerDesignPerspective.java
index 02b48b1799..e79839d426 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/perspectives/DesignerDesignPerspective.java
+++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/perspectives/DesignerDesignPerspective.java
@@ -8,9 +8,9 @@
  * Contributors:
  *    Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.ui.tools.internal.perspectives;
+package org.eclipse.sirius.editor.tools.internal.perspectives;
 
-import org.eclipse.sirius.ui.tools.api.perspectives.DesignPerspective;
+import org.eclipse.sirius.editor.tools.api.perspectives.DesignPerspective;
 import org.eclipse.sirius.ui.tools.api.views.interpreterview.InterpreterView;
 import org.eclipse.sirius.ui.tools.api.views.modelexplorerview.IModelExplorerView;
 import org.eclipse.sirius.ui.tools.internal.wizards.ModelingProjectWizard;
diff --git a/plugins/org.eclipse.sirius.ui/plugin.xml b/plugins/org.eclipse.sirius.ui/plugin.xml
index 5e0d51a1b0..06ba9a4396 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.ui/plugin.xml
@@ -86,12 +86,6 @@
     <extension
           point="org.eclipse.ui.perspectives">
        <perspective
-             class="org.eclipse.sirius.ui.tools.internal.perspectives.DesignerDesignPerspective"
-             icon="icons/full/obj16/Sirius.gif"
-             id="org.eclipse.sirius.ui.tools.perspective.design"
-             name="Sirius">
-       </perspective>
-       <perspective
              class="org.eclipse.sirius.ui.tools.internal.perspectives.DesignerModelingPerspective"
              icon="icons/full/others/ModelingPerspective.gif"
              id="org.eclipse.sirius.ui.tools.perspective.modeling"