Fix problems in validation of file name for selected category.

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

2 files changed, 15 insertions, 1 deletions

diff --git a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/NewModelPage.java b/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/NewModelPage.java
index e18fe8fd609..571820d96bc 100644
--- a/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/NewModelPage.java
+++ b/plugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/NewModelPage.java
@@ -327,7 +327,13 @@ public class NewModelPage
 		if (!newExtension.equals(currentExtension)) {
 
 			String oldFileName = getNewResourceName();
-			String newFileName = suggestName("model", newExtension);
+			String base = oldFileName;
+			if (currentExtension != null) {
+				// take one off for the '.'
+				base = base.substring(0,
+					base.length() - currentExtension.length() - 1);
+			}
+			String newFileName = suggestName(base, newExtension);
 
 			setNewResourceName(newFileName);
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramCategoryPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramCategoryPage.java
index ae6eae83669..964b6761d5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramCategoryPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/pages/SelectDiagramCategoryPage.java
@@ -119,6 +119,14 @@ public class SelectDiagramCategoryPage extends WizardPage {
 		setPageComplete(validatePage());

 	}

 

+	@Override

+	public void setVisible(boolean visible) {

+		super.setVisible(visible);

+		

+		// re-validate in case the user changed the file name on previous page

+		setPageComplete(validatePage());

+	}

+	

 	/**

 	 * 

 	 * Gets the diagram category.