Component Diagram regeneration

 - plugin.xml contribution

Change-Id: If5435573850d5aa4f2127812978c2323dbc531c3
Signed-off-by: ashatilov <shatilov@montages.com>

1 files changed, 665 insertions, 719 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
index 909d4a94553..44da5decce4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
@@ -134,202 +134,199 @@
    </extension>
 
 
-   <extension point="org.eclipse.ui.contexts" id="ui-context">
-				      <?gmfgen generated="true"?>
-				      <context
-				         description="%context.description"
-				         id="org.eclipse.papyrus.uml.diagram.component.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.component.ui.diagramContext"

+				         name="%context.name"

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

+				      </context>

+				   </extension>

 	
-   <extension point="org.eclipse.ui.preferencePages" id="prefpages">
-      <?gmfgen generated="true"?>
-<page
-      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLComponentDiagram"
-      name="PapyrusUMLComponentDiagram Diagram"
-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
-      class="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramGeneralPreferencePage">
-</page>
-<page
-      id="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramPrintingPreferencePage"
-      name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLComponentDiagram"
-      class="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramPrintingPreferencePage">
-</page>
-<page
-      id="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramRulersAndGridPreferencePage"
-      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"
-      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLComponentDiagram"
-      class="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramRulersAndGridPreferencePage">
-</page>
-   </extension>
-
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
-      <?gmfgen generated="true"?>
-      <propertyContributor
-            contributorId="org.eclipse.papyrus.uml.diagram.component"
-            labelProvider="org.eclipse.papyrus.uml.diagram.component.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.component">
-         <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.component">
-         <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.component.sheet.UMLPropertySection">
-            <input type="org.eclipse.gmf.runtime.notation.View"/>
-            <input type="org.eclipse.gef.EditPart"/>
-         </propertySection>
-      </propertySections>
-   </extension>
-
-
-	<extension point="org.eclipse.core.runtime.preferences" id="prefs">
-      <?gmfgen generated="true"?>
-      <initializer class="org.eclipse.papyrus.uml.diagram.component.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.component.providers.UMLViewProvider">
-         <Priority name="Lowest"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLComponentDiagram"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072,3079"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4001,4006,4003,4012,4014,4007,4013,4016,4015,4009,4010,4017,4018,4019"/>
-      </viewProvider>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
-      <?gmfgen generated="true"?>
-      <editpartProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLEditPartProvider">
-         <Priority name="Lowest"/>
-         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
-            <method name="getType()" value="PapyrusUMLComponentDiagram"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
-            <method name="getType()" value="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072,3079"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
-            <method name="getType()" value="4001,4006,4003,4012,4014,4007,4013,4016,4015,4009,4010,4017,4018,4019"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
-            <method name="getType()" value="5008,6029,5004,6030,5262,5254,5266,6031,5255,5252,5253,5265,5005,6032,5006,5007,5264,5261,5267,6033,5256,6026,5257,6027,5258,5259,5260,0,6028,5268"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
-            <method name="getType()" value="7001,7006,7002,7007,7005,7003,7004,7008,7009,7010,7011"/>
-         </object>
-         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
-      </editpartProvider>
-   </extension>
+   <extension point="org.eclipse.ui.preferencePages" id="prefpages">

+      <?gmfgen generated="true"?>

+<page

+      id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLComponentDiagram"

+      name="PapyrusUMLComponentDiagram Diagram"

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

+      class="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramGeneralPreferencePage">

+</page>

+<page

+      id="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramPrintingPreferencePage"

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

+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLComponentDiagram"

+      class="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramPrintingPreferencePage">

+</page>

+<page

+      id="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramRulersAndGridPreferencePage"

+      name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"

+      category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLComponentDiagram"

+      class="org.eclipse.papyrus.uml.diagram.component.preferences.DiagramRulersAndGridPreferencePage">

+</page>

+   </extension>

+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">

+      <?gmfgen generated="true"?>

+      <propertyContributor

+            contributorId="org.eclipse.papyrus.uml.diagram.component"

+            labelProvider="org.eclipse.papyrus.uml.diagram.component.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.component">

+         <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.component">

