[482029] Move editors declarations in their own plugin

The commit reverts a part of bug 456771 (commit [1]).
For bug 456771, the editors declarations have been wrongly moved to
"ext" plugins. It did not make sense because, for example, having the
plugin oes.diagram.ui without the editor is useless. Better not include
the plugin oes.diagram.ui in his bundle if we do not want to.

The plugins o.e.s.table.ui.ext and o.e.s.tree.ui.ext are kept to allow a
correct update (even if they are empty now).

[1]
http://git.eclipse.org/c/sirius/org.eclipse.sirius.git/commit/?id=cd558cb06d7807291a78def287f13647e37676ab

Bug: 482029
Change-Id: If61fd8fbbcf6cf18ca8cf5086084566acdf0494c
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
Cherry-picked-from: 482080

24 files changed, 69 insertions, 118 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui.ext/build.properties b/plugins/org.eclipse.sirius.diagram.ui.ext/build.properties
index 7de753ad2f..6e3f1b36aa 100644
--- a/plugins/org.eclipse.sirius.diagram.ui.ext/build.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui.ext/build.properties
@@ -3,7 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               icons/,\
                about.html
 javacProjectSettings = true
 javacDefaultEncoding.. = US-ASCII
diff --git a/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.properties b/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.properties
index 204f7160b0..2ef558b11c 100644
--- a/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.properties
@@ -12,9 +12,6 @@
 pluginName = Sirius Diagram UI Extensions
 providerName = Eclipse Modeling Project
 
-## NOT GENERATED ##
-editorName=Sirius Diagram Editing
-
 # Preferences
 preference.page.title.org.eclipse.sirius.diagram.ui.appearance=Appearance
 preference.page.title.org.eclipse.sirius.diagram.ui.connections=Connections
diff --git a/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.xml b/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.xml
index 29cc74af9e..8d10e20794 100644
--- a/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.xml
+++ b/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.xml
@@ -12,22 +12,6 @@
 -->
 
 <plugin>
-   <extension point="org.eclipse.ui.editors">
-      <?gmfgen generated="true"?>
-      <editor
-         id="org.eclipse.sirius.diagram.ui.part.SiriusDiagramEditorID"
-         name="%editorName"
-         icon="icons/DDiagram.gif"
-         extensions="ddiagram"
-         default="true"
-         class="org.eclipse.sirius.diagram.ui.tools.internal.editor.DDiagramEditorImpl"
-         matchingStrategy="org.eclipse.sirius.diagram.ui.part.SiriusMatchingStrategy"
-         contributorClass="org.eclipse.sirius.diagram.ui.part.SiriusDiagramActionBarContributor">
-      </editor>
-   </extension>
-
-
-
    <extension point="org.eclipse.ui.preferencePages">
       <?gmfgen generated="true"?>
       <page
diff --git a/plugins/org.eclipse.sirius.diagram.ui.ext/icons/DDiagram.gif b/plugins/org.eclipse.sirius.diagram.ui/icons/DDiagram.gif
index 13ce11b149..13ce11b149 100644
--- a/plugins/org.eclipse.sirius.diagram.ui.ext/icons/DDiagram.gif
+++ b/plugins/org.eclipse.sirius.diagram.ui/icons/DDiagram.gif
diff --git a/plugins/org.eclipse.sirius.diagram.ui/icons/license.txt b/plugins/org.eclipse.sirius.diagram.ui/icons/license.txt
index f45877a874..755a4c586c 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/icons/license.txt
+++ b/plugins/org.eclipse.sirius.diagram.ui/icons/license.txt
@@ -11,6 +11,7 @@ icons/categoryLabelVisible.gif - org.eclipse.jdt.ui - org.eclipse.jdt.ui/icons/f
 icons/categoryVisible.gif - org.eclipse.jdt.ui - org.eclipse.jdt.ui/icons/full/obj16/methpub_obj.gif
 icons/collapse.gif - org.eclipse.gmf.runtime.diagram.ui - org.eclipse.gmf.runtime.diagram.ui/icons/collapse.gif
 icons/collapseall.gif - org.eclipse.debug.ui - org.eclipse.debug.ui/icons/full/elcl16/collapseall.gif
