[521367] Move close command on aird IFile in oes.ui.editor

Bug: 521367
Change-Id: I7a81e6bc7a78499c09af1450a066f1a48a1853e1
Signed-off-by: pguilet <pierre.guilet@obeo.fr>

6 files changed, 48 insertions, 37 deletions

diff --git a/plugins/org.eclipse.sirius.ui.editor/icons/close.gif b/plugins/org.eclipse.sirius.ui.editor/icons/close.gif
new file mode 100644
index 0000000000..2cd9c54443
--- /dev/null
+++ b/plugins/org.eclipse.sirius.ui.editor/icons/close.gif
diff --git a/plugins/org.eclipse.sirius.ui.editor/icons/license.txt b/plugins/org.eclipse.sirius.ui.editor/icons/license.txt
new file mode 100644
index 0000000000..c0aade4a68
--- /dev/null
+++ b/plugins/org.eclipse.sirius.ui.editor/icons/license.txt
@@ -0,0 +1,11 @@
+These followings icons 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
+
+<icon file path> - <original eclipse plug-in> - <original file path>
+
+icons/close.gif - org.eclipse.ui -org.eclipse.ui/icons/full/elcl16/progress_rem.gif
+icons/collapseall.png - org.eclipse.ui.ide - org.eclipse.ui/icons/full/elcl16/collapseall.png 
+icons/filter_ps.png - org.eclipse.ui.ide - org.eclipse.ui/icons/full/elcl16/filter_ps.png
+icons/SessionResourceFile.gif - org.eclipse.osgi - org.eclipse.osgi/bundles/385/1/.cp/icons/full/obj16/fileType_filter.gif
+icons/SiriusFile.gif - org.eclipse.osgi - org.eclipse.osgi/bundles/385/1/.cp/icons/full/obj16/fileType_filter.gif
diff --git a/plugins/org.eclipse.sirius.ui.editor/plugin.properties b/plugins/org.eclipse.sirius.ui.editor/plugin.properties
index c64ca1dd4b..5f4717df6c 100644
--- a/plugins/org.eclipse.sirius.ui.editor/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui.editor/plugin.properties
@@ -12,6 +12,8 @@
 pluginName = Sirius Aird Editor
 providerName = Eclipse Modeling Project
 sessionEditorPageProviderExtensionPointName=Session Editor Page Provider
+UI_CloseSessionCommand_name=Close Session
+UI_CloseSession_label=Close
 UI_SessionEditor_label = Aird Editor
 UI_SessionEditor_header_title={0}
 UI_SessionEditor_page_loading_error_message=An error occurred while creating pages for the aird editor.
diff --git a/plugins/org.eclipse.sirius.ui.editor/plugin.xml b/plugins/org.eclipse.sirius.ui.editor/plugin.xml
index 4369c2cd74..d301a876b0 100644
--- a/plugins/org.eclipse.sirius.ui.editor/plugin.xml
+++ b/plugins/org.eclipse.sirius.ui.editor/plugin.xml
@@ -83,4 +83,39 @@
          </dropAssistant>
       </navigatorContent>
    </extension>
+    <extension
+       point="org.eclipse.ui.menus">
+    <menuContribution
+          allPopups="false"
+          locationURI="popup:org.eclipse.ui.popup.any?before=additions">
+       <command
+             commandId="org.eclipse.sirius.ui.closeSessionCommand"
+             icon="icons/close.gif"
+             id="org.eclipse.sirius.ui.closeSessionMenuContribution"
+             label="%UI_CloseSession_label"
+             style="push">
+          <visibleWhen
+                checkEnabled="false">
+             <iterate>
+                  <adapt
+                   type="org.eclipse.core.resources.IResource">
+                <test
+                      property="org.eclipse.sirius.ui.isSessionFile">
+                </test>
+             </adapt>
+             </iterate>
+          </visibleWhen>
+       </command>
+    </menuContribution>
+ </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+ <command
+       categoryId="org.eclipse.ui.category.file"
+       defaultHandler="org.eclipse.sirius.ui.business.internal.commands.CloseSessionHandler"
+       id="org.eclipse.sirius.ui.closeSessionCommand"
+       name="%UI_CloseSessionCommand_name">
+ </command>		
+	</extension>
+	
 </plugin>
diff --git a/plugins/org.eclipse.sirius.ui/plugin.properties b/plugins/org.eclipse.sirius.ui/plugin.properties
index 1e7a0740fd..d1b55ec44b 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui/plugin.properties
@@ -446,8 +446,6 @@ _UI_CreateSibling_description = Create a new sibling of type {0} for the selecte
 
 _UI_PropertyDescriptor_description = The {0} of the {1}
 
-_UI_CloseSessionCommand_name=Close Session
-_UI_CloseSession_label=Close
 _UI_DValidable_type = DValidable
 _UI_DNavigable_type = DNavigable
 _UI_DStylizable_type = DStylizable
diff --git a/plugins/org.eclipse.sirius.ui/plugin.xml b/plugins/org.eclipse.sirius.ui/plugin.xml
index bec0b114b4..59b487ff7e 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.ui/plugin.xml
@@ -615,12 +615,6 @@
 	        id="org.eclipse.sirius.ui.tools.internal.actions.nature.addRemoveNatureCommand"
 	        name="%_UI_ModelingProjectWizard_label">
 	</command>
- <command
-       categoryId="org.eclipse.ui.category.file"
-       defaultHandler="org.eclipse.sirius.ui.business.internal.commands.CloseSessionHandler"
-       id="org.eclipse.sirius.ui.closeSessionCommand"
-       name="%_UI_CloseSessionCommand_name">
- </command>		
 	</extension>
 	
 		
@@ -651,35 +645,6 @@
    </extension>
  <extension
        point="org.eclipse.ui.menus">
-    <menuContribution
-          allPopups="false"
-          locationURI="popup:org.eclipse.ui.popup.any?before=additions">
-       <command
-             commandId="org.eclipse.sirius.ui.closeSessionCommand"
-             icon="icons/full/others/close.gif"
-             id="org.eclipse.sirius.ui.closeSessionMenuContribution"
-             label="%_UI_CloseSession_label"
-             style="push">
-          <visibleWhen
-                checkEnabled="false">
-             <iterate>
-                  <adapt
-                   type="org.eclipse.core.resources.IResource">
-                     <and>
-                        <test
-                              property="org.eclipse.sirius.ui.isSessionFile">
-                        </test>
-                        <not>
-                           <test
-                                 property="org.eclipse.sirius.ui.isFileInModelingProject">
-                           </test>
-                        </not>
-                     </and>
-             </adapt>
-             </iterate>
-          </visibleWhen>
-       </command>
-    </menuContribution>
  <menuContribution
        locationURI="popup:org.eclipse.ui.popup.any?after=additions">
     <command