Bug 482300: [Wizard] Should handle a null project name

https://bugs.eclipse.org/bugs/show_bug.cgi?id=482300

- Added a check on the project's name and an error message (Mars)

Change-Id: Ia0f6dece0587dbb18117b88bdb83ae88d560678f
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

3 files changed, 10 insertions, 1 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/Messages.java
index b1e946ab251..2ed5b5fe03f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/Messages.java
@@ -53,6 +53,8 @@ public class Messages extends NLS {
 
 	public static String PapyrusProjectCreationPage_page_same_case_desc;
 
+	public static String PapyrusProjectCreationPage_page_null_name_desc;
+
 
 	/** The Diagram category registry_bad_class_name_of_category. */
 	public static String DiagramCategoryRegistry_bad_class_name_of_category;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties
index 264c046ac09..9ab758d72eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/messages/messages.properties
@@ -26,6 +26,7 @@ NewPapyrusProjectWizard_new_papyrus_project=New Papyrus Project
 NewPapyrusProjectWizard_papyrus_project=Papyrus Project
 NewPapyrusProjectWizard_papyrus_project_desc=Create a New Papyrus Project
 PapyrusProjectCreationPage_page_same_case_desc=There already is a project with this name: 
+PapyrusProjectCreationPage_page_null_name_desc=The project's name is undefined, please provide one
 
 DiagramCategoryRegistry_bad_class_name_of_category=Could not find implementation for a diagram category
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/PapyrusProjectCreationPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/PapyrusProjectCreationPage.java
index fb2907cc889..921ef4ead0b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/PapyrusProjectCreationPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/PapyrusProjectCreationPage.java
@@ -115,7 +115,13 @@ public class PapyrusProjectCreationPage extends WizardNewProjectCreationPage {
 		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();

 		if (canFlip != false) {

 			for (IProject iproject : projects) {

-				if (this.getProjectName().equalsIgnoreCase(iproject.getName())) {

+				if (this.getProjectName() == null) {

+					canFlip = false;

+					this.setErrorMessage(Messages.PapyrusProjectCreationPage_page_null_name_desc);

+					// A conflict has been found, no need to go further

+					break;

+				}

+				if (this.getProjectName() != null && this.getProjectName().equalsIgnoreCase(iproject.getName())) {

 					canFlip = false;

 					this.setErrorMessage(Messages.PapyrusProjectCreationPage_page_same_case_desc + iproject.getName());

 					// A conflict has been found, no need to go further