Bug 507409 - [SequenceDiagram][Usability] Automatic creation of

execution specification when creating a message

The preference page to manage automatic creation must be tagged as not
generated

Change-Id: I9ac1fbd9c10c42b6ac2d9d7decfc680b680b16a4
Signed-off-by: Mathilde Arnaud <mathilde.arnaud@cea.fr>

1 files changed, 312 insertions, 312 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
index 48049d110f9..09b5b377c98 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <!--
- Copyright (c) 2009, 2014 CEA and others.
+ Copyright (c) 2009, 2014, 2017 CEA and others.
  
  All rights reserved. This program and the accompanying materials
  are made available under the terms of the Eclipse Public License v1.0
@@ -14,15 +14,15 @@
    
 -->
 <plugin>
-   <extension point="org.eclipse.ui.contexts" id="ui-context">

-				      <?gmfgen generated="true"?>

-				      <context

-				         description="%context.description"

-				         id="org.eclipse.papyrus.uml.diagram.sequence.ui.diagramContext"

-				         name="%context.name"

-				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">

-				      </context>

-				   </extension>

+   <extension point="org.eclipse.ui.contexts" id="ui-context">
+				      <?gmfgen generated="true"?>
+				      <context
+				         description="%context.description"
+				         id="org.eclipse.papyrus.uml.diagram.sequence.ui.diagramContext"
+				         name="%context.name"
+				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
+				      </context>
+				   </extension>
    
    <extension
          point="org.eclipse.ui.commands">
@@ -57,122 +57,122 @@
 
 
 
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">

-      <?gmfgen generated="true"?>

-      <propertyContributor

-            contributorId="org.eclipse.papyrus.uml.diagram.sequence"

-            labelProvider="org.eclipse.papyrus.uml.diagram.sequence.sheet.UMLSheetLabelProvider">

-         <propertyCategory category="domain"/>

-         <propertyCategory category="visual"/>

-         <propertyCategory category="extra"/>

-      </propertyContributor>

-   </extension>

-
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">

-      <?gmfgen generated="true"?>   

-      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.sequence">

-         <propertyTab

-             category="visual"

-             id="property.tab.AppearancePropertySection"

-             label="%tab.appearance"/>

-          <propertyTab

-             category="visual"

-             id="property.tab.DiagramPropertySection"

-             label="%tab.diagram"/>

-          <propertyTab

-             category="domain"

-             id="property.tab.domain"

-             label="%tab.domain"/>

-      </propertyTabs>

-   </extension>

-
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">

-      <?gmfgen generated="true"?>   

-      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.sequence">

-         <propertySection id="property.section.ConnectorAppearancePropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>

-         <propertySection id="property.section.ShapeColorAndFontPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection> 

-         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 

-            tab="property.tab.AppearancePropertySection">

-         </propertySection>     

-         <propertySection id="property.section.RulerGridPropertySection" 

-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 

-            tab="property.tab.DiagramPropertySection">

-         </propertySection>     

-         <propertySection

-            id="property.section.domain" 

-            tab="property.tab.domain"

-            class="org.eclipse.papyrus.uml.diagram.sequence.sheet.UMLPropertySection">

-            <input type="org.eclipse.gmf.runtime.notation.View"/>

-            <input type="org.eclipse.gef.EditPart"/>

-         </propertySection>

-      </propertySections>

-   </extension>

+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
+      <?gmfgen generated="true"?>
+      <propertyContributor
+            contributorId="org.eclipse.papyrus.uml.diagram.sequence"
+            labelProvider="org.eclipse.papyrus.uml.diagram.sequence.sheet.UMLSheetLabelProvider">
+         <propertyCategory category="domain"/>
+         <propertyCategory category="visual"/>
+         <propertyCategory category="extra"/>
+      </propertyContributor>
+   </extension>
+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
+      <?gmfgen generated="true"?>   
+      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.sequence">
+         <propertyTab
+             category="visual"
+             id="property.tab.AppearancePropertySection"
+             label="%tab.appearance"/>
+          <propertyTab
+             category="visual"
+             id="property.tab.DiagramPropertySection"
+             label="%tab.diagram"/>
+          <propertyTab
+             category="domain"
+             id="property.tab.domain"
+             label="%tab.domain"/>
+      </propertyTabs>
+   </extension>
+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
+      <?gmfgen generated="true"?>   
+      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.sequence">
+         <propertySection id="property.section.ConnectorAppearancePropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>
+         <propertySection id="property.section.ShapeColorAndFontPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection> 
+         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 
+            tab="property.tab.AppearancePropertySection">
+         </propertySection>     
+         <propertySection id="property.section.RulerGridPropertySection" 
+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
+            tab="property.tab.DiagramPropertySection">
+         </propertySection>     
+         <propertySection
+            id="property.section.domain" 
+            tab="property.tab.domain"
+            class="org.eclipse.papyrus.uml.diagram.sequence.sheet.UMLPropertySection">
+            <input type="org.eclipse.gmf.runtime.notation.View"/>
+            <input type="org.eclipse.gef.EditPart"/>
+         </propertySection>
+      </propertySections>
+   </extension>
 
 
 <?gmfgen generated="true"?>
 