+         <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.component.sheet.UMLPropertySection">

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

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

+         </propertySection>

+      </propertySections>

+   </extension>

+
+
+	<extension point="org.eclipse.core.runtime.preferences" id="prefs">

+      <?gmfgen generated="true"?>

+      <initializer class="org.eclipse.papyrus.uml.diagram.component.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.component.providers.UMLViewProvider">

+         <Priority name="Lowest"/>

+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLComponentDiagram"/>

+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072,3079"/>

+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4001,4006,4003,4012,4014,4007,4013,4016,4015,4009,4010,4017,4018,4019"/>

+      </viewProvider>

+   </extension>

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

+      <?gmfgen generated="true"?>

+      <editpartProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLEditPartProvider">

+         <Priority name="Lowest"/>

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

+            <method name="getType()" value="PapyrusUMLComponentDiagram"/>

+         </object>

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

+            <method name="getType()" value="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072,3079"/>

+         </object>

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

+            <method name="getType()" value="4001,4006,4003,4012,4014,4007,4013,4016,4015,4009,4010,4017,4018,4019"/>

+         </object>

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

+            <method name="getType()" value="5008,6029,5004,6030,5262,5254,5266,6031,5255,5252,5253,5265,5005,6032,5006,5007,5264,5261,5267,6033,5256,6026,5257,6027,5258,5259,5260,0,6028,5268"/>

+         </object>

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

+            <method name="getType()" value="7001,7006,7002,7007,7005,7003,7004,7008,7009,7010,7011"/>

+         </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.component.providers.UMLIconProvider">
-         <Priority name="Low"/>
-      </IconProvider>
-   </extension>
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

+      <?gmfgen generated="true"?>

+      <IconProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLIconProvider">

+         <Priority name="Low"/>

+      </IconProvider>

+   </extension>

 
    
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
-      <?gmfgen generated="true"?>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
-      <?gmfgen generated="true"?>
-      <clientContext id="org.eclipse.papyrus.uml.diagram.component.TypeContext">
-         <enablement>
-            <test
-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
-               value="org.eclipse.papyrus.uml.diagram.component.EditingDomain"/>
-         </enablement>
-      </clientContext> 
-      <binding context="org.eclipse.papyrus.uml.diagram.component.TypeContext">
-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
-      </binding>
-   </extension>
+   
+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">

+      <?gmfgen generated="true"?>

+      <clientContext id="org.eclipse.papyrus.uml.diagram.component.TypeContext">

+         <enablement>

+            <test

+               property="org.eclipse.gmf.runtime.emf.core.editingDomain"

+               value="org.eclipse.papyrus.uml.diagram.component.EditingDomain"/>

+         </enablement>

+      </clientContext> 

+      <binding context="org.eclipse.papyrus.uml.diagram.component.TypeContext">

+         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>

+      </binding>

+   </extension>

 	   
 	   
       
    
 
-   <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.component.LoadResourceAction">
-            <visibleWhen>
-               <and>
-                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorID"/></with>
-                  <with variable="selection"><iterate ifEmpty="false"> 
-                     <instanceof value="org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart"/>
-                  </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.component.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
-      <command id="org.eclipse.papyrus.uml.diagram.component.LoadResourceAction"
-         name="Load Resource"
-         categoryId="org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorID"
-         defaultHandler="org.eclipse.papyrus.uml.diagram.component.part.LoadResourceAction"/>
-   </extension>
-
-   <extension point="org.eclipse.ui.handlers" id="menu-handlers">
-      <?gmfgen generated="true"?>
-   </extension>
+   <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.component.LoadResourceAction">

+            <visibleWhen>

+               <and>

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

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

+                     <instanceof value="org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart"/>

+                  </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.component.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>

+      <command id="org.eclipse.papyrus.uml.diagram.component.LoadResourceAction"

+         name="Load Resource"

+         categoryId="org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorID"

+         defaultHandler="org.eclipse.papyrus.uml.diagram.component.part.LoadResourceAction"/>

+   </extension>

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

+      <?gmfgen generated="true"?>

+   </extension>

 
 
 
@@ -348,395 +345,395 @@
    
    
    
