365714: [ModelExplorer][Refactoring] Rewrite Facets and Customization

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

8 files changed, 266 insertions, 465 deletions

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.project b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.project
index af06494370e..8975433c5f0 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.project
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.project
@@ -20,8 +20,14 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.emf.facet.common.core.builder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

 	</buildSpec>

 	<natures>

+		<nature>org.eclipse.emf.facet.common.ProjectNature</nature>

 		<nature>org.eclipse.pde.PluginNature</nature>

 		<nature>org.eclipse.jdt.core.javanature</nature>

 	</natures>

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
index 51fa62ad4cf..a116ad993b3 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
@@ -23,7 +23,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.facet.infra.facet.core;bundle-version="0.1.0",

  org.eclipse.emf.facet.infra.query.ui;bundle-version="0.1.0",

  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="0.9.0",

- org.eclipse.papyrus.infra.services.decoration;bundle-version="0.9.0"

+ org.eclipse.papyrus.infra.services.decoration;bundle-version="0.9.0",

+ org.eclipse.emf.facet.infra.query.core

 Export-Package: org.eclipse.papyrus.views.modelexplorer,

  org.eclipse.papyrus.views.modelexplorer.actionprovider,

  org.eclipse.papyrus.views.modelexplorer.actions,

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/build.properties b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/build.properties
index 9c2eda1ce0c..fa7d14e29c1 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/build.properties
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/build.properties
@@ -1,7 +1,13 @@
-#

-#Mon Sep 12 09:29:54 CEST 2011

-bin.includes=META-INF/,.,plugin.xml,icons/,schema/,plugin.properties,about.html

-output..=bin/

-src.includes=schema/,icons/,META-INF/,.,plugin.xml,plugin.properties,about.html

-source..=src/

-bin..=bin/

+bin.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               icons/,\

+               schema/,\

+               plugin.properties,\

+               about.html,\

+               resources/

+output.. = bin/

+src.includes = .,\

+               about.html

+source.. = src/

+bin.. = bin/

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/documentation.pdoc b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/documentation.pdoc
new file mode 100644
index 00000000000..79de1997b6a
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/documentation.pdoc
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the ModelExplorer View to discover the model">

+  <referent firstName="Patrick" lastName="Tessier" eMail="patrick.tessier@cea.fr" currentCompany="CEA-LIST"/>

+  <referent firstName="Vincent" lastName="Lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>

+  <additionalComments title="forbidden dependencies" contents="This plugin should not depend on Diagram, Table, UML"/>

+</doc:Documentation>

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
index af722148a41..75650fb70d8 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
@@ -1,351 +1,193 @@
-<?xml version="1.0" encoding="UTF-8"?>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

 <?eclipse version="3.4"?>

+

 <plugin>

    <extension-point id="actionHandler" name="actionHandler" schema="schema/org.eclipse.papyrus.views.modelexplorer.actionHandler.exsd"/>

-   <extension

-         point="org.eclipse.ui.views">

-      <view

-            category="org.eclipse.papyrus.views.category"

-            class="org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView"

-            icon="icons/ModelExplorer.gif"

-            id="org.eclipse.papyrus.views.modelexplorer.modelexplorer"

-            name="Model Explorer"

-            restorable="true">

+   <extension point="org.eclipse.ui.views">

+      <view category="org.eclipse.papyrus.views.category" class="org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView" icon="icons/ModelExplorer.gif" id="org.eclipse.papyrus.views.modelexplorer.modelexplorer" name="Model Explorer" restorable="true">

       </view>

    </extension>

-   <extension

-         point="org.eclipse.ui.navigator.viewer">

-      <viewer

-            popupMenuId="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup"

-            viewerId="org.eclipse.papyrus.views.modelexplorer.modelexplorer">

+   <extension point="org.eclipse.ui.navigator.viewer">

+      <viewer popupMenuId="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup" viewerId="org.eclipse.papyrus.views.modelexplorer.modelexplorer">

       </viewer>

-      <viewerContentBinding

-            viewerId="org.eclipse.papyrus.views.modelexplorer.modelexplorer">

+      <viewerContentBinding viewerId="org.eclipse.papyrus.views.modelexplorer.modelexplorer">

          <includes>

-            <contentExtension

-                  pattern="org.eclipse.papyrus.views.modelexplorer.*">

-            </contentExtension></includes>

+            <contentExtension pattern="org.eclipse.papyrus.views.modelexplorer.*">

+            </contentExtension>

+         </includes>

       </viewerContentBinding>

       <!--We add a drag assistant in order support drag and drop between Model Explorer and Table Editor or other View/editors -->

-      <dragAssistant

-            class="org.eclipse.papyrus.views.modelexplorer.dnd.EObjectDragAdapterAssistant"

-            viewerId="org.eclipse.papyrus.views.modelexplorer.modelexplorer">

+      <dragAssistant class="org.eclipse.papyrus.views.modelexplorer.dnd.EObjectDragAdapterAssistant" viewerId="org.eclipse.papyrus.views.modelexplorer.modelexplorer">

       </dragAssistant>

    </extension>

-   <extension

-         point="org.eclipse.ui.navigator.navigatorContent">

-      <navigatorContent

-            activeByDefault="false"

-            contentProvider="org.eclipse.papyrus.views.modelexplorer.MoDiscoContentProvider"

-            id="org.eclipse.papyrus.views.modelexplorer.navigatorContent"

-            labelProvider="org.eclipse.papyrus.views.modelexplorer.MoDiscoLabelProviderWTooltips"

-            name="Model Contents"

-            priority="lowest">

+   <extension point="org.eclipse.ui.navigator.navigatorContent">