-	<extension point="org.eclipse.core.runtime.preferences" id="prefs">

-		      <?gmfgen generated="true"?>

-		      <initializer class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPreferenceInitializer"/>

-		   </extension>

-
-   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

-	      <?gmfgen generated="true"?>

-	      <viewProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLViewProvider">

-	         <Priority name="Lowest"/>

-	         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLSequenceDiagram"/>

-	         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Interaction_Shape,ConsiderIgnoreFragment_Shape,CombinedFragment_Shape,InteractionOperand_Shape,InteractionUse_Shape,Continuation_Shape,Lifeline_Shape,ActionExecutionSpecification_Shape,BehaviorExecutionSpecification_Shape,StateInvariant_Shape,TimeConstraint_Shape,TimeObservation_Shape,DurationConstraint_Shape,DestructionOccurrenceSpecification_Shape,Constraint_Shape,Comment_Shape,DurationConstraint_Shape_CN,DurationObservation_Shape,Gate_Shape"/>

-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Message_SynchEdge,Message_AsynchEdge,Message_ReplyEdge,Message_CreateEdge,Message_DeleteEdge,Message_LostEdge,Message_FoundEdge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,GeneralOrdering_Edge,Constraint_ContextEdge"/>

-	      </viewProvider>

-	   </extension>

-
-   <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">

-	      <?gmfgen generated="true"?>

-	      <editpartProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLEditPartProvider">

-	         <Priority name="Lowest"/>

-	         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">

-	            <method name="getType()" value="PapyrusUMLSequenceDiagram"/>

-	         </object>

-	         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">

-	            <method name="getType()" value="Interaction_Shape,ConsiderIgnoreFragment_Shape,CombinedFragment_Shape,InteractionOperand_Shape,InteractionUse_Shape,Continuation_Shape,Lifeline_Shape,ActionExecutionSpecification_Shape,BehaviorExecutionSpecification_Shape,StateInvariant_Shape,TimeConstraint_Shape,TimeObservation_Shape,DurationConstraint_Shape,DestructionOccurrenceSpecification_Shape,Constraint_Shape,Comment_Shape,DurationConstraint_Shape_CN,DurationObservation_Shape,Gate_Shape"/>

-	         </object>

-	         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">

-	            <method name="getType()" value="Message_SynchEdge,Message_AsynchEdge,Message_ReplyEdge,Message_CreateEdge,Message_DeleteEdge,Message_LostEdge,Message_FoundEdge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,GeneralOrdering_Edge,Constraint_ContextEdge"/>

-	         </object>

-	         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">

-	            <method name="getType()" value="Interaction_NameLabel,InteractionUse_NameLabel,InteractionUse_TypeLabel,Continuation_NameLabel,Lifeline_NameLabel,StateInvariant_NameLabel,StateInvariant_ConstraintLabel,TimeConstraint_ConstraintLabel,TimeConstraint_StereotypeLabel,TimeObservation_NameLabel,TimeObservation_StereotypeLabel,DurationConstraint_BodyLabel,DurationConstraint_StereotypeLabel,Constraint_NameLabel,Constraint_BodyLabel,Comment_BodyLabel,DurationConstraint_BodyLabel_CN,DurationConstraint_StereotypeLabel_CN,DurationObservation_NameLabel,DurationObservation_StereotypeLabel,Gate_NameLabel"/>

-	         </object>

-	         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">

