Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2019-10-10 04:24:28 -0400
committerPauline Deville2019-10-22 03:54:49 -0400
commit3f0db809311d902b53025a02d139bbc36226ca4e (patch)
treebff072c94b49553cb663185025d6c6210aa36a8b /plugins/uml
parentbeea1df0e3288582f92a06f77167be5472a4b0d6 (diff)
downloadorg.eclipse.papyrus-3f0db809311d902b53025a02d139bbc36226ca4e.tar.gz
org.eclipse.papyrus-3f0db809311d902b53025a02d139bbc36226ca4e.tar.xz
org.eclipse.papyrus-3f0db809311d902b53025a02d139bbc36226ca4e.zip
Bug 551952 - [Wizards] File selection page in current wizards for new model/project enables "next" (page), even if it's the last onehat it's not the last page
- Take superclass result into account for "canFlipToNextPage" - Remove non-necessary check based on "canFlipToNextPage" (the check is already done by "isPageComplete") Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr> Change-Id: Icf979818361b4c5cb6ba3838a22f181f6756d3a4
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/NewModelFilePage.java15
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/PapyrusProjectCreationPage.java12
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java11
3 files changed, 17 insertions, 21 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/NewModelFilePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/NewModelFilePage.java
index b282e3a7861..5801398b0fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/NewModelFilePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/NewModelFilePage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2017 Obeo, Christian W. Damus, and others.
+ * Copyright (c) 2008, 2017, 2019 Obeo, Christian W. Damus, and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -12,6 +12,7 @@
* Tatiana Fesenko(CEA) - initial API and implementation
* Christian W. Damus (CEA) - Support creating models in repositories (CDO)
* Christian W. Damus - bug 471453
+ * Ansgar Radermacher (CEA LIST) - bug 551952
*
*******************************************************************************/
package org.eclipse.papyrus.uml.diagram.wizards.pages;
@@ -247,7 +248,7 @@ public class NewModelFilePage extends WizardNewFileCreationPage implements INewP
* @see org.eclipse.ui.dialogs.WizardNewFileCreationPage#createNewFile()
*
* @return
- * The model's IFile
+ * The model's IFile
*/
@Override
public IFile createNewFile() {
@@ -263,7 +264,7 @@ public class NewModelFilePage extends WizardNewFileCreationPage implements INewP
/**
* This method is used to avoid case conflicts between existing and newly created models
* As well as to prevent the user to create a model outside a container
- *
+ *
* @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
*
* @return
@@ -291,14 +292,14 @@ public class NewModelFilePage extends WizardNewFileCreationPage implements INewP
canFlip = false;
}
- return canFlip;
+ return canFlip && super.canFlipToNextPage();
}
/**
* This method fetches all the IFiles' name in the workspace
- *
+ *
* @return
- * The list of the names
+ * The list of the names
*/
public Collection<String> getExistingNames() {
Collection<String> result = new LinkedList<>();
@@ -323,7 +324,7 @@ public class NewModelFilePage extends WizardNewFileCreationPage implements INewP
/**
* This method returns the names of the first level children of the selected element
- *
+ *
* @param membersArray
* @return
*/
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 4513f637b39..7e77d72722b 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
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2014, 2017 CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2014, 2017, 2019 CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -9,8 +9,10 @@
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com - Initial API and implementation
- * Christian W. Damus - bug 471453
+ * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com - Initial API and implementation
+ * Christian W. Damus - bug 471453
+ * Ansgar Radermacher (CEA LIST) - bug 551952
+ *
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.wizards.pages;
@@ -138,7 +140,7 @@ public class PapyrusProjectCreationPage extends WizardNewProjectCreationPage imp
/**
* This method is used to avoid case conflicts between existing and newly created projects
- *
+ *
* @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
*
* @return
@@ -156,7 +158,7 @@ public class PapyrusProjectCreationPage extends WizardNewProjectCreationPage imp
canFlip = false;
}
- return canFlip;
+ return canFlip && super.canFlipToNextPage();
}
private boolean verifyProjectName() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java
index 36dd294d013..80ffeb7ba69 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/CreateModelWizard.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2017, 2018 Obeo, CEA LIST, Christian W. Damus, and others.
+ * Copyright (c) 2008, 2017, 2018, 2019 Obeo, CEA LIST, Christian W. Damus, and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -15,6 +15,7 @@
* Christian W. Damus (CEA) - Support creating models in repositories (CDO)
* Christian W. Damus - bugs 490936, 471453, 540584
* Pauline DEVILLE (CEA LIST) - Bug 493312 - [Wizard] Apply multiple profiles in new model wizard
+ * Ansgar Radermacher (CEA LIST) - bug 551952
*
*******************************************************************************/
package org.eclipse.papyrus.uml.diagram.wizards.wizards;
@@ -1034,14 +1035,6 @@ public class CreateModelWizard extends Wizard implements INewWizard {
result = allPages[i].isPageComplete();
}
- if (result) {
- // This takes care of the case problems when creating a model with the same name but different case
- IWizardPage page = getNewModelPage();
- if (page != null) {
- result = page.canFlipToNextPage();
- }
- }
-
return result;
}

Back to the top