+      <navigatorContent activeByDefault="false" contentProvider="org.eclipse.papyrus.views.modelexplorer.MoDiscoContentProvider" id="org.eclipse.papyrus.views.modelexplorer.navigatorContent" labelProvider="org.eclipse.papyrus.views.modelexplorer.MoDiscoLabelProviderWTooltips" name="Model Contents" priority="lowest">

          <triggerPoints>

             <or>

-               <instanceof

-                     value="org.eclipse.emf.ecore.EObject">

+               <instanceof value="org.eclipse.emf.ecore.EObject">

                </instanceof>

-               <adapt

-                     type="org.eclipse.emf.ecore.EObject">

+               <adapt type="org.eclipse.emf.ecore.EObject">

                </adapt>

-               <instanceof

-                     value="java.lang.Object">

+               <instanceof value="java.lang.Object">

                </instanceof>

-            </or></triggerPoints>

+            </or>

+         </triggerPoints>

          <possibleChildren>

             <or>

-               <instanceof

-                     value="org.eclipse.gmf.runtime.notation.impl.DiagramImpl">

+               <instanceof value="org.eclipse.gmf.runtime.notation.impl.DiagramImpl">

                </instanceof>

                <instanceof value="org.eclipse.emf.facet.infra.browser.uicore.internal.model.ModelElementItem"/>

             </or>

          </possibleChildren>

-         <actionProvider

-               class="org.eclipse.papyrus.views.modelexplorer.actionprovider.GenericTransformActionProvider"

-               id="org.eclipse.papyrus.views.modelexplorer.actionprovider.GenericTransformActionProvider">

+         <actionProvider class="org.eclipse.papyrus.views.modelexplorer.actionprovider.GenericTransformActionProvider" id="org.eclipse.papyrus.views.modelexplorer.actionprovider.GenericTransformActionProvider">

             <enablement>

                <or>

-                  <adapt

-                        type="org.eclipse.emf.ecore.EObject">

+                  <adapt type="org.eclipse.emf.ecore.EObject">

                   </adapt>

                </or>

             </enablement>

          </actionProvider>

           

-         <actionProvider

-               class="org.eclipse.papyrus.views.modelexplorer.actionprovider.EditingDomainActionProvider"

-               id="org.eclipse.papyrus.views.modelexplorer.actionprovider.EditingDomainActionProvider">

+         <actionProvider class="org.eclipse.papyrus.views.modelexplorer.actionprovider.EditingDomainActionProvider" id="org.eclipse.papyrus.views.modelexplorer.actionprovider.EditingDomainActionProvider">

                   <enablement>

                <and>

                   <not>

-                     <instanceof

-                           value="org.eclipse.gmf.runtime.notation.Diagram">

+                     <instanceof value="org.eclipse.gmf.runtime.notation.Diagram">

                      </instanceof>

                   </not>

-                  <adapt

-                        type="org.eclipse.emf.ecore.EObject">

+                  <adapt type="org.eclipse.emf.ecore.EObject">

                   </adapt>

                </and>

             </enablement>

          </actionProvider>

-         <dropAssistant

-               class="org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant"

-               id="org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant">

+         <dropAssistant class="org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant" id="org.eclipse.papyrus.views.modelexplorer.dnd.CommonDropAdapterAssistant">

             <possibleDropTargets>

                <or>

-                  <instanceof

-                        value="org.eclipse.gmf.runtime.notation.impl.DiagramImpl">

+                  <instanceof value="org.eclipse.gmf.runtime.notation.impl.DiagramImpl">

                   </instanceof>

-                  <adapt

-                        type="org.eclipse.emf.ecore.EObject">

+                  <adapt type="org.eclipse.emf.ecore.EObject">

                   </adapt>

-               </or></possibleDropTargets>

+               </or>

+            </possibleDropTargets>

          </dropAssistant>

     

       </navigatorContent>

    </extension>

-    <extension

-         point="org.eclipse.ui.popupMenus">

-      <objectContribution

-            adaptable="false"

-            id="org.eclipse.gmt.modisco.infra.query.ui.executeQuery"

-            objectClass="org.eclipse.gmt.modisco.infra.browser.uicore.internal.model.ModelElementItem">

-         <action

-               class="org.eclipse.papyrus.views.modelexplorer.actions.ExecuteQueryAction"

-               id="org.eclipse.gmt.modisco.infra.query.ui.executeQuery"

-               label="Execute Query">

+    <extension point="org.eclipse.ui.popupMenus">

+      <objectContribution adaptable="false" id="org.eclipse.gmt.modisco.infra.query.ui.executeQuery" objectClass="org.eclipse.gmt.modisco.infra.browser.uicore.internal.model.ModelElementItem">

+         <action class="org.eclipse.papyrus.views.modelexplorer.actions.ExecuteQueryAction" id="org.eclipse.gmt.modisco.infra.query.ui.executeQuery" label="Execute Query">

          </action>

       </objectContribution>

-      <objectContribution

-            adaptable="false"

-            id="org.eclipse.gmt.modisco.infra.query.ui.executeQuery"

-            objectClass="org.eclipse.gmt.modisco.infra.browser.uicore.internal.model.ModelElementItem">

-         <action

-               class="org.eclipse.papyrus.views.modelexplorer.actions.CreateQueryAction"

-               id="org.eclipse.gmt.modisco.infra.query.ui.executeQuery"

-               label="Create Query">

+      <objectContribution adaptable="false" id="org.eclipse.gmt.modisco.infra.query.ui.executeQuery" objectClass="org.eclipse.gmt.modisco.infra.browser.uicore.internal.model.ModelElementItem">