-	            <method name="getType()" value="Interaction_SubfragmentCompartment,CombinedFragment_SubfragmentCompartment"/>

-	         </object>

-	         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>

-	      </editpartProvider>

-	   </extension>

-
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

-	      <?gmfgen generated="true"?>

-	      <IconProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLIconProvider">

-	         <Priority name="Low"/>

-	      </IconProvider>

-	   </extension>

-
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

-	      <?gmfgen generated="true"?>

-	      <ParserProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider">

-	         <Priority name="Lowest"/>

-	      </ParserProvider>

-	   </extension>

+	<extension point="org.eclipse.core.runtime.preferences" id="prefs">
+		      <?gmfgen generated="true"?>
+		      <initializer class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPreferenceInitializer"/>
+		   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
+	      <?gmfgen generated="true"?>
+	      <viewProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLViewProvider">
+	         <Priority name="Lowest"/>
+	         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLSequenceDiagram"/>
+	         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Interaction_Shape,ConsiderIgnoreFragment_Shape,CombinedFragment_Shape,InteractionOperand_Shape,InteractionUse_Shape,Continuation_Shape,Lifeline_Shape,ActionExecutionSpecification_Shape,BehaviorExecutionSpecification_Shape,StateInvariant_Shape,TimeConstraint_Shape,TimeObservation_Shape,DurationConstraint_Shape,DestructionOccurrenceSpecification_Shape,Constraint_Shape,Comment_Shape,DurationConstraint_Shape_CN,DurationObservation_Shape,Gate_Shape"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Message_SynchEdge,Message_AsynchEdge,Message_ReplyEdge,Message_CreateEdge,Message_DeleteEdge,Message_LostEdge,Message_FoundEdge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,GeneralOrdering_Edge,Constraint_ContextEdge"/>
+	      </viewProvider>
+	   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
+	      <?gmfgen generated="true"?>
+	      <editpartProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLEditPartProvider">
+	         <Priority name="Lowest"/>
+	         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
+	            <method name="getType()" value="PapyrusUMLSequenceDiagram"/>
+	         </object>
+	         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
+	            <method name="getType()" value="Interaction_Shape,ConsiderIgnoreFragment_Shape,CombinedFragment_Shape,InteractionOperand_Shape,InteractionUse_Shape,Continuation_Shape,Lifeline_Shape,ActionExecutionSpecification_Shape,BehaviorExecutionSpecification_Shape,StateInvariant_Shape,TimeConstraint_Shape,TimeObservation_Shape,DurationConstraint_Shape,DestructionOccurrenceSpecification_Shape,Constraint_Shape,Comment_Shape,DurationConstraint_Shape_CN,DurationObservation_Shape,Gate_Shape"/>
+	         </object>
+	         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
+	            <method name="getType()" value="Message_SynchEdge,Message_AsynchEdge,Message_ReplyEdge,Message_CreateEdge,Message_DeleteEdge,Message_LostEdge,Message_FoundEdge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,GeneralOrdering_Edge,Constraint_ContextEdge"/>
+	         </object>
+	         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
+	            <method name="getType()" value="Interaction_NameLabel,InteractionUse_NameLabel,InteractionUse_TypeLabel,Continuation_NameLabel,Lifeline_NameLabel,StateInvariant_NameLabel,StateInvariant_ConstraintLabel,TimeConstraint_ConstraintLabel,TimeConstraint_StereotypeLabel,TimeObservation_NameLabel,TimeObservation_StereotypeLabel,DurationConstraint_BodyLabel,DurationConstraint_StereotypeLabel,Constraint_NameLabel,Constraint_BodyLabel,Comment_BodyLabel,DurationConstraint_BodyLabel_CN,DurationConstraint_StereotypeLabel_CN,DurationObservation_NameLabel,DurationObservation_StereotypeLabel,Gate_NameLabel"/>
+	         </object>
+	         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
+	            <method name="getType()" value="Interaction_SubfragmentCompartment,CombinedFragment_SubfragmentCompartment"/>
+	         </object>
+	         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
+	      </editpartProvider>
+	   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
+	      <?gmfgen generated="true"?>
+	      <IconProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLIconProvider">
+	         <Priority name="Low"/>
+	      </IconProvider>
+	   </extension>
+
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
+	      <?gmfgen generated="true"?>
+	      <ParserProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider">
+	         <Priority name="Lowest"/>
+	      </ParserProvider>
+	   </extension>
 
 
 	   