+icons/DDiagram.gif - org.topcased.modeler.uml - org.topcased.modeler.uml/icons/diagram/ClassDiagram.gif
 icons/delete.gif - org.eclipse.ui	org.eclipse.ui/icons/full/obj16/delete_obj.gif
 icons/deleteModel.gif - org.eclipse.search - org.eclipse.search/icons/full/elcl16/search_remall.gif
 icons/disabled_co.gif - org.eclipse.debug.ui - org.eclipse.debug.ui/icons/full/elcl16/disabled_co.gif
diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
index c51bda4f08..d9592e6e96 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
@@ -12,6 +12,9 @@
 pluginName = Sirius Diagram Specification Editor
 providerName = Eclipse Modeling Project
 
+## NOT GENERATED ##
+editorName=Sirius Diagram Editing
+
 # Property Sheet
 tab.appearance=Appearance
 tab.diagram=Rulers & Grid
diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
index be9a26134e..3eb7dc6147 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
@@ -26,6 +26,19 @@
          id="org.eclipse.sirius.ui.business.api.session.SessionEditorInputFactory"/>
   </extension>
 
+   <extension point="org.eclipse.ui.editors">
+      <?gmfgen generated="true"?>
+      <editor
+         id="org.eclipse.sirius.diagram.ui.part.SiriusDiagramEditorID"
+         name="%editorName"
+         icon="icons/DDiagram.gif"
+         extensions="ddiagram"
+         default="true"
+         class="org.eclipse.sirius.diagram.ui.tools.internal.editor.DDiagramEditorImpl"
+         matchingStrategy="org.eclipse.sirius.diagram.ui.part.SiriusMatchingStrategy"
+         contributorClass="org.eclipse.sirius.diagram.ui.part.SiriusDiagramActionBarContributor">
+      </editor>
+   </extension>
 
    <extension point="org.eclipse.ui.contexts">
       <?gmfgen generated="true"?>
diff --git a/plugins/org.eclipse.sirius.table.ui.ext/build.properties b/plugins/org.eclipse.sirius.table.ui.ext/build.properties
index 4c0afd2fd3..c2de0f2041 100644
--- a/plugins/org.eclipse.sirius.table.ui.ext/build.properties
+++ b/plugins/org.eclipse.sirius.table.ui.ext/build.properties
@@ -1,9 +1,7 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               plugin.xml,\
                plugin.properties,\
-               icons/,\
                about.html
 javacProjectSettings = true
 javacDefaultEncoding.. = US-ASCII
diff --git a/plugins/org.eclipse.sirius.table.ui.ext/icons/full/obj16/CrossTableDescription.gif b/plugins/org.eclipse.sirius.table.ui.ext/icons/full/obj16/CrossTableDescription.gif
deleted file mode 100644
index 6f377442a2..0000000000
--- a/plugins/org.eclipse.sirius.table.ui.ext/icons/full/obj16/CrossTableDescription.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.sirius.table.ui.ext/icons/full/obj16/EditionTableDescription.gif b/plugins/org.eclipse.sirius.table.ui.ext/icons/full/obj16/EditionTableDescription.gif
deleted file mode 100644
index 8133dd6537..0000000000
--- a/plugins/org.eclipse.sirius.table.ui.ext/icons/full/obj16/EditionTableDescription.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.sirius.table.ui.ext/plugin.properties b/plugins/org.eclipse.sirius.table.ui.ext/plugin.properties
index e0c0d8c851..0442f79226 100644
--- a/plugins/org.eclipse.sirius.table.ui.ext/plugin.properties
+++ b/plugins/org.eclipse.sirius.table.ui.ext/plugin.properties
@@ -11,6 +11,3 @@
 
 pluginName = Sirius Tables UI Extensions
 providerName = Eclipse Modeling Project
