399860: Papyrus shall enable to customize the creation policy of views

https://bugs.eclipse.org/bugs/show_bug.cgi?id=399860
Signed-off-by: Laurent Wouters <laurent.wouters@cea.fr>

25 files changed, 88 insertions, 530 deletions

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
index adca22ec8af..e10010b14ff 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/META-INF/MANIFEST.MF
@@ -35,7 +35,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0",

- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.0"

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0"

 Export-Package: org.eclipse.papyrus.sysml.diagram.blockdefinition,

  org.eclipse.papyrus.sysml.diagram.blockdefinition.command,

  org.eclipse.papyrus.sysml.diagram.blockdefinition.dnd.helper,

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
index f96efcad785..a733e4a5bb7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
@@ -38,48 +38,6 @@
 </extension>
 
 <!-- Diagram creation command registration in menu and toolbar -->
-<extension point="org.eclipse.ui.menus">
-
-	<menuContribution locationURI="menu:org.eclipse.papyrus.ui.menu">
-	<menu id="org.eclipse.papyrus.uml.diagram.ui.menu.diagrams" label="Diagrams">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.blockdefinition.CreateCommand"
-			icon="icons/obj16/Diagram_BlockDefinition.gif" label="Create a new Block Definition Diagram"
-			style="push" tooltip="Create a new Block Definition Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysMLBlocks"/>
-			</visibleWhen>
-					
-		</command>
-	</menu>
-	</menuContribution>
-	
-	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
-	<toolbar id="org.eclipse.papyrus.uml.diagram.ui.toolbar">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.blockdefinition.CreateCommand"
-			icon="icons/obj16/Diagram_BlockDefinition.gif" label="Create a new Block Definition Diagram"
-			style="push" tooltip="Create a new Block Definition Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysMLBlocks"/>
-			</visibleWhen>
-				
-		</command>
-	</toolbar>
-	</menuContribution>
-	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.blockdefinition.CreateCommand"
-			icon="icons/obj16/Diagram_BlockDefinition.gif"
-			label="Create a new Block Definition Diagram"
-			style="push"
-			tooltip="Create a new Block Definition Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysMLBlocks"/>
-			</visibleWhen>
-			
-		</command>
-	</menuContribution>
-		
-</extension>
 
 <!-- Palette tool definition (defines tools possibly used by the palette(s)) -->
 <extension point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java
index 0b821dc8a8b..5762d728927 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCreateCommand.java
@@ -7,27 +7,28 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
- *		CEA LIST - Initial API and implementation
+ * 		CEA LIST - Initial API and implementation
+ * 		Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application
  *
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.blockdefinition;
 
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 
+/**
+ * Represents the creation command for a SysML block definition diagram
+ * @author Laurent Wouters
+ */
 public class BlockDefinitionDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-
+	
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	protected String getDefaultDiagramName() {
-		return "NewDiagram"; // //$NON-NLS-1$
+		return "New Block Definition Diagram"; // //$NON-NLS-1$
 	}
 
 	/**
@@ -45,14 +46,4 @@ public class BlockDefinitionDiagramCreateCommand extends AbstractPapyrusGmfCreat
 	protected PreferencesHint getPreferenceHint() {
 		return Activator.DIAGRAM_PREFERENCES_HINT;
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Diagram createDiagram(Resource diagramResource, EObject owner, String name) {
-		// Start of user code Custom diagram creation
-		return super.createDiagram(diagramResource, owner, name);
-		// End of user code
-	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java
index ab73a3a7606..e428045b47d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java
@@ -9,15 +9,13 @@
  * Contributors:

  *		

  *		CEA LIST - Initial API and implementation

+ *  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application

  *

  *****************************************************************************/

 package org.eclipse.papyrus.sysml.diagram.blockdefinition;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.papyrus.infra.core.extension.commands.PerspectiveContextDependence;

-import org.eclipse.papyrus.sysml.blocks.BlocksPackage;

-import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;