@@ -180,68 +180,68 @@
       
 	      
 
-   <extension point="org.eclipse.ui.menus" id="context-menus">

-      <?gmfgen generated="true"?>

-      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">

-      </menuContribution>

-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">

-      </menuContribution -->

-      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">

-         <command commandId="org.eclipse.papyrus.uml.diagram.sequence.LoadResourceAction">

-            <visibleWhen>

-               <and>

-                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorID"/></with>

-                  <with variable="selection"><iterate ifEmpty="false"> 

-                     <instanceof value="org.eclipse.papyrus.uml.diagram.sequence.edit.parts.SequenceDiagramEditPart"/>

-                  </iterate></with>

-               </and>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-
-   <extension point="org.eclipse.ui.commands" id="menu-commands">

-      <?gmfgen generated="true"?>

-      <category id="org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>

-      <command id="org.eclipse.papyrus.uml.diagram.sequence.LoadResourceAction"

-         name="Load Resource"

-         categoryId="org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorID"

-         defaultHandler="org.eclipse.papyrus.uml.diagram.sequence.part.LoadResourceAction"/>

-   </extension>

-
-
-<extension point="org.eclipse.ui.preferencePages" id="prefpages">

-		      <?gmfgen generated="true"?>

-		<page

-		      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-		      name="PapyrusUMLSequenceDiagram Diagram"

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

-		      class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramGeneralPreferencePage">

-		</page>

-		<page

-		      id="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPrintingPreferencePage"

-		      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"

-		      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-		      class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPrintingPreferencePage">

-		</page>

-		   </extension>

-
-
-
-
-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

-				      <?gmfgen generated="true"?>

-				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLMarkerNavigationProvider">

-				         <MarkerType name="org.eclipse.papyrus.uml.diagram.sequence.diagnostic"/>

-				         <Priority name="Lowest"/>

-				      </MarkerNavigationProvider>

-				   </extension>

-
-<extension id="diagnostic" name="UML Plugin problems" point="org.eclipse.core.resources.markers">

-				      <?gmfgen generated="true"?>

-				      <super type="org.eclipse.core.resources.problemmarker"/>

-				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

-				      <persistent value="true"/>

+   <extension point="org.eclipse.ui.menus" id="context-menus">
+      <?gmfgen generated="true"?>
+      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">
+      </menuContribution>
+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
+      </menuContribution -->
+      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
+         <command commandId="org.eclipse.papyrus.uml.diagram.sequence.LoadResourceAction">
+            <visibleWhen>
+               <and>
+                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorID"/></with>
+                  <with variable="selection"><iterate ifEmpty="false"> 
+                     <instanceof value="org.eclipse.papyrus.uml.diagram.sequence.edit.parts.SequenceDiagramEditPart"/>
+                  </iterate></with>
+               </and>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+
+   <extension point="org.eclipse.ui.commands" id="menu-commands">
+      <?gmfgen generated="true"?>
+      <category id="org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
+      <command id="org.eclipse.papyrus.uml.diagram.sequence.LoadResourceAction"
+         name="Load Resource"
+         categoryId="org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorID"
+         defaultHandler="org.eclipse.papyrus.uml.diagram.sequence.part.LoadResourceAction"/>
+   </extension>
+
+
+<extension point="org.eclipse.ui.preferencePages" id="prefpages">
+		      <?gmfgen generated="false"?>
+		<page
+		      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"
+		      name="PapyrusUMLSequenceDiagram Diagram"
+		      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
+		      class="org.eclipse.papyrus.uml.diagram.sequence.preferences.CustomDiagramGeneralPreferencePage">
+		</page>
+		<page
+		      id="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPrintingPreferencePage"
+		      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
+		      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"
+		      class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DiagramPrintingPreferencePage">
+		</page>
+		   </extension>
+
+
+
+
+<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
+				      <?gmfgen generated="true"?>
+				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLMarkerNavigationProvider">
+				         <MarkerType name="org.eclipse.papyrus.uml.diagram.sequence.diagnostic"/>
+				         <Priority name="Lowest"/>
+				      </MarkerNavigationProvider>
+				   </extension>
+
+<extension id="diagnostic" name="UML Plugin problems" point="org.eclipse.core.resources.markers">
+				      <?gmfgen generated="true"?>
+				      <super type="org.eclipse.core.resources.problemmarker"/>
+				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
+				      <persistent value="true"/>
 				   </extension>   
    <extension point="org.eclipse.emf.validation.constraintProviders">
       <?gmfgen generated="false"?>