+         <action class="org.eclipse.papyrus.views.modelexplorer.actions.CreateQueryAction" id="org.eclipse.gmt.modisco.infra.query.ui.executeQuery" label="Create Query">

          </action>

       </objectContribution>

    </extension>

-    <!--  

-    <extension

-         point="org.eclipse.papyrus.views.modelexplorer.actionHandler">

-

-      <customAction

-            actionHandler="org.eclipse.papyrus.views.modelexplorer.factory.DefaultEMFActionsFactory"

-            actionId="org.eclipse.papyrus.views.modelexplorer.factory.defaultEMFActions"

-            afterAction="org.eclipse.papyrus.views.modelexplorer.factory.renameAction"

-            needSeparator="true">

-      </customAction>

-   </extension>

+    <!--  
+    <extension
+         point="org.eclipse.papyrus.views.modelexplorer.actionHandler">
+
+      <customAction
+            actionHandler="org.eclipse.papyrus.views.modelexplorer.factory.DefaultEMFActionsFactory"
+            actionId="org.eclipse.papyrus.views.modelexplorer.factory.defaultEMFActions"
+            afterAction="org.eclipse.papyrus.views.modelexplorer.factory.renameAction"
+            needSeparator="true">
+      </customAction>
+   </extension>
 -->

 <extension point="org.eclipse.ui.menus">

 

 	<!-- ModelExplorer toolbar -->

-	<menuContribution locationURI="toolbar:org.eclipse.papyrus.views.modelexplorer.modelexplorer"

-			allPopups="false">

+	<menuContribution allPopups="false" locationURI="toolbar:org.eclipse.papyrus.views.modelexplorer.modelexplorer">

 

 		<!-- Load modisco browser customization command -->		

-		<command 

-			commandId="org.eclipse.papyrus.views.modelexplorer.LoadBrowserCustomization"

-			icon="icons/etool16/uiCustom.gif"

-			label="Load browser customization"

-			style="push">

+		<command commandId="org.eclipse.papyrus.views.modelexplorer.LoadBrowserCustomization" icon="icons/etool16/uiCustom.gif" label="Load browser customization" style="push">

 		</command>

 

 		<!-- Search element command -->	

-		<command

-			commandId="org.eclipse.papyrus.views.modelexplorer.searchelement"

-			icon="icons/etool16/search.gif"

-			label="Search element"

-			style="push">

+		<command commandId="org.eclipse.papyrus.views.modelexplorer.searchelement" icon="icons/etool16/search.gif" label="Search element" style="push">

 		</command>

 		

 		<!-- Sort elements command -->	

-		<command

-	        commandId="org.eclipse.papyrus.views.modelexplorer.sortelement"

-	        icon="icons/etool16/sort.gif"

-	        label="sort"

-	        style="toggle">

+		<command commandId="org.eclipse.papyrus.views.modelexplorer.sortelement" icon="icons/etool16/sort.gif" label="sort" style="toggle">

 		</command>

 	</menuContribution>

- <menuContribution

-       allPopups="false"

-       locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">

-    <menu

-          id="org.eclipse.papyrus.views.modelexplorer.popupmenu.createchild"

-          label="New Child">

+ <menuContribution allPopups="false" locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">

+    <menu id="org.eclipse.papyrus.views.modelexplorer.popupmenu.createchild" label="New Child">

     </menu>

-    <menu

-          id="org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram"

-          label="New Diagram">

+    <menu id="org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram" label="New Diagram">

     </menu>

-    <command

-          commandId="org.eclipse.ui.edit.delete"

-          disabledIcon="IMG_TOOL_DELETE_DISABLED"

-          icon="IMG_TOOL_DELETE"

-          label="Delete"

-          style="push"

-          tooltip="Delete">

-       <visibleWhen

-             checkEnabled="true">

+    <command commandId="org.eclipse.ui.edit.delete" disabledIcon="IMG_TOOL_DELETE_DISABLED" icon="IMG_TOOL_DELETE" label="Delete" style="push" tooltip="Delete">

+       <visibleWhen checkEnabled="true">

           <and>

-             <with

-                   variable="selection">

+             <with variable="selection">

                 <iterate>

-                   <adapt

-                         type="org.eclipse.emf.ecore.EObject">

+                   <adapt type="org.eclipse.emf.ecore.EObject">

                    </adapt>

                 </iterate>

              </with>

           </and>

        </visibleWhen>

     </command>

-    <separator

-          name="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.separator0"

-          visible="true">

+    <separator name="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.separator0" visible="true">

     </separator>

-    <command

-          commandId="org.eclipse.ui.edit.rename"

-          icon="icons/etool16/rename.gif"

-          id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.rename"

-          label="&amp;Rename"

-          style="push"

-          tooltip="Rename the element">

-       <visibleWhen

-             checkEnabled="true">

+    <command commandId="org.eclipse.ui.edit.rename" icon="icons/etool16/rename.gif" id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.rename" label="&amp;Rename" style="push" tooltip="Rename the element">

+       <visibleWhen checkEnabled="true">

        </visibleWhen>

     </command>

-    <separator

-          name="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.separator1"

-          visible="true">

+    <separator name="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.separator1" visible="true">

     </separator>

-    <command

-          commandId="org.eclipse.ui.edit.undo"

-          id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.undo"

-          label="&amp;Undo"

-          style="push">

+    <command commandId="org.eclipse.ui.edit.undo" id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.undo" label="&amp;Undo" style="push">

     </command>

-    <command

-          commandId="org.eclipse.ui.edit.redo"

-          id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.redo"

-          label="&amp;Redo"

-          style="push">

+    <command commandId="org.eclipse.ui.edit.redo" id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.redo" label="&amp;Redo" style="push">

     </command>