-import org.eclipse.uml2.uml.util.UMLUtil;

 

 /**

  * BlockDefinitionDiagramCondition to set conditions for the diagram creation

@@ -28,15 +26,6 @@ public class BlockDefinitionDiagramCondition extends PerspectiveContextDependenc
 	 * {@inheritDoc}

 	 */

 	public boolean create(EObject selectedElement) {

-		if(super.create(selectedElement)) {

-			if(selectedElement instanceof org.eclipse.uml2.uml.Package) {

-				org.eclipse.uml2.uml.Package pack = (org.eclipse.uml2.uml.Package)selectedElement;

-				if(pack.getAllAppliedProfiles().contains(UMLUtil.getProfile(BlocksPackage.eINSTANCE, pack))

-					&& pack.getAllAppliedProfiles().contains(UMLUtil.getProfile(PortandflowsPackage.eINSTANCE, pack))) {

-					return true;

-				}

-			}

-		}

 		return false;

 	}

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/CreateBlockDefinitionDiagramWithNavigationHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/CreateBlockDefinitionDiagramWithNavigationHandler.java
deleted file mode 100644
index 7f0736c872a..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/CreateBlockDefinitionDiagramWithNavigationHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *		

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.blockdefinition;

-

-import org.eclipse.papyrus.infra.gmfdiag.navigation.CreateDiagramWithNavigationHandler;

-

-