@@ -293,38 +293,38 @@
       </constraintProvider>
    </extension>
 
-<extension point="org.eclipse.emf.validation.constraintBindings">

-      <?gmfgen generated="true"?>

-      <clientContext default="false" id="org.eclipse.papyrus.uml.diagram.sequenceDefaultCtx">

-         <selector class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationProvider$DefaultCtx"/>

-      </clientContext>

-      <binding context="org.eclipse.papyrus.uml.diagram.sequenceDefaultCtx">

-                  <constraint ref="org.eclipse.papyrus.uml.diagram.sequence.FragmentOrderingKeeper.Interaction"/>

-                  <constraint ref="org.eclipse.papyrus.uml.diagram.sequence.FragmentOrderingKeeper.InteractionOperand"/>

-               </binding>

-

-      <clientContext default="false" id="org.eclipse.papyrus.uml.diagram.sequenceCtx_3001">

-         <selector class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationProvider$Ctx_3001"/>

-      </clientContext>

-      <binding context="org.eclipse.papyrus.uml.diagram.sequenceCtx_3001">

-                  <constraint ref="org.eclipse.papyrus.uml.diagram.sequence.FragmentOrderingKeeper.LifelineFigure"/>

-               </binding>

-

-   </extension>

-<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

-				      <?gmfgen generated="true"?>

-				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationDecoratorProvider">

-				         <Priority name="Lowest"/>

-				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

-				         <context decoratorTargets="PRIMARY_VIEW"/>

-				      </decoratorProvider>

-				   </extension>

-
-<extension point="org.eclipse.emf.validation.ui.UIRegisteredClientContext">

-      <?gmfgen generated="true"?>

-         <clientContext id="org.eclipse.papyrus.uml.diagram.sequenceDefaultCtx"/>

-         <clientContext id="org.eclipse.papyrus.uml.diagram.sequenceCtx_3001"/>

-      </extension>

+<extension point="org.eclipse.emf.validation.constraintBindings">
+      <?gmfgen generated="true"?>
+      <clientContext default="false" id="org.eclipse.papyrus.uml.diagram.sequenceDefaultCtx">
+         <selector class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationProvider$DefaultCtx"/>
+      </clientContext>
+      <binding context="org.eclipse.papyrus.uml.diagram.sequenceDefaultCtx">
+                  <constraint ref="org.eclipse.papyrus.uml.diagram.sequence.FragmentOrderingKeeper.Interaction"/>
+                  <constraint ref="org.eclipse.papyrus.uml.diagram.sequence.FragmentOrderingKeeper.InteractionOperand"/>
+               </binding>
+
+      <clientContext default="false" id="org.eclipse.papyrus.uml.diagram.sequenceCtx_3001">
+         <selector class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationProvider$Ctx_3001"/>
+      </clientContext>
+      <binding context="org.eclipse.papyrus.uml.diagram.sequenceCtx_3001">
+                  <constraint ref="org.eclipse.papyrus.uml.diagram.sequence.FragmentOrderingKeeper.LifelineFigure"/>
+               </binding>
+
+   </extension>
+<extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
+				      <?gmfgen generated="true"?>
+				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLValidationDecoratorProvider">
+				         <Priority name="Lowest"/>
+				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
+				         <context decoratorTargets="PRIMARY_VIEW"/>
+				      </decoratorProvider>
+				   </extension>
+
+<extension point="org.eclipse.emf.validation.ui.UIRegisteredClientContext">
+      <?gmfgen generated="true"?>
+         <clientContext id="org.eclipse.papyrus.uml.diagram.sequenceDefaultCtx"/>
+         <clientContext id="org.eclipse.papyrus.uml.diagram.sequenceCtx_3001"/>
+      </extension>
 <extension
       point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
    <editpolicyProvider
@@ -487,92 +487,92 @@
       </menuContribution>
    </extension>
    
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping"> 

-   <?gmfgen generated="true"?>