-<extension
-			id="Papyrus Component Diagram .palettedefinition"
-			name="Papyrus Component Diagram  Predefined Entries"
-			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
-			
-			<?gmfgen generated="true"?>	
-			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-				<Priority name="Lowest"/>
-				   		<contribution
-				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.component.part.UMLPaletteFactory">
-				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
-				
-				<entry
-				      defineOnly="true"
-				      description="Create a Constraint"
-				      id="component.tool.constraint"
-				      kind="tool"
-				      label="Constraint"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Comment"
-				      id="component.tool.comment"
-				      kind="tool"
-				      label="Comment"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Component"
-				      id="component.tool.component"
-				      kind="tool"
-				      label="Component"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an Interface"
-				      id="component.tool.interface"
-				      kind="tool"
-				      label="Interface"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a model"
-				      id="component.tool.model"
-				      kind="tool"
-				      label="Model"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Property"
-				      id="component.tool.property"
-				      kind="tool"
-				      label="Property"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an Operation"
-				      id="component.tool.operation"
-				      kind="tool"
-				      label="Operation"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Package"
-				      id="component.tool.package"
-				      kind="tool"
-				      label="Package"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Port"
-				      id="component.tool.port"
-				      kind="tool"
-				      label="Port"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Reception"
-				      id="component.tool.reception"
-				      kind="tool"
-				      label="Reception"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Link (Comment / Constraint)"
-				      id="component.tool.link"
-				      kind="tool"
-				      label="Link"
-				      large_icon="icons/obj16/Link.gif"
-				      path=""
-				      small_icon="icons/obj16/Link.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Connector"
-				      id="component.tool.connector"
-				      kind="tool"
-				      label="Connector"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Dependency"
-				      id="component.tool.dependency"
-				      kind="tool"
-				      label="Dependency"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a dependency branch"
-				      id="component.tool.dependencybranch"
-				      kind="tool"
-				      label="DependencyBranch"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an Abstraction"
-				      id="component.tool.abstraction"
-				      kind="tool"
-				      label="Abstraction"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Manifestation"
-				      id="component.tool.manifestation"
-				      kind="tool"
-				      label="Manifestation"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Generalization link"
-				      id="component.tool.generalization"
-				      kind="tool"
-				      label="Generalization"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an Usage"
-				      id="component.tool.usage"
-				      kind="tool"
-				      label="Usage"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Substitution"
-				      id="component.tool.substitution"
-				      kind="tool"
-				      label="Substitution"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create an Interface Realization"
-				      id="component.tool.interfaceRealization"
-				      kind="tool"
-				      label="Interface Realization"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create a Component Realization"
-				      id="component.tool.componentRealization"
-				      kind="tool"
-				      label="Component Realization"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ComponentRealization.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ComponentRealization.gif">
-					</entry>
-				
-				</contribution>
-			</paletteProvider>	
-				
-		</extension>
-
-<extension
-	id="Papyrus Component Diagram .standard"
-	name="Papyrus Component Diagram  Standard Palette"
-	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
-	
-	<?gmfgen generated="true"?>	
-	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-		<Priority name="Low"/>
-		   		<contribution
-		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.component.part.UMLPaletteFactory">
-		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
-		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
-		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
-		
-		<entry
-		      description="Diagram Nodes"
-		      id="component.group.nodes"
-		      kind="drawer"
-		      label="Nodes"
-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-		      path="/"
-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-		   <expand
-		         force="true">
-		   </expand>
-		</entry>
-		<predefinedEntry
-		        id="component.tool.constraint"
-				path="/component.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.comment"
-				path="/component.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.component"
-				path="/component.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.interface"
-				path="/component.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.model"
-				path="/component.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.property"
-				path="/component.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.operation"
-				path="/component.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.package"
-				path="/component.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.port"
-				path="/component.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.reception"
-				path="/component.group.nodes">
-		  </predefinedEntry>
-		<entry
-		      description="Diagram Links"
-		      id="component.group.links"
-		      kind="drawer"
-		      label="Links"
-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-		      path="/"
-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-		   <expand
-		         force="true">
-		   </expand>
-		</entry>
-		<predefinedEntry
-		        id="component.tool.link"
-				path="/component.group.links">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.connector"
-				path="/component.group.links">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.dependency"
-				path="/component.group.links">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.dependencybranch"
-				path="/component.group.links">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.abstraction"
-				path="/component.group.links">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.manifestation"
-				path="/component.group.links">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.generalization"
-				path="/component.group.links">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.usage"
-				path="/component.group.links">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.substitution"
-				path="/component.group.links">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.interfaceRealization"
-				path="/component.group.links">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="component.tool.componentRealization"
-				path="/component.group.links">
-		  </predefinedEntry>
-		</contribution>
-		<editor id="org.eclipse.papyrus.uml.diagram.component"/>
-	</paletteProvider>	
-		
-</extension>
-
-<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
-      <?gmfgen generated="true"?>
-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLParserProvider">
-         <Priority name="Lowest"/>
-      </ParserProvider>
-   </extension>
+<extension

