diff options
| author | Quentin Le Menez | 2016-04-04 14:45:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2016-05-19 09:02:53 +0000 |
| commit | bc0abb2abdfefeade4581e11967008275c9fc5a5 (patch) | |
| tree | 52fb6f96483db70fe228a363452033b77ed6d5c7 /plugins/uml | |
| parent | 9e03389b51a4016c279ee72e4c37f92ecc431619 (diff) | |
| download | org.eclipse.papyrus-bc0abb2abdfefeade4581e11967008275c9fc5a5.tar.gz org.eclipse.papyrus-bc0abb2abdfefeade4581e11967008275c9fc5a5.tar.xz org.eclipse.papyrus-bc0abb2abdfefeade4581e11967008275c9fc5a5.zip | |
Bug 491019: [Wizard] PapyrusProjectCreationPage's Error message incorrectly displayed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=491019
- Modified the order in which the messages are displayed
Change-Id: I53501a92fd7e0e7504ee39231fe61ac345707558
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
Diffstat (limited to 'plugins/uml')
| -rw-r--r-- | plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/PapyrusProjectCreationPage.java | 28 |
1 files changed, 17 insertions, 11 deletions
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..f1b56698b16 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 @@ -112,25 +112,31 @@ public class PapyrusProjectCreationPage extends WizardNewProjectCreationPage { // retrieve the selected elements and get its children
boolean canFlip = true;
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- if (canFlip != false) {
- for (IProject iproject : projects) {
- if (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
- break;
- }
- }
+ if (!validatePage()) {
+ canFlip = false;
}
- if (!validatePage()) {
+ if (!verifyProjectName()) {
canFlip = false;
}
return canFlip;
}
+ private boolean verifyProjectName() {
+
+ IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+ for (IProject iproject : projects) {
+ if (this.getProjectName().equalsIgnoreCase(iproject.getName())) {
+ this.setErrorMessage(Messages.PapyrusProjectCreationPage_page_same_case_desc + iproject.getName());
+ // A conflict has been found, no need to go further
+ return false;
+ }
+ }
+
+ return true;
+ }
+
@Override
public void performHelp() {
PlatformUI.getWorkbench().getHelpSystem().displayHelp("org.eclipse.papyrus.uml.diagram.wizards.NewProject"); //$NON-NLS-1$
|