Merge "[487942] Improve the creation diagram wizard to include the name of the diagram type"
diff --git a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/internal/viewer/diagram/actions/NewRepresentationAction.java b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/internal/viewer/diagram/actions/NewRepresentationAction.java
index 3de6352..71e8b19 100644
--- a/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/internal/viewer/diagram/actions/NewRepresentationAction.java
+++ b/plugins/org.eclipse.amalgam.explorer.activity.ui/src/org/eclipse/amalgam/explorer/activity/ui/internal/viewer/diagram/actions/NewRepresentationAction.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2015 THALES GLOBAL SERVICES.
+ * Copyright (c) 2006, 2016 THALES GLOBAL SERVICES.
* 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
@@ -119,7 +119,13 @@
String defaultName = computeDefaultName(_selectedEObject, _description);
if (!_forceDefaultName) {
- String dialogTitle = "Type representation name"; //$NON-NLS-1$
+
+ String label = _description.getLabel();
+ if (label == null || label.isEmpty()) {
+ label = _description.getName();
+ }
+
+ String dialogTitle = "Type " + label + " name"; //$NON-NLS-1$ //$NON-NLS-2$
Shell activeShell = Display.getDefault().getActiveShell();
InputDialog representationNameDlg = new InputDialog(activeShell, dialogTitle, dialogTitle, defaultName,
null);