+			id="Papyrus Component Diagram .palettedefinition"

+			name="Papyrus Component Diagram  Predefined Entries"

+			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 

+			

+			<?gmfgen generated="true"?>	

+			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

+				<Priority name="Lowest"/>

+				   		<contribution

+				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.component.part.UMLPaletteFactory">

+				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

+				

+				<entry

+				      defineOnly="true"

+				      description="Create a Constraint"

+				      id="component.tool.constraint"

+				      kind="tool"

+				      label="Constraint"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Comment"

+				      id="component.tool.comment"

+				      kind="tool"

+				      label="Comment"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Component"

+				      id="component.tool.component"

+				      kind="tool"

+				      label="Component"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Component.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an Interface"

+				      id="component.tool.interface"

+				      kind="tool"

+				      label="Interface"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a model"

+				      id="component.tool.model"

+				      kind="tool"

+				      label="Model"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Property"

+				      id="component.tool.property"

+				      kind="tool"

+				      label="Property"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an Operation"

+				      id="component.tool.operation"

+				      kind="tool"

+				      label="Operation"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Package"

+				      id="component.tool.package"

+				      kind="tool"

+				      label="Package"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Port"

+				      id="component.tool.port"

+				      kind="tool"

+				      label="Port"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Reception"

+				      id="component.tool.reception"

+				      kind="tool"

+				      label="Reception"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Link (Comment / Constraint)"

+				      id="component.tool.link"

+				      kind="tool"

+				      label="Link"

+				      large_icon="icons/obj16/Link.gif"

+				      path=""

+				      small_icon="icons/obj16/Link.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Connector"

+				      id="component.tool.connector"

+				      kind="tool"

+				      label="Connector"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Dependency"

+				      id="component.tool.dependency"

+				      kind="tool"

+				      label="Dependency"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a dependency branch"

+				      id="component.tool.dependencybranch"

+				      kind="tool"

+				      label="DependencyBranch"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an Abstraction"

+				      id="component.tool.abstraction"

+				      kind="tool"

+				      label="Abstraction"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Manifestation"

+				      id="component.tool.manifestation"

+				      kind="tool"

+				      label="Manifestation"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Manifestation.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Generalization link"

+				      id="component.tool.generalization"

+				      kind="tool"

+				      label="Generalization"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an Usage"

+				      id="component.tool.usage"

+				      kind="tool"

+				      label="Usage"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Substitution"

+				      id="component.tool.substitution"

+				      kind="tool"

+				      label="Substitution"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create an Interface Realization"

+				      id="component.tool.interfaceRealization"

+				      kind="tool"

+				      label="Interface Realization"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif">

+				</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create a Component Realization"

+				      id="component.tool.componentRealization"

+				      kind="tool"

+				      label="Component Realization"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ComponentRealization.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ComponentRealization.gif">

+				</entry>

+				

+				</contribution>

+			</paletteProvider>	

+				

+		</extension>

+
+<extension

+	id="Papyrus Component Diagram .standard"

+	name="Papyrus Component Diagram  Standard Palette"

+	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 

+	

+	<?gmfgen generated="true"?>	

+	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

+		<Priority name="Low"/>

+		   		<contribution

+		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.component.part.UMLPaletteFactory">

+		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

+		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

+		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

+		

+		<entry

+		      description="Diagram Nodes"