-    <separator

-          name="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.separator2"

-          visible="true">

+    <separator name="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.separator2" visible="true">

     </separator>

-    <command

-          commandId="org.eclipse.papyrus.views.modelexplorer.popup.open.command"

-          icon="icons/etool16/forward.gif"

-          id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.open"

-          label="&amp;Open"

-          style="push"

-          tooltip="Open">

-       <visibleWhen

-             checkEnabled="true">

+    <command commandId="org.eclipse.papyrus.views.modelexplorer.popup.open.command" icon="icons/etool16/forward.gif" id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.open" label="&amp;Open" style="push" tooltip="Open">

+       <visibleWhen checkEnabled="true">

        </visibleWhen>

     </command>

-    <command

-          commandId="org.eclipse.papyrus.views.modelexplorer.popup.open.new.command"

-          icon="icons/etool16/arrow_double.gif"

-          id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.open.new"

-          label="Open In &amp;New Table"

-          style="push"

-          tooltip="Open in new tab">

-       <visibleWhen

-             checkEnabled="true">

+    <command commandId="org.eclipse.papyrus.views.modelexplorer.popup.open.new.command" icon="icons/etool16/arrow_double.gif" id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.open.new" label="Open In &amp;New Table" style="push" tooltip="Open in new tab">

+       <visibleWhen checkEnabled="true">

        </visibleWhen>

     </command>

-    <command

-          commandId="org.eclipse.papyrus.views.modelexplorer.popup.close.command"

-          icon="icons/etool16/close.png"

-          id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.close"

-          label="&amp;Close"

-          style="push"

-          tooltip="Close">

-       <visibleWhen

-             checkEnabled="true">

+    <command commandId="org.eclipse.papyrus.views.modelexplorer.popup.close.command" icon="icons/etool16/close.png" id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.close" label="&amp;Close" style="push" tooltip="Close">

+       <visibleWhen checkEnabled="true">

        </visibleWhen>

     </command>

-    <command

-          commandId="org.eclipse.papyrus.views.modelexplorer.close.all.command"

-          icon="icons/etool16/closeAll.png"

-          id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.close.all"

-          label="Close &amp;All"

-          style="push"

-          tooltip="Close All">

-       <visibleWhen

-             checkEnabled="true">

+    <command commandId="org.eclipse.papyrus.views.modelexplorer.close.all.command" icon="icons/etool16/closeAll.png" id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.close.all" label="Close &amp;All" style="push" tooltip="Close All">

+       <visibleWhen checkEnabled="true">

        </visibleWhen>

     </command>

-    <command

-          commandId="org.eclipse.papyrus.views.modelexplorer.duplicate.command"

-          icon="icons/etool16/duplicate.png"

-          id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.duplicate"

-          label="&amp;Duplicate"

-          style="push"

-          tooltip="Duplicate the element">

-       <visibleWhen

-             checkEnabled="true">

+    <command commandId="org.eclipse.papyrus.views.modelexplorer.duplicate.command" icon="icons/etool16/duplicate.png" id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.duplicate" label="&amp;Duplicate" style="push" tooltip="Duplicate the element">

+       <visibleWhen checkEnabled="true">

        </visibleWhen>

     </command>

-    <separator

-          name="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.separator3"

-          visible="true">

+    <separator name="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.separator3" visible="true">

     </separator>

-    <command

-          commandId="org.eclipse.ui.edit.cut"

-          id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.cut"

-          label="Cu&amp;t"

-          style="push">

-       <visibleWhen

-             checkEnabled="false">

-          <with

-                variable="selection">

+    <command commandId="org.eclipse.ui.edit.cut" id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.cut" label="Cu&amp;t" style="push">

+       <visibleWhen checkEnabled="false">

+          <with variable="selection">

                 <!-- We add this test in order to refresh the Cut action in the menu edit -->

-             <test

-                   forcePluginActivation="true"

-                   property="org.eclipse.papyrus.views.modelexplorer.tester.isEObject"

-                   value="true">

+             <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isEObject" value="true">

              </test>

           </with>

        </visibleWhen>

     </command>

-    <command

-          commandId="org.eclipse.ui.edit.copy"

-          id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.copy"

-          label="&amp;Copy"

-          style="push">

-       <visibleWhen

-             checkEnabled="false">

-          <with

-                variable="selection">

+    <command commandId="org.eclipse.ui.edit.copy" id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.copy" label="&amp;Copy" style="push">

+       <visibleWhen checkEnabled="false">

+          <with variable="selection">

                 <!-- We add this test in order to refresh the Copy action in the menu edit -->

-             <test

-                   forcePluginActivation="true"

-                   property="org.eclipse.papyrus.views.modelexplorer.tester.isEObject"

-                   value="true">

+             <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isEObject" value="true">

              </test>

           </with>

        </visibleWhen>

     </command>

-    <command

-          commandId="org.eclipse.ui.edit.paste"

-          id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.paste"

-          label="&amp;Paste"

-          style="push">

-       <visibleWhen

-             checkEnabled="false">

-          <with

-                variable="selection">

+    <command commandId="org.eclipse.ui.edit.paste" id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.paste" label="&amp;Paste" style="push">

+       <visibleWhen checkEnabled="false">

+          <with variable="selection">

                 <!-- We add this test in order to refresh the Paste action in the menu edit -->

-             <test

-                   forcePluginActivation="true"

-                   property="org.eclipse.papyrus.views.modelexplorer.tester.isEObject"

-                   value="true">

+             <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isEObject" value="true">

              </test>

           </with>

        </visibleWhen>