-
-editor.crossTable.name = CrossTable editor
-editor.editionTable.name = EditionTable editor
diff --git a/plugins/org.eclipse.sirius.table.ui.ext/plugin.xml b/plugins/org.eclipse.sirius.table.ui.ext/plugin.xml
deleted file mode 100644
index 2e6d52a633..0000000000
--- a/plugins/org.eclipse.sirius.table.ui.ext/plugin.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!--
-  Copyright (c) 2015 OBEO
-  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:
-       Obeo - Initial API and implementation
--->
-
-<plugin>
-
-
-
-
-   <extension point="org.eclipse.ui.editors">
-      <editor
-            class="org.eclipse.sirius.table.ui.tools.internal.editor.DTableEditionEditor"
-            contributorClass="org.eclipse.sirius.table.ui.tools.internal.editor.provider.DTableActionBarContributor"
-            default="true"
-            extensions="dtable"
-            icon="icons/full/obj16/EditionTableDescription.gif"
-            id="org.eclipse.sirius.table.ui.EditionTableEditorID"
-            name="%editor.editionTable.name">
-      </editor>
-      <editor
-            class="org.eclipse.sirius.table.ui.tools.internal.editor.DTableCrossEditor"
-            contributorClass="org.eclipse.sirius.table.ui.tools.internal.editor.provider.DTableActionBarContributor"
-            default="false"
-            extensions="dtable"
-            icon="icons/full/obj16/CrossTableDescription.gif"
-            id="org.eclipse.sirius.table.ui.CrossTableEditorID"
-            name="%editor.crossTable.name">
-      </editor>
-   </extension>
-   
-   
- 
-   
-   <!-- Support for Quick Outline (Ctrl+O) in table editor -->
-   
-   
-   
-</plugin>
diff --git a/plugins/org.eclipse.sirius.table.ui/plugin.properties b/plugins/org.eclipse.sirius.table.ui/plugin.properties
index 477d1df4a7..f8df8b6f53 100644
--- a/plugins/org.eclipse.sirius.table.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.table.ui/plugin.properties
@@ -12,6 +12,9 @@
 pluginName = Sirius Tables UI
 providerName = Eclipse Modeling Project
 
+editor.crossTable.name = CrossTable editor
+editor.editionTable.name = EditionTable editor
+
 DTableContext.description = Sirius DTable Editing
 DTableContext.name = DTable Editing
 TableEditorQuickOutlineCommand = Table Editor Quick Outline Command
diff --git a/plugins/org.eclipse.sirius.table.ui/plugin.xml b/plugins/org.eclipse.sirius.table.ui/plugin.xml
index 23b89880b5..4b5796ff32 100644
--- a/plugins/org.eclipse.sirius.table.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.table.ui/plugin.xml
@@ -46,6 +46,27 @@
       </dialectUI>
    </extension>
 
+   <extension point="org.eclipse.ui.editors">
+      <editor
+            class="org.eclipse.sirius.table.ui.tools.internal.editor.DTableEditionEditor"
+            contributorClass="org.eclipse.sirius.table.ui.tools.internal.editor.provider.DTableActionBarContributor"
+            default="true"
+            extensions="dtable"
+            icon="icons/full/obj16/EditionTableDescription.gif"
+            id="org.eclipse.sirius.table.ui.EditionTableEditorID"
+            name="%editor.editionTable.name">
+      </editor>
+      <editor
+            class="org.eclipse.sirius.table.ui.tools.internal.editor.DTableCrossEditor"
+            contributorClass="org.eclipse.sirius.table.ui.tools.internal.editor.provider.DTableActionBarContributor"
+            default="false"
+            extensions="dtable"
+            icon="icons/full/obj16/CrossTableDescription.gif"
+            id="org.eclipse.sirius.table.ui.CrossTableEditorID"
+            name="%editor.crossTable.name">
+      </editor>
+   </extension>
+   
    <extension
          point="org.eclipse.ui.editorActions">
       <editorContribution