+		      id="component.group.nodes"

+		      kind="drawer"

+		      label="Nodes"

+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+		      path="/"

+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

+		   <expand

+		         force="true">

+		   </expand>

+		</entry>

+		<predefinedEntry

+		        id="component.tool.constraint"

+				path="/component.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.comment"

+				path="/component.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.component"

+				path="/component.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.interface"

+				path="/component.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.model"

+				path="/component.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.property"

+				path="/component.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.operation"

+				path="/component.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.package"

+				path="/component.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.port"

+				path="/component.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.reception"

+				path="/component.group.nodes">

+		  </predefinedEntry>

+		<entry

+		      description="Diagram Links"

+		      id="component.group.links"

+		      kind="drawer"

+		      label="Links"

+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+		      path="/"

+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

+		   <expand

+		         force="true">

+		   </expand>

+		</entry>

+		<predefinedEntry

+		        id="component.tool.link"

+				path="/component.group.links">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.connector"

+				path="/component.group.links">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.dependency"

+				path="/component.group.links">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.dependencybranch"

+				path="/component.group.links">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.abstraction"

+				path="/component.group.links">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.manifestation"

+				path="/component.group.links">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.generalization"

+				path="/component.group.links">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.usage"

+				path="/component.group.links">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.substitution"

+				path="/component.group.links">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.interfaceRealization"

+				path="/component.group.links">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="component.tool.componentRealization"

+				path="/component.group.links">

+		  </predefinedEntry>

+		</contribution>

+		<editor id="org.eclipse.papyrus.uml.diagram.component"/>

+	</paletteProvider>	

+		

+</extension>

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

+      <?gmfgen generated="true"?>

+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLParserProvider">

+         <Priority name="Lowest"/>

+      </ParserProvider>

+   </extension>

 
 
 
    <!-- optionally, specify keybindings -->
-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
-				      <?gmfgen generated="true"?>
-				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLMarkerNavigationProvider">
-				         <MarkerType name="org.eclipse.papyrus.uml.diagram.component.diagnostic"/>
-				         <Priority name="Lowest"/>
-				      </MarkerNavigationProvider>
-				   </extension>
-
-<extension id="diagnostic" name="Papyrus Component Diagram  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 id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
-				      <?gmfgen generated="true"?>
-				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.component.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.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

+				      <?gmfgen generated="true"?>

+				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLMarkerNavigationProvider">

+				         <MarkerType name="org.eclipse.papyrus.uml.diagram.component.diagnostic"/>

+				         <Priority name="Lowest"/>

+				      </MarkerNavigationProvider>

+				   </extension>

+
+<extension id="diagnostic" name="Papyrus Component Diagram  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 id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

+				      <?gmfgen generated="true"?>

+				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.component.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.ui.commands">
    <command
@@ -834,153 +831,102 @@
       </context>
    </editpartProvider>
 </extension>
-<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping"> 

    <?gmfgen generated="true"?>