@@ -359,31 +201,19 @@
 <extension point="org.eclipse.ui.commands">

 

 	<!-- Command declaration : Load modisco browser customization command -->			

-	<command id="org.eclipse.papyrus.views.modelexplorer.LoadBrowserCustomization"

-		name="loadBrowserCustomization" description="Load a customization for the papyrus browser"

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

-		defaultHandler="org.eclipse.papyrus.views.modelexplorer.handler.LoadBrowserCustomization">

+	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.views.modelexplorer.handler.LoadBrowserCustomization" description="Load a customization for the papyrus browser" id="org.eclipse.papyrus.views.modelexplorer.LoadBrowserCustomization" name="loadBrowserCustomization">

 	</command>

 	

 	<!-- Command declaration : Search element command -->			

-	<command id="org.eclipse.papyrus.views.modelexplorer.searchelement"

-		name="searchelement" description="Search an element in the model explorer"

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

-		defaultHandler="org.eclipse.papyrus.views.modelexplorer.handler.SearchElementHandler">

+	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.views.modelexplorer.handler.SearchElementHandler" description="Search an element in the model explorer" id="org.eclipse.papyrus.views.modelexplorer.searchelement" name="searchelement">

 	</command>

 	

 	<!-- Command declaration : Sort elements command -->			

-	<command id="org.eclipse.papyrus.views.modelexplorer.sortelement"

-		name="SortElement" description="Sort elements"

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

-		defaultHandler="org.eclipse.papyrus.views.modelexplorer.handler.SortElementHandler">

+	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.views.modelexplorer.handler.SortElementHandler" description="Sort elements" id="org.eclipse.papyrus.views.modelexplorer.sortelement" name="SortElement">

 	</command>

        

 	<!-- Command declaration : Delete element command -->

-	<command id="org.eclipse.papyrus.uml.service.creation.DeleteCommand"

-		name="Delete" description="Delete"	

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

-		defaultHandler="org.eclipse.papyrus.views.modelexplorer.handler.DeleteCommandHandler">

+	<command categoryId="org.eclipse.papyrus.editor.category" defaultHandler="org.eclipse.papyrus.views.modelexplorer.handler.DeleteCommandHandler" description="Delete" id="org.eclipse.papyrus.uml.service.creation.DeleteCommand" name="Delete">

 	</command>       

 </extension>

     

@@ -392,335 +222,220 @@
 		<?gmfgen generated="false"?>

 		<initializer class="org.eclipse.papyrus.views.modelexplorer.preferences.NavigatorPreferenceInitializer"/>

    </extension>

-   <extension

-         point="org.eclipse.ui.preferencePages">

-      <page

-      		category="org.eclipse.papyrus.infra.gmfdiag.preferences.generalcategory"

-            class="org.eclipse.papyrus.views.modelexplorer.preferences.NavigatorPreferencePage"

-            id="org.eclipse.papyrus.views.modelexplorer.preferences.NavigatorPreferencePage"

-            name="Papyrus Model Explorer">

+   <extension point="org.eclipse.ui.preferencePages">

+      <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.generalcategory" class="org.eclipse.papyrus.views.modelexplorer.preferences.NavigatorPreferencePage" id="org.eclipse.papyrus.views.modelexplorer.preferences.NavigatorPreferencePage" name="Papyrus Model Explorer">

       </page>

    </extension>

 

-<!-- This declaration is added in order command (DeleteCommandHandler) status to be

-     verified (isVisible and isEnabled) before any attempt to execute the command, 

-     and to mask the command in case it is not supported or executable.

+<!-- This declaration is added in order command (DeleteCommandHandler) status to be
+     verified (isVisible and isEnabled) before any attempt to execute the command, 
+     and to mask the command in case it is not supported or executable.
   -->

 <extension point="org.eclipse.ui.startup">

 	<startup class="org.eclipse.papyrus.views.modelexplorer.Activator"/>

 </extension>

-<extension

-      point="org.eclipse.ui.navigator.linkHelper">

-   <linkHelper

-         class="org.eclipse.papyrus.views.modelexplorer.LinkHelper"

-         id="org.eclipse.papyrus.views.modelexplorer.linkHelper">

+<extension point="org.eclipse.ui.navigator.linkHelper">

+   <linkHelper class="org.eclipse.papyrus.views.modelexplorer.LinkHelper" id="org.eclipse.papyrus.views.modelexplorer.linkHelper">

        <selectionEnablement>

-         <instanceof

-               value="java.lang.Object">

+         <instanceof value="java.lang.Object">

          </instanceof>

       </selectionEnablement>

       <editorInputEnablement>

-         <instanceof

-               value="org.eclipse.ui.part.IFileEditorInput">

+         <instanceof value="org.eclipse.ui.part.IFileEditorInput">

          </instanceof>

       </editorInputEnablement>

    </linkHelper>

 </extension>

 

-<!-- This service listen the selection, ensures that the modelExplorer is active, and update the  

-	 deleteInModelExplorer variable according to the selection.

+<!-- This service listen the selection, ensures that the modelExplorer is active, and update the  
+	 deleteInModelExplorer variable according to the selection.
   -->

 <extension point="org.eclipse.ui.services">

 	<sourceProvider provider="org.eclipse.papyrus.views.modelexplorer.provider.ActionStateSourceProvider">

-		<variable name="deleteInModelExplorer" priorityLevel="workbench" />

+		<variable name="deleteInModelExplorer" priorityLevel="workbench"/>

 	</sourceProvider>

 </extension>

 

-<!-- This handler is activated when deleteInModelExplorer variable is valid.

+<!-- This handler is activated when deleteInModelExplorer variable is valid.
   -->

 <extension point="org.eclipse.ui.handlers">

