[482081] 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: 482081
Change-Id: I81653c1df5567d4551e00fcfbda6fe0e1d90f8e0
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
Cherry-picked-from: 482080

21 files changed, 67 insertions, 111 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 2ea3cdd718..e6f0f9992c 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.general=Sirius Diagram
 preference.page.title.org.eclipse.sirius.diagram.ui.appearance=Appearance
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 7379a54371..e5f01b9c7e 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
@@ -12,6 +12,8 @@
 pluginName = Sirius Diagram Specification Editor
 providerName = Eclipse Modeling Project
 
+## NOT GENERATED ##
+editorName=Sirius Diagram Editing
 
 # Property Sheet
 tab.appearance=Appearance
diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
index 1defe84ce1..c68777317e 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
@@ -25,6 +25,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 7de753ad2f..3d0ea3cdd3 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.xml b/plugins/org.eclipse.sirius.table.ui.ext/plugin.xml
deleted file mode 100644
index 13f458ca9b..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="EditionTable editor">
-      </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="CrossTable editor">
-      </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 50b43992cb..574c5c73ee 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
+
 TableEditorQuickOutlineCommand = Table Editor Quick Outline Command
 
 _UI_CreateChild_text = {0}
diff --git a/plugins/org.eclipse.sirius.table.ui/plugin.xml b/plugins/org.eclipse.sirius.table.ui/plugin.xml
index 093a3dd309..f94145b764 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 3309c469fe..64343afa39 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.xml b/plugins/org.eclipse.sirius.tree.ui.ext/plugin.xml
deleted file mode 100644
index 1f49c5ce0a..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="DTree editor">
-      </editor>
-   </extension>
-   
-</plugin>
diff --git a/plugins/org.eclipse.sirius.tree.ui/plugin.properties b/plugins/org.eclipse.sirius.tree.ui/plugin.properties
index 997b0f5ee0..42fca9f576 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
+
 DTreeContext.name = DTree Editing
 DTreeContext.description = Sirius DTree Editing
 TreeEditorQuickOutlineCommand = Tree Editor Quick Outline Command
diff --git a/plugins/org.eclipse.sirius.tree.ui/plugin.xml b/plugins/org.eclipse.sirius.tree.ui/plugin.xml
index 70cc4aae15..83e9bb80d6 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.xml b/plugins/org.eclipse.sirius.ui.ext/plugin.xml
index 4de05fbc3b..5d33b50e63 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="Text editor">
-      </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 d255edfb6c..fcad181094 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
+
 exportRepresentationsAsImagesActionLabel=Export representations as images
 
 _Pref_RefreshOnRepresentationOpening = true
diff --git a/plugins/org.eclipse.sirius.ui/plugin.xml b/plugins/org.eclipse.sirius.ui/plugin.xml
index 421ab9f4fb..4f9c2790f2 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">