-		<diagramMappings diagramID="PapyrusUMLComponentDiagram">
-			<mapping type="PapyrusUMLComponentDiagram" humanReadableType="ComponentDiagram"/>
-			
-	<mapping
-		humanReadableType="packaged elements"
-		type="7001">
-	</mapping>
-
-	<mapping
-		humanReadableType="packaged elements"
-		type="7006">
-	</mapping>
-
-	<mapping
-		humanReadableType="packaged elements"
-		type="7002">
-	</mapping>
-
-	<mapping
-		humanReadableType="packaged elements"
-		type="7007">
-	</mapping>
-
-	<mapping
-		humanReadableType="packaged elements"
-		type="7005">
-	</mapping>
-
-	<mapping
-		humanReadableType="packaged elements"
-		type="7003">
-	</mapping>
-
-	<mapping
-		humanReadableType="packaged elements"
-		type="7004">
-	</mapping>
-
-	<mapping
-		humanReadableType="attributes"
-		type="7008">
-	</mapping>
-
-	<mapping
-		humanReadableType="operations"
-		type="7009">
-	</mapping>
-
-	<mapping
-		humanReadableType="attributes"
-		type="7010">
-	</mapping>
-
-	<mapping
-		humanReadableType="operations"
-		type="7011">
-	</mapping>
-
-			
-	
-
-	
-
-	
-	<mapping
-		humanReadableType="Stereotype"
-		type="2">
-	</mapping>
-
-
-	
-	<mapping
-		humanReadableType="Name"
-		type="6006">
-	</mapping>
-
-	<mapping
-		humanReadableType="Stereotype"
-		type="6020">
-	</mapping>
-
-
-	
-	<mapping
-		humanReadableType="Name"
-		type="6008">
-	</mapping>
-
-	<mapping
-		humanReadableType="Stereotype"
-		type="6022">
-	</mapping>
-
-
-	
-	<mapping
-		humanReadableType="Name"
-		type="3">
-	</mapping>
-
-	<mapping
-		humanReadableType="Stereotype"
-		type="4">
-	</mapping>
-
-
-	
-	<mapping
-		humanReadableType="Name"
-		type="6007">
-	</mapping>
-
-	<mapping
-		humanReadableType="Stereotype"
-		type="6021">
-	</mapping>
-
-
-	
-
-	
-
-	
-
-	
-	<mapping
-		humanReadableType="Name"
-		type="6009">
-	</mapping>
-
-	<mapping
-		humanReadableType="Stereotype"
-		type="6023">
-	</mapping>
-
-
-	
-
-	
-
-	
-	<mapping
-		humanReadableType="Name"
-		type="6025">
-	</mapping>
+   <diagramMappings diagramID="PapyrusUMLComponentDiagram">

+   	<mapping type="PapyrusUMLComponentDiagram" humanReadableType="ComponentDiagram"/>

+			<mapping

+				humanReadableType="packaged elements"

+				type="7001">

+			</mapping>

+			<mapping

+				humanReadableType="packaged elements"

+				type="7006">

+			</mapping>

+			<mapping

+				humanReadableType="packaged elements"

+				type="7002">

+			</mapping>

+			<mapping

+				humanReadableType="packaged elements"

+				type="7007">

+			</mapping>

+			<mapping

+				humanReadableType="packaged elements"

+				type="7005">

+			</mapping>

+			<mapping

+				humanReadableType="packaged elements"

+				type="7003">

+			</mapping>

+			<mapping

+				humanReadableType="packaged elements"

+				type="7004">

+			</mapping>

+			<mapping

+				humanReadableType="attributes"

+				type="7008">

+			</mapping>

+			<mapping

+				humanReadableType="operations"

+				type="7009">

+			</mapping>

+			<mapping

+				humanReadableType="attributes"

+				type="7010">

+			</mapping>

+			<mapping

+				humanReadableType="operations"

+				type="7011">

+			</mapping>

+			<mapping

+				humanReadableType="Stereotype"

+				type="2">

+			</mapping>

+			<mapping

+				humanReadableType="Name"

+				type="6006">

+			</mapping>

+			<mapping

+				humanReadableType="Stereotype"

+				type="6020">

+			</mapping>

+			<mapping

+				humanReadableType="Name"

+				type="6008">

+			</mapping>

+			<mapping

+				humanReadableType="Stereotype"

+				type="6022">

+			</mapping>

+			<mapping

+				humanReadableType="Name"

+				type="3">

+			</mapping>

+			<mapping

+				humanReadableType="Stereotype"

+				type="4">

+			</mapping>

+			<mapping

+				humanReadableType="Name"

+				type="6007">

+			</mapping>

+			<mapping

+				humanReadableType="Stereotype"

+				type="6021">

+			</mapping>

+			<mapping

+				humanReadableType="Name"

+				type="6009">

+			</mapping>

+			<mapping

+				humanReadableType="Stereotype"

+				type="6023">

+			</mapping>

+			<mapping

+				humanReadableType="Name"

+				type="6025">

+			</mapping>

 			<mapping

 				humanReadableType="Floating Label"

 				type="6033">

@@ -1013,8 +959,8 @@
 				humanReadableType="Floating Label"

 				type="6032">

 			</mapping>

-	</diagramMappings>
-</extension>
+   </diagramMappings>

+</extension>

 
 <extension
       point="org.eclipse.gmf.runtime.common.ui.services.parserProviders">