diff --git a/plugins/org.eclipse.sirius.tree.ui.ext/build.properties b/plugins/org.eclipse.sirius.tree.ui.ext/build.properties
index ff853084dc..e88e8087af 100644
--- a/plugins/org.eclipse.sirius.tree.ui.ext/build.properties
+++ b/plugins/org.eclipse.sirius.tree.ui.ext/build.properties
@@ -1,9 +1,7 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               plugin.xml,\
                plugin.properties,\
-               icons/,\
                about.html
 javacProjectSettings = true
 javacDefaultEncoding.. = US-ASCII
diff --git a/plugins/org.eclipse.sirius.tree.ui.ext/icons/full/obj16/TreeDescription.gif b/plugins/org.eclipse.sirius.tree.ui.ext/icons/full/obj16/TreeDescription.gif
deleted file mode 100644
index 234486172c..0000000000
--- a/plugins/org.eclipse.sirius.tree.ui.ext/icons/full/obj16/TreeDescription.gif
+++ /dev/null
diff --git a/plugins/org.eclipse.sirius.tree.ui.ext/plugin.properties b/plugins/org.eclipse.sirius.tree.ui.ext/plugin.properties
index f676f6e9bc..18933e74e5 100644
--- a/plugins/org.eclipse.sirius.tree.ui.ext/plugin.properties
+++ b/plugins/org.eclipse.sirius.tree.ui.ext/plugin.properties
@@ -10,6 +10,4 @@
 # ====================================================================
 
 pluginName = Sirius Tree UI Extensions
-providerName = Eclipse Modeling Project
-
-editor.treeEditor.name = DTree editor
\ No newline at end of file
+providerName = Eclipse Modeling Project
\ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.tree.ui.ext/plugin.xml b/plugins/org.eclipse.sirius.tree.ui.ext/plugin.xml
deleted file mode 100644
index dffdad9850..0000000000
--- a/plugins/org.eclipse.sirius.tree.ui.ext/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!--
-  Copyright (c) 2015 OBEO
-  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:
-       Obeo - Initial API and implementation
--->
-
-<plugin>
-
- <extension point="org.eclipse.ui.editors">
-      <editor
-            class="org.eclipse.sirius.tree.ui.tools.internal.editor.DTreeEditor"
-            contributorClass="org.eclipse.sirius.tree.ui.tools.internal.editor.DTreeActionBarContributor"
-            default="true"
-            extensions="dtree"
-            icon="icons/full/obj16/TreeDescription.gif"
-            id="org.eclipse.sirius.tree.ui.EditorID"
-            name="%editor.treeEditor.name">
-      </editor>
-   </extension>
-   
-</plugin>
diff --git a/plugins/org.eclipse.sirius.tree.ui/plugin.properties b/plugins/org.eclipse.sirius.tree.ui/plugin.properties
index e435e77461..a78c764749 100644
--- a/plugins/org.eclipse.sirius.tree.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.tree.ui/plugin.properties
@@ -12,6 +12,8 @@
 pluginName = Sirius Tree Specification Editor
 providerName = Eclipse Modeling Project
 
+editor.treeEditor.name = DTree editor
+
 DTreeEditor_editorToBeClosedAndReopenedSinceContentIsNotAccessible={0}\nContent access has failed at editor opening, you can try to reopen this editor.
 DTreeEditor_treeModelUnsaved = This tree was not saved. You can close the editor
 DTreeItemDropListener_ambigousDropWarning = There are more than one drop description that match the dropped element : {0} ({1} and {2}).
diff --git a/plugins/org.eclipse.sirius.tree.ui/plugin.xml b/plugins/org.eclipse.sirius.tree.ui/plugin.xml
index 38b7506f0e..930ee89240 100644
--- a/plugins/org.eclipse.sirius.tree.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.tree.ui/plugin.xml
@@ -40,6 +40,18 @@
    </extension>
 
 