-	<handler commandId="org.eclipse.ui.edit.delete" class="org.eclipse.papyrus.views.modelexplorer.handler.DeleteCommandHandler">

+	<handler class="org.eclipse.papyrus.views.modelexplorer.handler.DeleteCommandHandler" commandId="org.eclipse.ui.edit.delete">

 		<activeWhen>

 		<with variable="deleteInModelExplorer">

-			<equals value="enabled" />

+			<equals value="enabled"/>

 		</with>

 		</activeWhen>

 	</handler>

-</extension>
-<extension

-      point="org.eclipse.ui.commands">

-   <command

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

-         description="The command to open in a tab"

-         id="org.eclipse.papyrus.views.modelexplorer.popup.open.command"

-         name="Open Command">

+</extension>

+<extension point="org.eclipse.ui.commands">

+   <command categoryId="org.eclipse.papyrus.editor.category" description="The command to open in a tab" id="org.eclipse.papyrus.views.modelexplorer.popup.open.command" name="Open Command">

+   </command>

+   <command categoryId="org.eclipse.papyrus.editor.category" description="The command to open in a new tab" id="org.eclipse.papyrus.views.modelexplorer.popup.open.new.command" name="Open In New Tab Command">

    </command>

-   <command

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

-         description="The command to open in a new tab"

-         id="org.eclipse.papyrus.views.modelexplorer.popup.open.new.command"

-         name="Open In New Tab Command">

+   <command categoryId="org.eclipse.papyrus.editor.category" description="The command to close" id="org.eclipse.papyrus.views.modelexplorer.popup.close.command" name="Close Command">

    </command>

-   <command

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

-         description="The command to close"

-         id="org.eclipse.papyrus.views.modelexplorer.popup.close.command"

-         name="Close Command">

+   <command categoryId="org.eclipse.papyrus.editor.category" description="The command to close all " id="org.eclipse.papyrus.views.modelexplorer.close.all.command" name="Close All Command">

    </command>

-   <command

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

-         description="The command to close all "

-         id="org.eclipse.papyrus.views.modelexplorer.close.all.command"

-         name="Close All Command">

+   <command categoryId="org.eclipse.papyrus.editor.category" description="The Command to duplicate the selected element" id="org.eclipse.papyrus.views.modelexplorer.duplicate.command" name="Duplicate ">

    </command>

-   <command

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

-         description="The Command to duplicate the selected element"

-         id="org.eclipse.papyrus.views.modelexplorer.duplicate.command"

-         name="Duplicate ">

-   </command>
 </extension>

-<extension

-      point="org.eclipse.ui.handlers">

-   <handler

-         class="org.eclipse.papyrus.views.modelexplorer.handler.RenameDiagramHandler"

-         commandId="org.eclipse.ui.edit.rename">

+<extension point="org.eclipse.ui.handlers">

+   <handler class="org.eclipse.papyrus.views.modelexplorer.handler.RenameDiagramHandler" commandId="org.eclipse.ui.edit.rename">

       <activeWhen>

-         <with

-               variable="selection">

+         <with variable="selection">

             <and>

-               <count

-                     value="1">

+               <count value="1">

                </count>

                <!-- We add this test in order to refresh the Rename action in the menu edit -->

-               <test

-                     forcePluginActivation="true"

-                     property="org.eclipse.papyrus.views.modelexplorer.tester.isDiagram"

-                     value="true">

+               <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isDiagram" value="true">

                </test>

             </and>

          </with>

       </activeWhen>

    </handler>

-   <handler

-         commandId="org.eclipse.papyrus.views.modelexplorer.popup.close.command">

+   <handler commandId="org.eclipse.papyrus.views.modelexplorer.popup.close.command">

       <activeWhen>

-         <with

-               variable="selection">

+         <with variable="selection">

             <and>

-               <test

-                     forcePluginActivation="true"

-                     property="org.eclipse.papyrus.views.modelexplorer.tester.isPage"

-                     value="true">

+               <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isPage" value="true">

                </test>

             </and>

          </with>

       </activeWhen>

-      <class

-            class="org.eclipse.papyrus.views.modelexplorer.handler.CloseHandler">

-         <parameter

-               name="close_parameter"

-               value="selection">

+      <class class="org.eclipse.papyrus.views.modelexplorer.handler.CloseHandler">

+         <parameter name="close_parameter" value="selection">

          </parameter>

       </class>

    </handler>

-   <handler

-         commandId="org.eclipse.papyrus.views.modelexplorer.close.all.command">

-      <class

-            class="org.eclipse.papyrus.views.modelexplorer.handler.CloseHandler">

-         <parameter

-               name="close_parameter"

-               value="all">

+   <handler commandId="org.eclipse.papyrus.views.modelexplorer.close.all.command">

+      <class class="org.eclipse.papyrus.views.modelexplorer.handler.CloseHandler">

+         <parameter name="close_parameter" value="all">

          </parameter>

       </class>

       <activeWhen>

-         <with

-               variable="selection">

+         <with variable="selection">

             <and>

-               <test

-                     forcePluginActivation="true"

-                     property="org.eclipse.papyrus.views.modelexplorer.tester.isPage"

-                     value="true">

+               <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isPage" value="true">

                </test>

             </and>

          </with>

       </activeWhen>

    </handler>

-   <handler

-         class="org.eclipse.papyrus.views.modelexplorer.handler.DeleteDiagramHandler"

-         commandId="org.eclipse.ui.edit.delete">

+   <handler class="org.eclipse.papyrus.views.modelexplorer.handler.DeleteDiagramHandler" commandId="org.eclipse.ui.edit.delete">

       <activeWhen>

          <and>

-            <with

-                  variable="selection">