-public class CreateBlockDefinitionDiagramWithNavigationHandler extends CreateDiagramWithNavigationHandler {

-

-	public CreateBlockDefinitionDiagramWithNavigationHandler() {

-		super(new BlockDefinitionDiagramCreateCommand(), new BlockDefinitionDiagramCondition());

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
index 0ef0093f596..09371dfb664 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/META-INF/MANIFEST.MF
@@ -32,7 +32,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0",

  org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.0",

- org.eclipse.papyrus.uml.diagram.common

+ org.eclipse.papyrus.uml.diagram.common,

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0"

 Export-Package: org.eclipse.papyrus.sysml.diagram.internalblock,

  org.eclipse.papyrus.sysml.diagram.internalblock.compatibility,

  org.eclipse.papyrus.sysml.diagram.internalblock.dnd.helper,

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
index 4c28c5165b4..006ed0354f6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
@@ -13,48 +13,8 @@
 	<command id="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand" name="Create a new Internal Block Diagram" description="Create a new Internal Block Diagram" categoryId="org.eclipse.papyrus.editor.category"></command>
 </extension>
 
-<extension point="org.eclipse.ui.handlers">
-	<handler class="org.eclipse.papyrus.sysml.diagram.internalblock.CreateInternalBlockDiagramWithNavigationHandler" commandId="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand">
-		<activeWhen>
-			<with variable="activeEditorId">
-				<equals value="org.eclipse.papyrus.infra.core.papyrusEditor"></equals>
-			</with>
-		</activeWhen>
-	</handler>
-</extension>
 
 <!-- Diagram creation command registration in menu and toolbar -->
-<extension point="org.eclipse.ui.menus">
-
-	<menuContribution locationURI="menu:org.eclipse.papyrus.ui.menu">
-	<menu id="org.eclipse.papyrus.uml.diagram.ui.menu.diagrams" label="Diagrams">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand" icon="icons/obj16/Diagram_InternalBlock.gif" label="Create a new Internal Block Diagram" style="push" tooltip="Create a new Internal Block Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysMLBlocks"></reference>
-			</visibleWhen>
-		</command>
-	</menu>
-	</menuContribution>
-	
-	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
-	<toolbar id="org.eclipse.papyrus.uml.diagram.ui.toolbar">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand" icon="icons/obj16/Diagram_InternalBlock.gif" label="Create a new Internal Block Diagram" style="push" tooltip="Create a new Internal Block Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysMLBlocks"></reference>
-			</visibleWhen>
-		</command>
-	</toolbar>
-	</menuContribution>
-	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">
-	    <command commandId="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand" icon="icons/obj16/Diagram_InternalBlock.gif" label="Create a new Internal Block Diagram" style="push" tooltip="Create a new Internal Block Diagram">
-	       <visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysMLBlocks"></reference>
-	       </visibleWhen>
-	    </command>
-	</menuContribution>
-	
-</extension>
 
 <!-- Palette tool definition (defines tools possibly used by the palette(s)) -->
 <extension point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders" name="SYSML_InternalBlock_Predefined_Entries" id="org.eclipse.papyrus.sysml.diagram.blockdefinition.palettedefinition"> 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
index 2e4be9f1c20..a92567f3942 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCreateCommand.java
@@ -7,8 +7,8 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		
  *		CEA LIST - Initial API and implementation
+ *		Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application
  *
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.internalblock;
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramC
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.papyrus.sysml.blocks.Block;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
@@ -40,18 +41,19 @@ import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.util.UMLUtil;
-// Start of user code custom imports
-
-//  End of user code
 
+/**
+ * Represents the creation command for a SysML internal block diagram
+ * @author Laurent Wouters
+ */
 public class InternalBlockDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-
+	
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	protected String getDefaultDiagramName() {
-		return "NewDiagram"; //$NON-NLS-1$
+		return "New Internal Block Diagram"; //$NON-NLS-1$
 	}
 
 	/**
@@ -74,27 +76,27 @@ public class InternalBlockDiagramCreateCommand extends AbstractPapyrusGmfCreateD
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected Diagram createDiagram(Resource diagramResource, EObject owner, String name) {
+	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, ViewPrototype prototype, String name) {
 		// Start of user code Custom diagram creation
 		Diagram diagram = null;
 
-		if(owner instanceof org.eclipse.uml2.uml.Class) {
-			org.eclipse.uml2.uml.Class cOwner = (org.eclipse.uml2.uml.Class)owner;
+		if (element instanceof org.eclipse.uml2.uml.Class) {
+			org.eclipse.uml2.uml.Class cOwner = (org.eclipse.uml2.uml.Class)element;
 			Block block = UMLUtil.getStereotypeApplication(cOwner, Block.class);
 
 			if(block != null) {
-				canvasDomainElement = (EObject)owner;
-				Package owningPackage = ((Element)owner).getNearestPackage();
-				diagram = super.createDiagram(diagramResource, owningPackage, name);
+				canvasDomainElement = (EObject)element;
+				Package owningPackage = ((Element)element).getNearestPackage();
+				diagram = super.doCreateDiagram(diagramResource, owner, owningPackage, prototype, name);
 			}
 
-		} else if(owner instanceof Package) {
+		} else if (element instanceof Package) {
 
 			try {
 				canvasDomainElement = null;
 
-				IEditCommandRequest request = new CreateElementRequest((Package)owner, SysMLElementTypes.BLOCK);
-				IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(owner);
+				IEditCommandRequest request = new CreateElementRequest((Package)element, SysMLElementTypes.BLOCK);
+				IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(element);
 				if(commandService == null) {
 					return null;
 				}
@@ -104,7 +106,7 @@ public class InternalBlockDiagramCreateCommand extends AbstractPapyrusGmfCreateD
 					createElementCommand.execute(new NullProgressMonitor(), null);
 					EObject block = GMFCommandUtils.getCommandEObjectResult(createElementCommand);
 					canvasDomainElement = block;
-					diagram = super.createDiagram(diagramResource, (Package)owner, name);
+					diagram = super.doCreateDiagram(diagramResource, owner, (Package)element, prototype, name);
 				}
 
 			} catch (ExecutionException e) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/CreateInternalBlockDiagramWithNavigationHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/CreateInternalBlockDiagramWithNavigationHandler.java
deleted file mode 100644
index e28547f8d72..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/CreateInternalBlockDiagramWithNavigationHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 CEA LIST.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *		

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.internalblock;

-

-import org.eclipse.papyrus.infra.gmfdiag.navigation.CreateDiagramWithNavigationHandler;

-

-public class CreateInternalBlockDiagramWithNavigationHandler extends CreateDiagramWithNavigationHandler {

-

-	public CreateInternalBlockDiagramWithNavigationHandler() {

-		super(new InternalBlockDiagramCreateCommand(), new InternalBlockDiagramCondition());

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCondition.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCondition.java
index 51430cfea7a..276607b58d1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCondition.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/InternalBlockDiagramCondition.java
@@ -7,16 +7,14 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *		

  *		CEA LIST - Initial API and implementation

+ *		Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application

  *

  *****************************************************************************/

 package org.eclipse.papyrus.sysml.diagram.internalblock;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.papyrus.infra.core.extension.commands.PerspectiveContextDependence;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.uml2.uml.util.UMLUtil;

 

 /**

  * InternalBlockDiagramCondition to set conditions for the diagram creation

@@ -28,14 +26,6 @@ public class InternalBlockDiagramCondition extends PerspectiveContextDependence
 	 */

 	@Override

 	public boolean create(EObject selectedElement) {

-		if(super.create(selectedElement)) {

-			if(selectedElement instanceof org.eclipse.uml2.uml.Class) {

-				org.eclipse.uml2.uml.Class clazz = (org.eclipse.uml2.uml.Class)selectedElement;

-				if(UMLUtil.getStereotypeApplication(clazz, Block.class) != null) {

-					return true;

-				}

-			}

-		}

 		return false;

 	}

 }

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF
index 5e2d1dc918d..7b7ed041cc8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
-Manifest-Version: 1.0

+Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.sysml.diagram.parametric,

  org.eclipse.papyrus.sysml.diagram.parametric.commands,

  org.eclipse.papyrus.sysml.diagram.parametric.edit.part,

@@ -15,46 +15,48 @@ Bundle-ActivationPolicy: lazy
 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
  org.eclipse.papyrus.sysml;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

- org.eclipse.emf.common.ui;bundle-version="2.5.0",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

+ org.eclipse.emf.common.ui;bundle-version="2.5.0",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.diagram.composite;bundle-version="1.0.0",

- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0",

+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0",
  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

- org.eclipse.core.expressions,

+ org.eclipse.core.expressions,
  org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",

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

- org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

+ org.eclipse.gmf.runtime.diagram.core;bundle-version="1.4.1",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0",

- org.eclipse.ui.ide;bundle-version="3.8.0",

+ org.eclipse.ui.ide;bundle-version="3.8.0",
  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

- org.eclipse.uml2.uml;bundle-version="4.0.0",

+ org.eclipse.uml2.uml;bundle-version="4.0.0",
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

- org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

+ org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",
  org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

  org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.0",

  org.eclipse.papyrus.views.properties;bundle-version="1.0.0",

- org.eclipse.core.databinding.observable;bundle-version="1.4.1",

- org.eclipse.papyrus.views.properties.model;bundle-version="1.0.0"

+ org.eclipse.core.databinding.observable;bundle-version="1.4.1",
+ org.eclipse.papyrus.views.properties.model;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

 Bundle-Version: 1.0.0.qualifier

-Bundle-ManifestVersion: 2

+Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.parametric.Activat

  or

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.parametric;sing

  leton:=true

-Import-Package: org.eclipse.gmf.runtime.notation

+Import-Package: org.eclipse.gmf.runtime.notation
 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
index 5d692b0f0e7..90703712cbc 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
@@ -46,59 +46,10 @@
 		name="Show/Hide Constraint expression"/>
 </extension>
 
-<extension point="org.eclipse.ui.handlers">
-	<handler
-		class="org.eclipse.papyrus.sysml.diagram.parametric.CreateParametricDiagramWithNavigationHandler"
-		commandId="org.eclipse.papyrus.sysml.diagram.parametric.CreateCommand">
-		<activeWhen>
-			<with variable="activeEditorId">
-				<equals value="org.eclipse.papyrus.infra.core.papyrusEditor" />
-			</with>
-		</activeWhen>
-	</handler>
-</extension>
 
 <!-- Diagram creation command registration in menu and toolbar -->
 <extension point="org.eclipse.ui.menus">
 
-	<menuContribution locationURI="menu:org.eclipse.papyrus.ui.menu">
-	<menu id="org.eclipse.papyrus.uml.diagram.ui.menu.diagrams" label="Diagrams">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.parametric.CreateCommand"
-			icon="icons/obj16/Diagram_Parametric.png" label="Create a new Parametric Diagram"
-			style="push" tooltip="Create a new Parametric Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>
-			</visibleWhen>
-					
-		</command>
-	</menu>
-	</menuContribution>
-	
-	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
-	<toolbar id="org.eclipse.papyrus.uml.diagram.ui.toolbar">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.parametric.CreateCommand"
-			icon="icons/obj16/Diagram_Parametric.png" label="Create a new Parametric Diagram"
-			style="push" tooltip="Create a new Parametric Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>
-			</visibleWhen>
-				
-		</command>
-	</toolbar>
-	</menuContribution>
-	
-	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">
-		<command commandId="org.eclipse.papyrus.sysml.diagram.parametric.CreateCommand"
-			icon="icons/obj16/Diagram_Parametric.png"
-			label="Create a new Parametric Diagram"
-			style="push"
-			tooltip="Create a new Parametric Diagram">
-			<visibleWhen>
-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>
-			</visibleWhen>
-			
-		</command>
-	</menuContribution>
 
   	<menuContribution locationURI="popup:org.eclipse.papyrus.uml.diagram.ui.popupmenu.format">
       <menu
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java
index dd2a875a2a8..a8302d4f326 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCreateCommand.java
@@ -9,6 +9,7 @@
  * Contributors:
  *		Régis CHEVREL: chevrel.regis <at> gmail.com
  *		CEA LIST - Initial API and implementation
+ *		Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application
  *
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.parametric;
@@ -31,6 +32,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramC
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
+import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.papyrus.sysml.blocks.Block;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
 import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
@@ -41,17 +43,18 @@ import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.util.UMLUtil;
 
-// Start of user code custom imports
-//  End of user code
-
+/**
+ * Represents a creation command for a SysML parametric diagram
+ * @author Laurent Wouters
+ */
 public class ParametricDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-
+	
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	protected String getDefaultDiagramName() {
-		return "NewParametricDiagram"; //$NON-NLS-1$
+		return "New Parametric Diagram"; //$NON-NLS-1$
 	}
 
 	/**
@@ -74,27 +77,26 @@ public class ParametricDiagramCreateCommand extends AbstractPapyrusGmfCreateDiag
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected Diagram createDiagram(Resource diagramResource, EObject owner, String name) {
+	protected Diagram doCreateDiagram(Resource diagramResource, EObject owner, EObject element, ViewPrototype prototype, String name) {
 		// Start of user code Custom diagram creation
 		Diagram diagram = null;
 
-		if(owner instanceof org.eclipse.uml2.uml.Class) {
-			org.eclipse.uml2.uml.Class cOwner = (org.eclipse.uml2.uml.Class)owner;
+		if (element instanceof org.eclipse.uml2.uml.Class) {
+			org.eclipse.uml2.uml.Class cOwner = (org.eclipse.uml2.uml.Class)element;
 			Block block = UMLUtil.getStereotypeApplication(cOwner, Block.class);
 
 			if(block != null) {
-				canvasDomainElement = (EObject)owner;
-				Package owningPackage = ((Element)owner).getNearestPackage();
-				diagram = super.createDiagram(diagramResource, owningPackage, name);
+				canvasDomainElement = (EObject)element;
+				Package owningPackage = ((Element)element).getNearestPackage();
+				diagram = super.doCreateDiagram(diagramResource, owner, owningPackage, prototype, name);
 			}
 
-		} else if(owner instanceof Package) {
+		} else if (element instanceof Package) {
 
 			try {
 				canvasDomainElement = null;
-
-				IEditCommandRequest request = new CreateElementRequest((Package)owner, SysMLElementTypes.BLOCK);
-				IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(owner);
+				IEditCommandRequest request = new CreateElementRequest((Package)element, SysMLElementTypes.BLOCK);
+				IElementEditService commandService = ElementEditServiceUtils.getCommandProvider(element);
 				if(commandService == null) {
 					return null;
 				}
@@ -104,7 +106,7 @@ public class ParametricDiagramCreateCommand extends AbstractPapyrusGmfCreateDiag
 					createElementCommand.execute(new NullProgressMonitor(), null);
 					EObject block = GMFCommandUtils.getCommandEObjectResult(createElementCommand);
 					canvasDomainElement = block;
-					diagram = super.createDiagram(diagramResource, (Package)owner, name);
+					diagram = super.doCreateDiagram(diagramResource, owner, (Package)element, prototype, name);
 				}
 
 			} catch (ExecutionException e) {
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/CreateParametricDiagramWithNavigationHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/CreateParametricDiagramWithNavigationHandler.java
deleted file mode 100644
index a116905a594..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/CreateParametricDiagramWithNavigationHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2013 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *		Régis CHEVREL: chevrel.regis <at> gmail.com
- *		CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.diagram.parametric;
-
-import org.eclipse.papyrus.infra.gmfdiag.navigation.CreateDiagramWithNavigationHandler;
-
-
-public class CreateParametricDiagramWithNavigationHandler extends CreateDiagramWithNavigationHandler {
-
-	public CreateParametricDiagramWithNavigationHandler() {
-		super(new ParametricDiagramCreateCommand(), new ParametricDiagramCondition());
-	}
-
-}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCondition.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCondition.java
index ec094bdaa2d..db8c22d2667 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCondition.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/ParametricDiagramCondition.java
@@ -9,14 +9,13 @@
  * Contributors:
  *		chevrel.regis@gmail.com
  *		CEA LIST - Initial API and implementation
+ *		Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application
  *
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.parametric;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.infra.core.extension.commands.PerspectiveContextDependence;
-import org.eclipse.papyrus.sysml.blocks.Block;
-import org.eclipse.uml2.uml.util.UMLUtil;
 
 /**
  * ParametricDiagramCondition to set conditions for the diagram creation
@@ -28,19 +27,6 @@ public class ParametricDiagramCondition extends PerspectiveContextDependence {
 	 */
 	@Override
 	public boolean create(EObject selectedElement) {
-		if(super.create(selectedElement)) {
-			// Could create a Parametric Diagram on a Block
-			if(selectedElement instanceof org.eclipse.uml2.uml.Class) {
-				org.eclipse.uml2.uml.Class clazz = (org.eclipse.uml2.uml.Class)selectedElement;
-				if(UMLUtil.getStereotypeApplication(clazz, Block.class) != null) {
-					return true;
-				}
-			}
-			// Could create a Parametric Diagram on a Package, an intermediate Block will be created
-			else if(selectedElement instanceof org.eclipse.uml2.uml.Package) {
-				return true;
-			}
-		}
 		return false;
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkCreateCommand.java
index 7f1ebc23682..5b82c60ff3c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/commands/CustomParametricContextLinkCreateCommand.java
@@ -90,7 +90,7 @@ public class CustomParametricContextLinkCreateCommand extends
 		if(!canExecute()) {

 			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

 		}

-		Namespace context = resolveTargetNamespace();

+		Namespace context = getTarget();

 		if(getSource() != null && context != null) {

 			getSource().setContext(context);

 			String defaultNameWithIncrementFromBase = NamedElementHelper.getDefaultNameWithIncrementFromBase(Constraint.class.getSimpleName(), context.getOwnedRules(), getSource());

@@ -122,7 +122,7 @@ public class CustomParametricContextLinkCreateCommand extends
 	 * Get the property Namespace in case of property typed by a Namespace

 	 */

 	@Override

-	protected Namespace resolveTargetNamespace() {

+	protected Namespace getTarget() {

 		EObject targetNamespace;

 		if (target instanceof Property) {

 			targetNamespace = ((Property) target).getType();

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF
index ec58e35a152..9628122599a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF
@@ -21,7 +21,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",

- org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0"

+ org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0"

 Export-Package: org.eclipse.papyrus.sysml.diagram.requirement,

  org.eclipse.papyrus.sysml.diagram.requirement.edit.part,

  org.eclipse.papyrus.sysml.diagram.requirement.edit.policy,

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml
index 55b7fabd29f..cb5f27e3ee9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml
@@ -25,61 +25,8 @@
 		categoryId="org.eclipse.papyrus.editor.category"/>

 </extension>

 

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

-	<handler

-		class="org.eclipse.papyrus.sysml.diagram.requirement.CreateRequirementDiagramWithNavigationHandler"

-		commandId="org.eclipse.papyrus.sysml.diagram.requirement.CreateCommand">

-		<activeWhen>

-			<with variable="activeEditorId">

-				<equals value="org.eclipse.papyrus.infra.core.papyrusEditor" />

-			</with>

-		</activeWhen>

-	</handler>

-</extension>

 

 <!-- Diagram creation command registration in menu and toolbar -->

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

-

-	<menuContribution locationURI="menu:org.eclipse.papyrus.ui.menu">

-	<menu id="org.eclipse.papyrus.uml.diagram.ui.menu.diagrams" label="Diagrams">

-		<command commandId="org.eclipse.papyrus.sysml.diagram.requirement.CreateCommand"

-			icon="icons/obj16/Diagram_Requirement.gif" label="Create a new Requirement Diagram"

-			style="push" tooltip="Create a new Requirement Diagram">

-			<visibleWhen>

-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>

-			</visibleWhen>

-					

-		</command>

-	</menu>

-	</menuContribution>

-	

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

-	<toolbar id="org.eclipse.papyrus.uml.diagram.ui.toolbar">

-		<command commandId="org.eclipse.papyrus.sysml.diagram.requirement.CreateCommand"

-			icon="icons/obj16/Diagram_Requirement.gif" label="Create a new Requirement Diagram"

-			style="push" tooltip="Create a new Requirement Diagram">

-			<visibleWhen>

-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>

-			</visibleWhen>

-				

-		</command>

-	</toolbar>

-	</menuContribution>

-	

-	<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">

-		<command commandId="org.eclipse.papyrus.sysml.diagram.requirement.CreateCommand"

-			icon="icons/obj16/Diagram_Requirement.gif"

-			label="Create a new Requirement Diagram"

-			style="push"

-			tooltip="Create a new Requirement Diagram">

-			<visibleWhen>

-				<reference definitionId="org.eclipse.papyrus.sysml.diagram.common.IsPapyrusActiveWithSysML"/>

-			</visibleWhen>

-			

-		</command>

-	</menuContribution>

-		

-</extension>

 

 <!-- Palette tool declaration (declares the real palette containment) -->

 <extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java
index 29bf49818e6..7c486c47b57 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreateCommand.java
@@ -10,27 +10,27 @@
  * Contributors:
  * CEA LIST- Initial API and implementation
  * Nizar GUEDIDI (CEA LIST)- modification
+ * Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application
  *
  ****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.requirement;
 
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler;
 import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
 
-
-
+/**
+ * Represents the creation command for a SysML requirements diagram
+ * @author Laurent Wouters
+ */
 public class RequirementDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler {
-
+	
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	protected String getDefaultDiagramName() {
-		return "RequirementDiagram"; // //$NON-NLS-1$
+		return "New Requirements Diagram"; // //$NON-NLS-1$
 	}
 
 	/**
@@ -48,20 +48,4 @@ public class RequirementDiagramCreateCommand extends AbstractPapyrusGmfCreateDia
 	protected PreferencesHint getPreferenceHint() {
 		return Activator.DIAGRAM_PREFERENCES_HINT;
 	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected Diagram createDiagram(Resource diagramResource, EObject owner, String name) {
-		// Start of user code Custom diagram creation
-		Diagram diagram = null;
-
-		if(owner instanceof org.eclipse.uml2.uml.Package) {
-			diagram = super.createDiagram(diagramResource, owner, name);
-		}
-
-		return diagram;
-		// End of user code
-	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/CreateRequirementDiagramWithNavigationHandler.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/CreateRequirementDiagramWithNavigationHandler.java
deleted file mode 100644
index a760aed319d..00000000000
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/CreateRequirementDiagramWithNavigationHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2011 Atos Origin.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Mathieu Velten (Atos Origin) mathieu.velten@atosorigin.com - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.requirement;

-

-import org.eclipse.papyrus.infra.gmfdiag.navigation.CreateDiagramWithNavigationHandler;

-

-public class CreateRequirementDiagramWithNavigationHandler extends CreateDiagramWithNavigationHandler {

-

-	public CreateRequirementDiagramWithNavigationHandler() {

-		super(new RequirementDiagramCreateCommand(), new RequirementDiagramCreationCondition());

-	}

-

-}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreationCondition.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreationCondition.java
index 030b35ba0fa..721426b721f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreationCondition.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/RequirementDiagramCreationCondition.java
@@ -9,13 +9,13 @@
  *

  * Contributors:

  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

+ *  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Viewpoints application

  *

  *****************************************************************************/

 package org.eclipse.papyrus.sysml.diagram.requirement;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.papyrus.infra.core.extension.commands.PerspectiveContextDependence;

-import org.eclipse.papyrus.sysml.util.SysmlResource;

 

 /**

  * RequirementDiagramCondition to set conditions for the diagram creation

@@ -26,14 +26,6 @@ public class RequirementDiagramCreationCondition extends PerspectiveContextDepen
 	 * {@inheritDoc}

 	 */

 	public boolean create(EObject selectedElement) {

-		if(super.create(selectedElement)) {

-			if(selectedElement instanceof org.eclipse.uml2.uml.Package) {

-				org.eclipse.uml2.uml.Package pack = (org.eclipse.uml2.uml.Package)selectedElement;

-				if(pack.getAppliedProfile(SysmlResource.REQUIREMENTS_ID, true) != null) {

-					return true;

-				}

-			}

-		}

 		return false;

 	}

 }

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/plugin.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/plugin.xml
index 9fd55c981be..2010786aa04 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/plugin.xml
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.config/plugin.xml
@@ -11,7 +11,8 @@
    <extension

          point="org.eclipse.papyrus.infra.nattable.configuration">

       <configuration

-            file="resources/allocation.nattableconfiguration">

+            file="resources/allocation.nattableconfiguration"

+            type="PapyrusSysMLAllocationTable">

       </configuration>

    </extension>

    <extension

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/plugin.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/plugin.xml
index 471e37f249f..d22991c9b73 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/plugin.xml
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation/plugin.xml
@@ -40,58 +40,5 @@
          </class>

       </handler>

    </extension>

-   <extension

-         id="create.table.menus"

-         name="Create Table Menus"

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

-      <menuContribution

-            allPopups="false"

-            locationURI="popup:org.eclipse.papyrus.infra.nattable.popupmenu.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.sysml.nattable.allocation.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-      <menuContribution

-            allPopups="false"

-            locationURI="menu:org.eclipse.papyrus.infra.nattable.menu.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.sysml.nattable.allocation.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-      <menuContribution

-            allPopups="false"

-            locationURI="toolbar:org.eclipse.papyrus.infra.nattable.toolbar.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.sysml.nattable.allocation.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

 

 </plugin>

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.xml
index a5e6ee819dc..33051d7c1ad 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.xml
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.xml
@@ -4,7 +4,8 @@
    <extension

          point="org.eclipse.papyrus.infra.nattable.configuration">

       <configuration

-            file="configs/requirement.nattableconfiguration">

+            file="configs/requirement.nattableconfiguration"

+            type="PapyrusSysMLRequirementTable">

       </configuration>

    </extension>

    <extension

diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.xml b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.xml
index 9415644fd62..19aa4a4f0ca 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.xml
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.xml
@@ -60,59 +60,6 @@
       </handler>

    </extension>

    <extension

-         id="create.table.menus"

-         name="Create Table Menus"

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

-      <menuContribution

-            allPopups="false"

-            locationURI="popup:org.eclipse.papyrus.infra.nattable.popupmenu.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.sysml.nattable.requirement.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-      <menuContribution

-            allPopups="false"

-            locationURI="menu:org.eclipse.papyrus.infra.nattable.menu.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.sysml.nattable.requirement.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-      <menuContribution

-            allPopups="false"

-            locationURI="toolbar:org.eclipse.papyrus.infra.nattable.toolbar.createnattable">

-         <command

-               commandId="org.eclipse.papyrus.sysml.nattable.requirement.create.command"

-               style="push">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </command>

-      </menuContribution>

-   </extension>

-   <extension

          point="org.eclipse.ui.commandImages">

       <image

             commandId="org.eclipse.papyrus.sysml.nattable.requirement.create.command"