Allow to remove edition of the name when creating a diagram

1 files changed, 19 insertions, 6 deletions

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/AbstractPapyrusGmfCreateDiagramCommandHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/AbstractPapyrusGmfCreateDiagramCommandHandler.java
index 217afa95d80..2e11fe855b4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/AbstractPapyrusGmfCreateDiagramCommandHandler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/AbstractPapyrusGmfCreateDiagramCommandHandler.java
@@ -185,12 +185,9 @@ public abstract class AbstractPapyrusGmfCreateDiagramCommandHandler extends Abst
 				}
 			}			
 			
-			if (name == null) {
-				name = openDiagramNameDialog(prototype.isNatural() ? getDefaultDiagramName() : "New" + prototype.getLabel().replace(" ", ""));
-			}
-			// canceled
-			if (name == null) {
-				return CommandResult.newCancelledCommandResult();
+			CommandResult result = doEditDiagramName(prototype, name);
+			if (!result.getStatus().isOK()) {
+				return result;
 			}
 
 			Diagram diagram = doCreateDiagram(notationResource, owner, element, prototype, name);
@@ -262,6 +259,22 @@ public abstract class AbstractPapyrusGmfCreateDiagramCommandHandler extends Abst
 
 
 	/**
+	 * @return
+	 */
+	protected CommandResult doEditDiagramName(ViewPrototype prototype, String name) {
+
+		if (name == null) {
+			name = openDiagramNameDialog(prototype.isNatural() ? getDefaultDiagramName() : "New" + prototype.getLabel().replace(" ", ""));
+		}
+		// canceled
+		if (name == null) {
+			return CommandResult.newCancelledCommandResult();
+		}
+		return CommandResult.newOKCommandResult();
+	}
+
+
+	/**
 	 * Get the root element associated with canvas.
 	 */
 	private EObject getRootElement(Resource modelResource) {