+            <with variable="selection">

             </with>

             <!-- We add this test in order to refresh the Delete action in the menu edit -->

-            <with

-                  variable="selection">

-               <test

-                     forcePluginActivation="true"

-                     property="org.eclipse.papyrus.views.modelexplorer.tester.isDiagram"

-                     value="true">

+            <with variable="selection">

+               <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isDiagram" value="true">

                </test>

             </with>

          </and>

       </activeWhen>

    </handler>

-   <handler

-         commandId="org.eclipse.papyrus.views.modelexplorer.popup.open.command">

+   <handler commandId="org.eclipse.papyrus.views.modelexplorer.popup.open.command">

       <activeWhen>

-         <with

-               variable="selection">

+         <with variable="selection">

             <and>

-               <test

-                     forcePluginActivation="true"

-                     property="org.eclipse.papyrus.views.modelexplorer.tester.isPage"

-                     value="true">

+               <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isPage" value="true">

                </test>

             </and>

          </with>

       </activeWhen>

-      <class

-            class="org.eclipse.papyrus.views.modelexplorer.handler.OpenHandler">

-         <parameter

-               name="open_parameter"

-               value="close">

+      <class class="org.eclipse.papyrus.views.modelexplorer.handler.OpenHandler">

+         <parameter name="open_parameter" value="close">

          </parameter>

       </class>

    </handler>

-   <handler

-         commandId="org.eclipse.papyrus.views.modelexplorer.popup.open.new.command">

+   <handler commandId="org.eclipse.papyrus.views.modelexplorer.popup.open.new.command">

       <activeWhen>

-         <with

-               variable="selection">

+         <with variable="selection">

             <and>

-               <test

-                     forcePluginActivation="true"

-                     property="org.eclipse.papyrus.views.modelexplorer.tester.isPage"

-                     value="true">

+               <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isPage" value="true">

                </test>

             </and>

          </with>

       </activeWhen>

-      <class

-            class="org.eclipse.papyrus.views.modelexplorer.handler.OpenHandler">

-         <parameter

-               name="open_parameter"

-               value="already_open">

+      <class class="org.eclipse.papyrus.views.modelexplorer.handler.OpenHandler">

+         <parameter name="open_parameter" value="already_open">

          </parameter>

       </class>

    </handler>

-   <handler

-         class="org.eclipse.papyrus.views.modelexplorer.handler.DuplicateDiagramHandler"

-         commandId="org.eclipse.papyrus.views.modelexplorer.duplicate.command">

+   <handler class="org.eclipse.papyrus.views.modelexplorer.handler.DuplicateDiagramHandler" commandId="org.eclipse.papyrus.views.modelexplorer.duplicate.command">

       <activeWhen>

       <and>

-         <with

-               variable="selection">

+         <with variable="selection">

             <and>

-               <count

-                     value="1">

+               <count value="1">

                </count>

             </and>

          </with>

-         <with

-               variable="selection">

-            <test

-                  forcePluginActivation="true"

-                  property="org.eclipse.papyrus.views.modelexplorer.tester.isDiagram"

-                  value="true">

+         <with variable="selection">

+            <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isDiagram" value="true">

             </test>

          </with>

          </and>

       </activeWhen>

    </handler>

-   <handler

-         class="org.eclipse.papyrus.views.modelexplorer.handler.CutHandler"

-         commandId="org.eclipse.ui.edit.cut">

+   <handler class="org.eclipse.papyrus.views.modelexplorer.handler.CutHandler" commandId="org.eclipse.ui.edit.cut">

       <activeWhen>

          <and>

-            <with

-                  variable="activePart">

-               <instanceof

-                     value="org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView">

+            <with variable="activePart">

+               <instanceof value="org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView">

                </instanceof>

             </with>

-            <with

-                  variable="selection">

+            <with variable="selection">

                   <!-- We add this test in order to refresh the Cut action in the menu edit -->

-               <test

-                     forcePluginActivation="true"

-                     property="org.eclipse.papyrus.views.modelexplorer.tester.isEObject"

-                     value="true">

+               <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.isEObject" value="true">

                </test>

             </with>

          </and>

       </activeWhen>

    </handler>

-   <handler

-         class="org.eclipse.papyrus.views.modelexplorer.handler.UndoHandler"

-         commandId="org.eclipse.ui.edit.undo">

+   <handler class="org.eclipse.papyrus.views.modelexplorer.handler.UndoHandler" commandId="org.eclipse.ui.edit.undo">

       <activeWhen>

          <and>

-            <with

-                  variable="activePart">

-               <instanceof

-                     value="org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView">

+            <with variable="activePart">

+               <instanceof value="org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView">

                </instanceof>

             </with>

-            <with

-                  variable="activePart">

+            <with variable="activePart">

                   <!-- We add this test in order to refresh the Undo action in the menu file -->

-               <test

-                     forcePluginActivation="true"

-                     property="org.eclipse.papyrus.views.modelexplorer.tester.view.isModelExplorer"

-                     value="true">

+               <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.view.isModelExplorer" value="true">

                </test>

             </with>

          </and>

       </activeWhen>

    </handler>

-   <handler

-         class="org.eclipse.papyrus.views.modelexplorer.handler.RedoHandler"

-         commandId="org.eclipse.ui.edit.redo">

+   <handler class="org.eclipse.papyrus.views.modelexplorer.handler.RedoHandler" commandId="org.eclipse.ui.edit.redo">

       <activeWhen>

          <and>

-            <with

-                  variable="activePart">

-               <instanceof

-                     value="org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView">

+            <with variable="activePart">

+               <instanceof value="org.eclipse.papyrus.views.modelexplorer.ModelExplorerPageBookView">

                </instanceof>

             </with>