+ <extension point="org.eclipse.ui.editors">
+      <editor
+            class="org.eclipse.sirius.tree.ui.tools.internal.editor.DTreeEditor"
+            contributorClass="org.eclipse.sirius.tree.ui.tools.internal.editor.DTreeActionBarContributor"
+            default="true"
+            extensions="dtree"
+            icon="icons/full/obj16/TreeDescription.gif"
+            id="org.eclipse.sirius.tree.ui.EditorID"
+            name="%editor.treeEditor.name">
+      </editor>
+   </extension>
+   
  <extension
        point="org.eclipse.ui.contexts">
     <context
diff --git a/plugins/org.eclipse.sirius.ui.ext/plugin.properties b/plugins/org.eclipse.sirius.ui.ext/plugin.properties
index 647ac01737..6cd715540c 100644
--- a/plugins/org.eclipse.sirius.ui.ext/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui.ext/plugin.properties
@@ -15,7 +15,6 @@ providerName = Eclipse Modeling Project
 category.sirius.name = Sirius
 command.addModelingNature.label = Convert to Modeling Project
 command.removeModelingNature.label = Remove Modeling Project Nature
-editor.textEditor.name = Text editor
 exportRepresentationsAsImagesActionLabel=Export representations as images
 page.sirius.name = Sirius
 perspective.modeling.name = Modeling
diff --git a/plugins/org.eclipse.sirius.ui.ext/plugin.xml b/plugins/org.eclipse.sirius.ui.ext/plugin.xml
index 898ba8edec..c56ffe85a2 100644
--- a/plugins/org.eclipse.sirius.ui.ext/plugin.xml
+++ b/plugins/org.eclipse.sirius.ui.ext/plugin.xml
@@ -105,17 +105,6 @@
     
     <!-- Standard External Java Actions usable from VSMs. --> 
   
-       <extension point="org.eclipse.ui.editors">
-      <editor
-            class="org.eclipse.ui.editors.text.TextEditor"
-            default="true"
-            extensions="aird"
-            icon="icons/obj16/SiriusFile.gif"
-            id="org.eclipse.sirius.ui.fakeeditoronlyforicon"
-            name="%editor.textEditor.name">
-      </editor>
-   </extension>
-  
     <!-- Model content tab wrapper
   <extension
         point="org.eclipse.sirius.ui.modelExplorerTabExtension">
diff --git a/plugins/org.eclipse.sirius.ui/plugin.properties b/plugins/org.eclipse.sirius.ui/plugin.properties
index c0ef8fa678..3f6be641e1 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui/plugin.properties
@@ -12,6 +12,8 @@
 pluginName = Sirius UI
 providerName = Eclipse Modeling Project
 
+editor.textEditor.name = Text editor
+
 AbstractCompositeEObjectPropertySource_missingEObject = eObject is null
 AbstractCompositeEObjectPropertySource_missingId = id is null
 AbstractCreateRepresentationFromRepresentationCreationDescription_creationError_message = An error occured when trying to create the representation.\nPlease check the representation specification.
diff --git a/plugins/org.eclipse.sirius.ui/plugin.xml b/plugins/org.eclipse.sirius.ui/plugin.xml
index 523315ead4..0e88563dd3 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.ui/plugin.xml
@@ -553,7 +553,17 @@
      </image>
   </extension>
   
-  
+   <extension point="org.eclipse.ui.editors">
+      <editor
+            class="org.eclipse.ui.editors.text.TextEditor"
+            default="true"
+            extensions="aird"
+            icon="icons/obj16/SiriusFile.gif"
+            id="org.eclipse.sirius.ui.fakeeditoronlyforicon"
+            name="%editor.textEditor.name">
+      </editor>
+   </extension>
+     
     <!-- Model content tab wrapper
   <extension
         point="org.eclipse.sirius.ui.modelExplorerTabExtension">