-   <diagramMappings diagramID="PapyrusUMLSequenceDiagram">

-   	<mapping type="PapyrusUMLSequenceDiagram" humanReadableType="SequenceDiagram"/>

-			<mapping

-				humanReadableType="Interaction"

-				type="Interaction_SubfragmentCompartment">

-			</mapping>

-			<mapping

-				humanReadableType="CombinedFragment"

-				type="CombinedFragment_SubfragmentCompartment">

-			</mapping>

-			<mapping

-				humanReadableType="Name"

-				type="Message_SynchNameLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Stereotype"

-				type="Message_SynchStereotypeLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Name"

-				type="Message_AsynchNameLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Stereotype"

-				type="Message_AsynchStereotypeLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Name"

-				type="Message_ReplyNameLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Stereotype"

-				type="Message_ReplyStereotypeLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Name"

-				type="Message_CreateNameLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Stereotype"

-				type="Message_CreateStereotypeLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Name"

-				type="Message_DeleteNameLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Stereotype"

-				type="Message_DeleteStereotypeLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Name"

-				type="Message_LostNameLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Stereotype"

-				type="Message_LostStereotypeLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Name"

-				type="Message_FoundNameLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Stereotype"

-				type="Message_FoundStereotypeLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Stereotype"

-				type="GeneralOrdering_StereotypeLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Stereotype"

-				type="Constraint_KeywordLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Floating Label"

-				type="Gate_NameLabel">

-			</mapping>

-			<mapping

-				humanReadableType="Name"

-				type="Gate_NameLabel">

-			</mapping>

-   </diagramMappings>

-</extension>

+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping"> 
+   <?gmfgen generated="true"?>
+   <diagramMappings diagramID="PapyrusUMLSequenceDiagram">
+   	<mapping type="PapyrusUMLSequenceDiagram" humanReadableType="SequenceDiagram"/>
+			<mapping
+				humanReadableType="Interaction"
+				type="Interaction_SubfragmentCompartment">
+			</mapping>
+			<mapping
+				humanReadableType="CombinedFragment"
+				type="CombinedFragment_SubfragmentCompartment">
+			</mapping>
+			<mapping
+				humanReadableType="Name"
+				type="Message_SynchNameLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Stereotype"
+				type="Message_SynchStereotypeLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Name"
+				type="Message_AsynchNameLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Stereotype"
+				type="Message_AsynchStereotypeLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Name"
+				type="Message_ReplyNameLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Stereotype"
+				type="Message_ReplyStereotypeLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Name"
+				type="Message_CreateNameLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Stereotype"
+				type="Message_CreateStereotypeLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Name"
+				type="Message_DeleteNameLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Stereotype"
+				type="Message_DeleteStereotypeLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Name"
+				type="Message_LostNameLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Stereotype"
+				type="Message_LostStereotypeLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Name"
+				type="Message_FoundNameLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Stereotype"
+				type="Message_FoundStereotypeLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Stereotype"
+				type="GeneralOrdering_StereotypeLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Stereotype"
+				type="Constraint_KeywordLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Floating Label"
+				type="Gate_NameLabel">
+			</mapping>
+			<mapping
+				humanReadableType="Name"
+				type="Gate_NameLabel">
+			</mapping>
+   </diagramMappings>
+</extension>
 
 
    <!-- optionally, specify keybindings -->
@@ -620,15 +620,15 @@
              target="1.3.0">
    	   </diagramReconciler>
     </extension>
-   <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">

-	      <?gmfgen generated="true"?>

-	      <visualTypeProvider

-	            class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLVisualTypeProvider"

-	            diagramType="PapyrusUMLSequenceDiagram">

-	         </visualTypeProvider>

-	   </extension>

-<extension point="org.eclipse.ui.handlers" id="menu-handlers">

-      <?gmfgen generated="true"?>

-   </extension>

+   <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
+	      <?gmfgen generated="true"?>
+	      <visualTypeProvider
+	            class="org.eclipse.papyrus.uml.diagram.sequence.providers.UMLVisualTypeProvider"
+	            diagramType="PapyrusUMLSequenceDiagram">
+	         </visualTypeProvider>
+	   </extension>
+<extension point="org.eclipse.ui.handlers" id="menu-handlers">
+      <?gmfgen generated="true"?>
+   </extension>
 
 </plugin>