-            <with

-                  variable="activePart">

+            <with variable="activePart">

                   <!-- We add this test in order to refresh the Redo action in the menu edit -->

-               <test

-                     forcePluginActivation="true"

-                     property="org.eclipse.papyrus.views.modelexplorer.tester.view.isModelExplorer"

-                     value="true">

+               <test forcePluginActivation="true" property="org.eclipse.papyrus.views.modelexplorer.tester.view.isModelExplorer" value="true">

                </test>

             </with>

          </and>

       </activeWhen>

-   </handler>
+   </handler>

 </extension>

-<extension

-      point="org.eclipse.core.expressions.propertyTesters">

+<extension point="org.eclipse.core.expressions.propertyTesters">

       <!-- the property tester is used to enabled/disabled handler -->

-   <propertyTester

-         class="org.eclipse.papyrus.views.modelexplorer.provider.PropertyTester"

-         id="org.eclipse.papyrus.views.modelexplorer.tester"

-         namespace="org.eclipse.papyrus.views.modelexplorer.tester"

-         properties="isDiagram, isEObject, isPage"

-         type="org.eclipse.jface.viewers.IStructuredSelection">

+   <propertyTester class="org.eclipse.papyrus.views.modelexplorer.provider.PropertyTester" id="org.eclipse.papyrus.views.modelexplorer.tester" namespace="org.eclipse.papyrus.views.modelexplorer.tester" properties="isDiagram, isEObject, isPage" type="org.eclipse.jface.viewers.IStructuredSelection">

    </propertyTester>

-   <propertyTester

-         class="org.eclipse.papyrus.views.modelexplorer.provider.PropertyTester"

-         id="org.eclipse.papyrus.views.modelexplorer.tester.view"

-         namespace="org.eclipse.papyrus.views.modelexplorer.tester.view"

-         properties="isModelExplorer"

-         type="org.eclipse.ui.IWorkbenchPart">

+   <propertyTester class="org.eclipse.papyrus.views.modelexplorer.provider.PropertyTester" id="org.eclipse.papyrus.views.modelexplorer.tester.view" namespace="org.eclipse.papyrus.views.modelexplorer.tester.view" properties="isModelExplorer" type="org.eclipse.ui.IWorkbenchPart">

    </propertyTester>

 </extension>

 

+   <extension point="org.eclipse.emf.facet.infra.query.registration">

+      <modelqueryset file="resources/PapyrusEcoreBrowserQuery.querySet"/>

+   </extension>

+   <extension point="org.eclipse.emf.facet.infra.browser.custom.core.registration">

+      <browserCustomization file="resources/PapyrusEcoreBrowser.uiCustom"/>

+   </extension>

 </plugin>

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/resources/PapyrusEcoreBrowser.uiCustom b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/resources/PapyrusEcoreBrowser.uiCustom
new file mode 100644
index 00000000000..1fbd552d2d1
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/resources/PapyrusEcoreBrowser.uiCustom
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ASCII"?>

+<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/emf/2002/Ecore">

+  <types metaclassName="ecore.EObject">

+    <customizedFeatures customizedFeature="color">

+      <valueCases>

+        <value xsi:type="uicustom:StaticFeatureValue" value="(192,192,192)"/>

+        <condition xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusEcoreBrowserQuery#IsReadOnly"/>

+      </valueCases>

+    </customizedFeatures>

+    <customizedFeatures customizedFeature="italic">

+      <defaultValue xsi:type="uicustom:DerivedFeatureValue">

+        <valueCalculator xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusEcoreBrowserQuery#IsReadOnly"/>

+      </defaultValue>

+    </customizedFeatures>

+    <customizedFeatures customizedFeature="hideMetaclassName">

+      <defaultValue xsi:type="uicustom:StaticFeatureValue" value="true"/>

+    </customizedFeatures>

+  </types>

+</uicustom:MetamodelView>

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/resources/PapyrusEcoreBrowserQuery.querySet b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/resources/PapyrusEcoreBrowserQuery.querySet
new file mode 100644
index 00000000000..08bf8798e02
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/resources/PapyrusEcoreBrowserQuery.querySet
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ASCII"?>

+<query:ModelQuerySet xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="PapyrusEcoreBrowserQuery" description="Queries for the Ecore Metamodel">

+  <associatedMetamodels href="http://www.eclipse.org/emf/2002/Ecore#/"/>

+  <queries xsi:type="query:JavaModelQuery" name="IsReadOnly" description="This query tests if the current EditingDomain is READ-ONLY or not" implementationClassName="org.eclipse.papyrus.views.modelexplorer.queries.IsReadOnly">

+    <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    <scope href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+  </queries>

+</query:ModelQuerySet>

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsReadOnly.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsReadOnly.java
new file mode 100644
index 00000000000..79dc3c1c7d4
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/queries/IsReadOnly.java
@@ -0,0 +1,40 @@
+/*****************************************************************************

+ * Copyright (c) 2011 Atos.

+ *

+ *    

+ * 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:

+ *   Atos - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.views.modelexplorer.queries;

+

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

+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;

+import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;

+import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;

+

+/**

+ * Create a query which will return true if the ressource is in read only mode.

+ * 

+ */

+@Deprecated

+public class IsReadOnly implements IJavaModelQuery<EObject, Boolean> {

+

+	public Boolean evaluate(EObject context, ParameterValueList parameterValues) throws ModelQueryExecutionException {

+		EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(context);

+		if(editingDomain != null) {

+			if(editingDomain.isReadOnly(context.eResource())) {

+				return true;

+			}

+		}

+		return false;

+	}

+

+}