Bug 511550 - [Quality] Remove deprecated classes in Wizard Plugin

 - remove all deprecated classes in
org.eclipse.papyrus.uml.diagram.wizards plugin

Change-Id: Ifa1cba6232fa3b3d97de2e1346767b13b06f37c9
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

6 files changed, 9 insertions, 13 deletions

diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnProjectWizard.java b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnProjectWizard.java
index 958064a5f0d..533ae589b77 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnProjectWizard.java
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/src/org/eclipse/papyrus/bpmn/diagram/ui/NewBpmnProjectWizard.java
@@ -13,7 +13,7 @@ package org.eclipse.papyrus.bpmn.diagram.ui;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.papyrus.bpmn.diagram.common.commands.CreateBpmnModelCommand;
-import org.eclipse.papyrus.uml.diagram.wizards.NewPapyrusProjectWizard;
+import org.eclipse.papyrus.uml.diagram.wizards.wizards.NewPapyrusProjectWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
 
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/handlers/NewModelHandler.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/handlers/NewModelHandler.java
index 8340bd1d81b..97d1ccbe350 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/handlers/NewModelHandler.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/handlers/NewModelHandler.java
@@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.net4j.util.ui.UIUtil;
 import org.eclipse.papyrus.cdo.internal.core.CDOUtils;
-import org.eclipse.papyrus.uml.diagram.wizards.InitModelWizard;
+import org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard;
 import org.eclipse.ui.ISources;
 import org.eclipse.ui.handlers.HandlerUtil;
 
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java
index f87b4c5940b..8a4d413c333 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/CDONewModelStorageProvider.java
@@ -55,8 +55,6 @@ public class CDONewModelStorageProvider extends AbstractNewModelStorageProvider
 
 	private NewModelPage newModelPage;
 
-	private IStructuredSelection selection;
-
 	public CDONewModelStorageProvider() {
 		super();
 	}
@@ -81,7 +79,6 @@ public class CDONewModelStorageProvider extends AbstractNewModelStorageProvider
 		super.init(wizard, selection);
 
 		this.wizard = wizard;
-		this.selection = selection;
 		newModelPage = createNewModelPage(selection);
 		createSelectProviderPart();
 
@@ -233,8 +230,8 @@ public class CDONewModelStorageProvider extends AbstractNewModelStorageProvider
 			super(selection, bus, modelKindName);
 
 			myDiagramResourceName = defaultResourceName;
-			setTitle(org.eclipse.papyrus.uml.diagram.wizards.Messages.InitModelWizard_init_papyrus_model);
-			setDescription(org.eclipse.papyrus.uml.diagram.wizards.Messages.InitModelWizard_init_papyrus_model_desc);
+			setTitle(org.eclipse.papyrus.uml.diagram.wizards.messages.Messages.InitModelWizard_init_papyrus_model);
+			setDescription(org.eclipse.papyrus.uml.diagram.wizards.messages.Messages.InitModelWizard_init_papyrus_model_desc);
 		}
 
 		@Override
@@ -250,7 +247,7 @@ public class CDONewModelStorageProvider extends AbstractNewModelStorageProvider
 
 			if (getMessageType() < ERROR) {
 				if (!myDiagramResourceName.equals(getNewResourceName())) {
-					setMessage(NLS.bind(org.eclipse.papyrus.uml.diagram.wizards.Messages.InitModelWizard_diagram_name_is_different_from_domain_model, myDiagramResourceName), ERROR);
+					setMessage(NLS.bind(org.eclipse.papyrus.uml.diagram.wizards.messages.Messages.InitModelWizard_diagram_name_is_different_from_domain_model, myDiagramResourceName), ERROR);
 					setPageComplete(false);
 				}
 			}
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/NewModelPage.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/NewModelPage.java
index 26439665894..f8297add067 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/NewModelPage.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/src/org/eclipse/papyrus/cdo/uml/diagram/internal/ui/wizards/NewModelPage.java
@@ -206,8 +206,8 @@ public class NewModelPage extends WizardPage {
 
 			setNewResourceName(newFileName);
 
-			String message1 = org.eclipse.papyrus.uml.diagram.wizards.Messages.NewModelFilePage_new_diagram_category_needs_specific_extension;
-			String message2 = NLS.bind(org.eclipse.papyrus.uml.diagram.wizards.Messages.NewModelFilePage_diagram_file_was_renamed, oldFileName, newFileName);
+			String message1 = org.eclipse.papyrus.uml.diagram.wizards.messages.Messages.NewModelFilePage_new_diagram_category_needs_specific_extension;
+			String message2 = NLS.bind(org.eclipse.papyrus.uml.diagram.wizards.messages.Messages.NewModelFilePage_diagram_file_was_renamed, oldFileName, newFileName);
 			String message = message1 + message2;
 			Status resultStatus = new Status(IStatus.INFO, Activator.PLUGIN_ID, message);
 
diff --git a/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/src/org/eclipse/papyrus/soaml/diagram/ui/NewSoamlModelWizard.java b/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/src/org/eclipse/papyrus/soaml/diagram/ui/NewSoamlModelWizard.java
index 3e9901816e5..3cd36246781 100644
--- a/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/src/org/eclipse/papyrus/soaml/diagram/ui/NewSoamlModelWizard.java
+++ b/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/src/org/eclipse/papyrus/soaml/diagram/ui/NewSoamlModelWizard.java
@@ -14,9 +14,8 @@ package org.eclipse.papyrus.soaml.diagram.ui;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.papyrus.soaml.diagram.common.commands.CreateSoamlModelCommand;
-import org.eclipse.papyrus.uml.diagram.wizards.CreateModelWizard;
-
 import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
+import org.eclipse.papyrus.uml.diagram.wizards.wizards.CreateModelWizard;
 import org.eclipse.ui.IWorkbench;
 
 public class NewSoamlModelWizard extends CreateModelWizard {
diff --git a/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/src/org/eclipse/papyrus/soaml/diagram/ui/NewSoamlProjectWizard.java b/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/src/org/eclipse/papyrus/soaml/diagram/ui/NewSoamlProjectWizard.java
index 859ecfd0b51..8b1d904046f 100644
--- a/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/src/org/eclipse/papyrus/soaml/diagram/ui/NewSoamlProjectWizard.java
+++ b/extraplugins/soaml/org.eclipse.papyrus.soaml.diagram.ui/src/org/eclipse/papyrus/soaml/diagram/ui/NewSoamlProjectWizard.java
@@ -13,8 +13,8 @@ package org.eclipse.papyrus.soaml.diagram.ui;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.papyrus.soaml.diagram.common.commands.CreateSoamlModelCommand;
-import org.eclipse.papyrus.uml.diagram.wizards.NewPapyrusProjectWizard;
 import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
+import org.eclipse.papyrus.uml.diagram.wizards.wizards.NewPapyrusProjectWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;