[#210796] Change the creation wizard. Use the same wizard for the creation of a diagram and model files from scratch, and the creation of a diagram file from an existing model.

4 files changed, 825 insertions, 178 deletions

diff --git a/plugins/org.eclipse.emf.ecoretools.diagram/src/org/eclipse/emf/ecoretools/diagram/part/EcoreCreationWizard.java b/plugins/org.eclipse.emf.ecoretools.diagram/custom-src/org/eclipse/emf/ecoretools/diagram/part/EcoreCreationWizard.java
index 6c2524f..e636494 100644
--- a/plugins/org.eclipse.emf.ecoretools.diagram/src/org/eclipse/emf/ecoretools/diagram/part/EcoreCreationWizard.java
+++ b/plugins/org.eclipse.emf.ecoretools.diagram/custom-src/org/eclipse/emf/ecoretools/diagram/part/EcoreCreationWizard.java
@@ -27,111 +27,63 @@ import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 
 /**
- * @generated
+ * Wizard that offers creation facilities for the initialization of an empty
+ * Ecore diagram/domain files, or initialization of an Ecore diagram from an
+ * existing domain file.<br>
+ * 
+ * Creation : 26 Nov. 2007
+ * 
+ * @author <a href="mailto:jacques.lescot@anyware-tech.com">Jacques LESCOT</a>
  */
 public class EcoreCreationWizard extends Wizard implements INewWizard {
 
-	/**
-	 * @generated
-	 */
-	private IWorkbench workbench;
+	private IStructuredSelection selection;
 
-	/**
-	 * @generated
-	 */
-	protected IStructuredSelection selection;
+	private EcoreCreationWizardPage diagPage;
 
-	/**
-	 * @generated
-	 */
-	protected EcoreCreationWizardPage diagramModelFilePage;
-
-	/**
-	 * @generated
-	 */
-	protected EcoreCreationWizardPage domainModelFilePage;
-
-	/**
-	 * @generated
-	 */
+	/** The EMF Resource associated with the Diagram */
 	protected Resource diagram;
 
 	/**
-	 * @generated
-	 */
-	private boolean openNewlyCreatedDiagramEditor = true;
-
-	/**
-	 * @generated
-	 */
-	public IWorkbench getWorkbench() {
-		return workbench;
-	}
-
-	/**
-	 * @generated
+	 * Get the initial selection when executing this wizard
+	 * 
+	 * @return IStructuredSelection
 	 */
 	public IStructuredSelection getSelection() {
 		return selection;
 	}
 
 	/**
-	 * @generated
-	 */
-	public final Resource getDiagram() {
-		return diagram;
-	}
-
-	/**
-	 * @generated
+	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
+	 *      org.eclipse.jface.viewers.IStructuredSelection)
 	 */
-	public final boolean isOpenNewlyCreatedDiagramEditor() {
-		return openNewlyCreatedDiagramEditor;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setOpenNewlyCreatedDiagramEditor(boolean openNewlyCreatedDiagramEditor) {
-		this.openNewlyCreatedDiagramEditor = openNewlyCreatedDiagramEditor;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.workbench = workbench;
-		this.selection = selection;
+	public void init(IWorkbench workbench, IStructuredSelection theSelection) {
+		this.selection = theSelection;
 		setWindowTitle(Messages.EcoreCreationWizardTitle);
 		setDefaultPageImageDescriptor(EcoreDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewEcoreWizard.gif")); //$NON-NLS-1$
+		setDialogSettings(EcoreDiagramEditorPlugin.getInstance().getDialogSettings());
 		setNeedsProgressMonitor(true);
 	}
 
 	/**
-	 * @generated
-	 */
-	public void addPages() {
-		diagramModelFilePage = new EcoreCreationWizardPage("DiagramModelFile", getSelection(), "ecorediag"); //$NON-NLS-1$ //$NON-NLS-2$
-		diagramModelFilePage.setTitle(Messages.EcoreCreationWizard_DiagramModelFilePageTitle);
-		diagramModelFilePage.setDescription(Messages.EcoreCreationWizard_DiagramModelFilePageDescription);
-		addPage(diagramModelFilePage);
-
-		domainModelFilePage = new EcoreCreationWizardPage("DomainModelFile", getSelection(), "ecore"); //$NON-NLS-1$ //$NON-NLS-2$
-		domainModelFilePage.setTitle(Messages.EcoreCreationWizard_DomainModelFilePageTitle);
-		domainModelFilePage.setDescription(Messages.EcoreCreationWizard_DomainModelFilePageDescription);
-		addPage(domainModelFilePage);
-	}
-
-	/**
-	 * @generated
+	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
 	 */
 	public boolean performFinish() {
 		IRunnableWithProgress op = new WorkspaceModifyOperation(null) {
 
 			protected void execute(IProgressMonitor monitor) throws CoreException, InterruptedException {
-				diagram = EcoreDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(), domainModelFilePage.getURI(), monitor);
-				if (isOpenNewlyCreatedDiagramEditor() && diagram != null) {
+				if (diagPage.isNewModel()) {
+					// case of creating an empty domain/diagram Resources
+					diagram = EcoreDiagramEditorUtil.createDiagram(diagPage.getDiagramModelURI(), diagPage.getDomainModelURI(), monitor);
+				} else {
+					// case of creating only a diagram Resource (the domain file
+					// already exists)
+					diagram = EcoreDiagramEditorUtil.createDiagramOnly(diagPage.getDiagramModelURI(), diagPage.getDomainModelURI(), diagPage.getDiagramEObject(), diagPage.isInitialized(), monitor);
+				}
+				if (diagram != null) {
 					try {
+						// try to open the current diagram resource into the
+						// appropriate editor
 						EcoreDiagramEditorUtil.openDiagram(diagram);
 					} catch (PartInitException e) {
 						ErrorDialog.openError(getContainer().getShell(), Messages.EcoreCreationWizardOpenEditorError, null, e.getStatus());
@@ -147,10 +99,30 @@ public class EcoreCreationWizard extends Wizard implements INewWizard {
 			if (e.getTargetException() instanceof CoreException) {
 				ErrorDialog.openError(getContainer().getShell(), Messages.EcoreCreationWizardCreationError, null, ((CoreException) e.getTargetException()).getStatus());
 			} else {
-				EcoreDiagramEditorPlugin.getInstance().logError("Error creating diagram", e.getTargetException()); //$NON-NLS-1$
+				EcoreDiagramEditorPlugin.getInstance().logError("Error creating diagram", e.getTargetException());
 			}
 			return false;
 		}
 		return diagram != null;
 	}
+
+	/**
+	 * @see org.eclipse.jface.wizard.IWizard#addPages()
+	 */
+	public void addPages() {
+		// Add the single wizard page used to configure the diagram resource
+		// creation
+		diagPage = new EcoreCreationWizardPage("NewEcoreToolsDiagram", getSelection()); //$NON-NLS-1$
+		diagPage.setTitle(Messages.EcoreCreationWizard_DiagramModelFilePageTitle);
+		diagPage.setDescription(Messages.EcoreCreationWizard_DiagramModelFilePageDescription);
+		addPage(diagPage);
+	}
+
+	/**
+	 * @see org.eclipse.jface.wizard.Wizard#canFinish()
+	 */
+	public boolean canFinish() {
+		return diagPage.isPageComplete();
+	}
+
 }
diff --git a/plugins/org.eclipse.emf.ecoretools.diagram/custom-src/org/eclipse/emf/ecoretools/diagram/part/EcoreCreationWizardPage.java b/plugins/org.eclipse.emf.ecoretools.diagram/custom-src/org/eclipse/emf/ecoretools/diagram/part/EcoreCreationWizardPage.java
new file mode 100644
index 0000000..650a4ec
--- /dev/null
+++ b/plugins/org.eclipse.emf.ecoretools.diagram/custom-src/org/eclipse/emf/ecoretools/diagram/part/EcoreCreationWizardPage.java
@@ -0,0 +1,721 @@
+/***********************************************************************
+ * Copyright (c) 2007 Anyware Technologies
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Anyware Technologies - initial API and implementation
+ **********************************************************************/
+
+package org.eclipse.emf.ecoretools.diagram.part;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.FeatureMap;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IWrapperItemProvider;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.jface.dialogs.IMessageProvider;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.ContainerSelectionDialog;
+import org.eclipse.ui.dialogs.ResourceSelectionDialog;
+
+/**
+ * This page displays the new file information inputs.<br>
+ * 
+ * Creation : 26 Nov. 2007
+ * 
+ * @author <a href="mailto:jacques.lescot@anyware-tech.com">Jacques LESCOT</a>
+ */
+public class EcoreCreationWizardPage extends WizardPage {
+
+	private static final String BROWSE_TEXT = "Browse...";
+
+	private static final String DOMAIN_EXT = "ecore"; //$NON-NLS-1$
+
+	private static final String DIAGRAM_EXT = "diag"; //$NON-NLS-1$
+
+	/**
+	 * Contains the resource that is initially selected when the wizard is
+	 * opened. In the case of a file with an invalid extension, we store the
+	 * container of the file. This variable is then used to load the
+	 * corresponding data in the wizard.
+	 */
+	private IResource selectedResource;
+
+	// SWT objects
+	private Button existingModelBt;
+
+	private Button newModelBt;
+
+	private Group newModelGrp;
+
+	private Text directoryFd;
+
+	private Button directoryBt;
+
+	private Text nameFd;
+
+	private Group existingModelGrp;
+
+	private Text modelFd;
+
+	private Button modelBt;
+
+	private TreeViewer viewer;
+
+	private Button initializeBt;
+
+	private ModifyListener validationListener = new ModifyListener() {
+
+		public void modifyText(ModifyEvent e) {
+			setPageComplete(validatePage());
+		}
+	};
+
+	/**
+	 * Constructor
+	 * 
+	 * @param pageName
+	 *            the page title
+	 * @param selection
+	 *            the selected object
+	 */
+	public EcoreCreationWizardPage(String pageName, IStructuredSelection selection) {
+		super(pageName);
+		setPageComplete(false);
+
+		Object sel = selection.getFirstElement();
+		if (sel != null && sel instanceof IResource) {
+			if (sel instanceof IFile) {
+				// check whether the selected file as the expected extension
+				if (DOMAIN_EXT.equals(((IFile) sel).getFileExtension())) {
+					selectedResource = (IFile) sel;
+				} else {
+					selectedResource = ((IResource) sel).getParent();
+				}
+			} else {
+				selectedResource = (IResource) sel;
+			}
+		} else {
+			selectedResource = ResourcesPlugin.getWorkspace().getRoot();
+		}
+	}
+
+	/**
+	 * Creation of the wizard page
+	 * 
+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+	 */
+	public void createControl(Composite parent) {
+		Composite mainComp = new Composite(parent, SWT.NONE);
+		mainComp.setLayout(new GridLayout());
+		mainComp.setLayoutData(new GridData(GridData.FILL_BOTH));
+		mainComp.setFont(parent.getFont());
+
+		createDestinationGroup(mainComp);
+
+		// Initialize widgets value
+		loadData();
+
+		// Add listeners
+		hookListeners();
+
+		// Show description on opening
+		setErrorMessage(null);
+		setMessage(null);
+		setControl(mainComp);
+
+		setPageComplete(validatePage());
+	}
+
+	/**
+	 * Create the Destination group
+	 * 
+	 * @param parent
+	 *            the Composite
+	 */
+	protected void createDestinationGroup(Composite parent) {
+		// Group activated when the user choose to create a new domain file
+		newModelBt = new Button(parent, SWT.RADIO);
+		newModelBt.setText("Create a new Model");
+		newModelBt.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		createNewModelGroup(parent);
+
+		// Group activated when the user choose to create from an existing
+		// domain file
+		existingModelBt = new Button(parent, SWT.RADIO);
+		existingModelBt.setText("Create from an existing Model");
+		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.verticalIndent = 20;
+		existingModelBt.setLayoutData(gd);
+
+		createExistingModelGroup(parent);
+	}
+
+	private void createNewModelGroup(Composite parent) {
+		newModelGrp = new Group(parent, SWT.NONE);
+		newModelGrp.setLayout(new GridLayout(3, false));
+		newModelGrp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		// The destination directory
+		Label directoryLbl = new Label(newModelGrp, SWT.NONE);
+		directoryLbl.setText("Directory : ");
+
+		directoryFd = new Text(newModelGrp, SWT.BORDER);
+		directoryFd.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		directoryFd.setEnabled(false);
+
+		directoryBt = new Button(newModelGrp, SWT.PUSH);
+		directoryBt.setText(BROWSE_TEXT);
+
+		// The new name of the domain file to create
+		Label nameLbl = new Label(newModelGrp, SWT.NONE);
+		nameLbl.setText("Domain file name : ");
+
+		nameFd = new Text(newModelGrp, SWT.BORDER);
+		GridData layoutNameFd = new GridData(GridData.FILL_HORIZONTAL);
+		layoutNameFd.horizontalSpan = 2;
+		nameFd.setLayoutData(layoutNameFd);
+	}
+
+	private void createExistingModelGroup(Composite parent) {
+		existingModelGrp = new Group(parent, SWT.NONE);
+		existingModelGrp.setLayout(new GridLayout(3, false));
+		existingModelGrp.setLayoutData(new GridData(GridData.FILL_BOTH));
+
+		// Selection of the existing domain file
+		Label modelLbl = new Label(existingModelGrp, SWT.NONE);
+		modelLbl.setText("Domain model : ");
+
+		modelFd = new Text(existingModelGrp, SWT.BORDER);
+		modelFd.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		modelFd.setEnabled(false);
+
+		modelBt = new Button(existingModelGrp, SWT.PUSH);
+		modelBt.setText(BROWSE_TEXT);
+
+		// The TreeViewer in charge of rendering the domain model
+		Label viewerLbl = new Label(existingModelGrp, SWT.NONE);
+		viewerLbl.setText("Select : ");
+
+		viewer = new TreeViewer(existingModelGrp, SWT.SINGLE | SWT.BORDER);
+		GridData gdViewer = new GridData(GridData.FILL_BOTH);
+		gdViewer.horizontalSpan = 2;
+		gdViewer.minimumHeight = 100;
+		viewer.getTree().setLayoutData(gdViewer);
+
+		initializeBt = new Button(existingModelGrp, SWT.CHECK);
+		initializeBt.setText("Initialize the diagram with existing domain model objects");
+		GridData gdInit = new GridData(GridData.FILL_HORIZONTAL);
+		gdInit.horizontalSpan = 3;
+		initializeBt.setLayoutData(gdInit);
+	}
+
+	/**
+	 * Initialize widgets value
+	 */
+	private void loadData() {
+		if (selectedResource instanceof IFile) {
+			existingModelBt.setSelection(true);
+			newModelGrp.setEnabled(false);
+
+			modelFd.setText(selectedResource.getFullPath().toString());
+
+			if (loadModelFile()) {
+				existingModelBt.setFocus();
+			}
+		} else {
+			newModelBt.setSelection(true);
+			existingModelGrp.setEnabled(false);
+
+			directoryFd.setText(selectedResource.getFullPath().toString());
+
+			nameFd.setText(EcoreDiagramEditorUtil.getUniqueFileName(selectedResource.getFullPath(), "DefaultName", DOMAIN_EXT)); //$NON-NLS-1$
+			nameFd.setFocus();
+		}
+
+		initializeBt.setSelection(true);
+	}
+
+	/**
+	 * Add the listeners to the Buttons and the Text widgets
+	 */
+	private void hookListeners() {
+		directoryFd.addModifyListener(validationListener);
+		nameFd.addModifyListener(validationListener);
+
+		modelFd.addModifyListener(validationListener);
+
+		// Button listeners
+		directoryBt.addSelectionListener(new SelectionAdapter() {
+
+			public void widgetSelected(SelectionEvent e) {
+				handleDirectoryChoose();
+			}
+		});
+
+		modelBt.addSelectionListener(new SelectionAdapter() {
+
+			public void widgetSelected(SelectionEvent e) {
+				handleModelChoose();
+			}
+		});
+
+		existingModelBt.addSelectionListener(new SelectionAdapter() {
+
+			public void widgetSelected(SelectionEvent e) {
+				if (existingModelBt.getSelection()) {
+					newModelGrp.setEnabled(false);
+					existingModelGrp.setEnabled(true);
+				}
+				setPageComplete(validatePage());
+			}
+		});
+
+		newModelBt.addSelectionListener(new SelectionAdapter() {
+
+			public void widgetSelected(SelectionEvent e) {
+				if (newModelBt.getSelection()) {
+					newModelGrp.setEnabled(true);
+					existingModelGrp.setEnabled(false);
+				}
+				setPageComplete(validatePage());
+			}
+		});
+
+		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+
+			public void selectionChanged(SelectionChangedEvent event) {
+				setPageComplete(validatePage());
+			}
+		});
+	}
+
+	/**
+	 * Handle the directory choice button action
+	 */
+	protected void handleDirectoryChoose() {
+		ContainerSelectionDialog dialog = new ContainerSelectionDialog(getShell(), (IContainer) ResourcesPlugin.getWorkspace().getRoot().findMember(directoryFd.getText()), false,
+				"Choose the destination directory :");
+		if (dialog.open() == Window.OK) {
+			Object[] results = dialog.getResult();
+			if (results.length == 1 && results[0] instanceof IPath) {
+				IPath newPath = (IPath) results[0];
+				directoryFd.setText(newPath.toString());
+			}
+		}
+	}
+
+	/**
+	 * Handle the model choice button action
+	 */
+	protected void handleModelChoose() {
+		// The initial directory is always the Workspace
+		String initialDirectory = ResourcesPlugin.getWorkspace().getRoot().getFullPath().toString();
+
+		ResourceSelectionDialog dialog = new ResourceSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot().findMember(initialDirectory), "Choose an existing domain file :");
+		if (dialog.open() == Window.OK) {
+			Object[] results = dialog.getResult();
+			if (results.length == 1 && results[0] instanceof IFile) {
+				modelFd.setText(((IFile) results[0]).getFullPath().toString());
+
+				// update the other widgets
+				loadModelFile();
+			}
+		}
+	}
+
+	/**
+	 * Load the domain file selected and update the associated widgets
+	 * 
+	 * @return true if the file was loaded successfully, return false otherwise.
+	 */
+	protected boolean loadModelFile() {
+		URI uri = URI.createPlatformResourceURI(modelFd.getText(), true);
+		Resource resource = getResourceSet().getResource(uri, true);
+
+		if (resource != null) {
+			ComposedAdapterFactory adapterFactory = getAdapterFactory();
+
+			// Set the tree providers of the domain file contents
+			AdapterFactoryContentProvider adapterContentProvider = new AdapterFactoryContentProvider(adapterFactory);
+			adapterContentProvider.inputChanged(viewer, null, null);
+			viewer.setContentProvider(new WizardContentProvider(adapterContentProvider));
+			viewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+			viewer.setInput(resource.getContents());
+			viewer.refresh();
+			viewer.setSelection(new StructuredSelection(resource.getContents()), true);
+
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Subclasses must implement this method to return the
+	 * ComposedAdapterFactory
+	 * 
+	 * @return the ComposedAdapterFactory
+	 */
+	public ComposedAdapterFactory getAdapterFactory() {
+		List<AdapterFactory> factories = new ArrayList<AdapterFactory>();
+		factories.add(new org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory());
+		factories.add(new ResourceItemProviderAdapterFactory());
+		factories.add(new ReflectiveItemProviderAdapterFactory());
+
+		return new ComposedAdapterFactory(factories);
+	}
+
+	/**
+	 * Return the ResourceSet used to store the domain and diagram file. By
+	 * default create a new ResourceSet.
+	 * 
+	 * @return ResourceSet
+	 */
+	protected ResourceSet getResourceSet() {
+		return new ResourceSetImpl();
+	}
+
+	/**
+	 * Check if the informations contained in the page are OK
+	 * 
+	 * @return true is OK
+	 */
+	protected boolean validatePage() {
+		// erase all previous messages
+		setMessage(null);
+		setErrorMessage(null);
+
+		if (isNewModel()) {
+			return validateNewModelGroup();
+		} else {
+			return validateExistingModel();
+		}
+	}
+
+	/**
+	 * Validate the group if the user has chosen to create a new diagram/domain
+	 * files
+	 * 
+	 * @return <code>true</code> if data is valid
+	 */
+	private boolean validateNewModelGroup() {
+		IContainer container = getSelectedIContainer();
+		if (container == null || container instanceof IWorkspaceRoot) {
+			setErrorMessage("The destination is not a valid container.");
+			return false;
+		}
+
+		if (getFileName() == null || "".equals(getFileName())) {
+			setErrorMessage("Domain file name cannot be empty.");
+			return false;
+		} else if (!getFileName().endsWith("." + DOMAIN_EXT)) {
+			setErrorMessage(NLS.bind(Messages.EcoreCreationWizardPageExtensionError, DOMAIN_EXT));
+			return false;
+		} else {
+			validateExistingFiles();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Check if the created files does not already exist
+	 */
+	private void validateExistingFiles() {
+		if (modelFileExist()) {
+			if (diagramFileExist()) {
+				setMessage("The domain file and the diagram file already exist. They will be overwritten !", IMessageProvider.WARNING);
+			} else {
+				setMessage("The domain file already exists. It will be overwritten !", IMessageProvider.WARNING);
+			}
+		} else if (diagramFileExist()) {
+			setMessage("The diagram file already exists. It will be overwritten !", IMessageProvider.WARNING);
+		}
+	}
+
+	private boolean modelFileExist() {
+		return isNewModel() ? ResourcesPlugin.getWorkspace().getRoot().findMember(directoryFd.getText() + File.separator + nameFd.getText()) != null : ResourcesPlugin.getWorkspace().getRoot()
+				.findMember(modelFd.getText()) != null;
+	}
+
+	private boolean diagramFileExist() {
+		return isNewModel() ? ResourcesPlugin.getWorkspace().getRoot().findMember(directoryFd.getText().concat(File.separator).concat(nameFd.getText()).concat(DIAGRAM_EXT)) != null : ResourcesPlugin
+				.getWorkspace().getRoot().findMember(modelFd.getText().concat(DIAGRAM_EXT)) != null;
+	}
+
+	/**
+	 * Validate the group if the user has chosen to create a new diagram file
+	 * from an existing domain file
+	 * 
+	 * @return <code>true</code> if data is valid
+	 */
+	private boolean validateExistingModel() {
+		// the user has chosen an existing domain file
+		if (modelFd.getText() == null || "".equals(modelFd.getText())) { //$NON-NLS-1$
+			setErrorMessage("You have to choose an existing domain file.");
+			return false;
+		}
+
+		if (!DOMAIN_EXT.equals(((IFile) ResourcesPlugin.getWorkspace().getRoot().findMember(modelFd.getText())).getFileExtension())) {
+			setErrorMessage(NLS.bind(Messages.EcoreCreationWizardPageExtensionError, DOMAIN_EXT));
+			return false;
+		}
+
+		if (diagramFileExist()) {
+			setMessage("The diagrams file already exists. It will be overwritten !", IMessageProvider.WARNING);
+		}
+
+		// Check whether the selected domain element is an EPackage
+		if (!(getDiagramEObject() instanceof EPackage)) {
+			setErrorMessage("You have to choose an EPackage element to associate with the diagram.");
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns the selected destination container
+	 * 
+	 * @return the selected container
+	 */
+	public IContainer getSelectedIContainer() {
+		if (isNewModel()) {
+			return (IContainer) ResourcesPlugin.getWorkspace().getRoot().findMember(directoryFd.getText());
+		} else {
+			return ((IFile) ResourcesPlugin.getWorkspace().getRoot().findMember(modelFd.getText())).getParent();
+		}
+	}
+
+	/**
+	 * Returns the selected domain file name (including file extension)
+	 * 
+	 * @return the domain file name. Returns null if no domain file name is set.
+	 */
+	public String getFileName() {
+		if (isNewModel()) {
+			if (nameFd != null && !nameFd.isDisposed()) {
+				return nameFd.getText();
+			}
+		} else {
+			if (modelFd != null && !modelFd.isDisposed()) {
+				IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(modelFd.getText());
+				return resource.getName();
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the selected EObject that will be associated with the diagrams
+	 * file. If no object is selected, returns the rootEObject of the domain
+	 * model
+	 * 
+	 * @return the EObject
+	 */
+	public EObject getDiagramEObject() {
+		if (((IStructuredSelection) viewer.getSelection()).getFirstElement() == null) {
+			return ((EList<EObject>) viewer.getInput()).get(0);
+		} else {
+			return (EObject) AdapterFactoryEditingDomain.unwrap(((IStructuredSelection) viewer.getSelection()).getFirstElement());
+		}
+	}
+
+	/**
+	 * Subclasses must implement this method to return the editorID on which the
+	 * templates should be filtered
+	 * 
+	 * @return the string that represent an editorID
+	 */
+	public String getEditorID() {
+		return "org.eclipse.emf.ecoretools.diagram.part.EcoreDiagramEditorID"; //$NON-NLS-1$
+	}
+
+	/**
+	 * Return the domain model URI
+	 * 
+	 * @return URI
+	 */
+	public URI getDomainModelURI() {
+		if (isNewModel()) {
+			return URI.createPlatformResourceURI(directoryFd.getText().concat(File.separator).concat(getFileName()), false);
+		}
+		return URI.createPlatformResourceURI(modelFd.getText(), false);
+	}
+
+	/**
+	 * Return the diagram model URI
+	 * 
+	 * @return URI
+	 */
+	public URI getDiagramModelURI() {
+		if (isNewModel()) {
+			return URI.createPlatformResourceURI(directoryFd.getText().concat(File.separator).concat(getFileName()).concat(DIAGRAM_EXT), false);
+		}
+		return URI.createPlatformResourceURI(modelFd.getText().concat(DIAGRAM_EXT), false);
+	}
+
+	/**
+	 * Return the choice of creation made by the user
+	 * 
+	 * @return true if the domain file is not created yet
+	 */
+	public boolean isNewModel() {
+		return newModelBt.getSelection();
+	}
+
+	/**
+	 * Returns if the diagram must be initialized with domain model objects
+	 * 
+	 * @return <code>true</code> if diagram must be initialized
+	 */
+	public boolean isInitialized() {
+		return initializeBt.getSelection();
+	}
+
+	/**
+	 * This Content Provider displays contents of domain model and its
+	 * rootEObject. For the domain model, this provider delegates contents
+	 * computing to the model content provider. <br>
+	 * 
+	 * Creation : 26 Nov. 2007
+	 * 
+	 * @author <a href="mailto:jacques.lescot@anyware-tech.com">Jacques LESCOT</a>
+	 */
+	public static class WizardContentProvider implements ITreeContentProvider {
+
+		private static final Object[] NO_CHILDREN = new Object[0];
+
+		private ITreeContentProvider delegatedModelProvider;
+
+		/**
+		 * Constructor
+		 * 
+		 * @param delegatedProvider
+		 *            the delegated content provider
+		 */
+		public WizardContentProvider(ITreeContentProvider delegatedProvider) {
+			delegatedModelProvider = delegatedProvider;
+		}
+
+		/**
+		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
+		 */
+		public Object[] getChildren(Object parentElement) {
+			// Return the edited domain model as root element
+			if (parentElement instanceof List) {
+				return new Object[] { ((List<Object>) parentElement).get(0) };
+			}
+
+			// For the domain model objects, retrieves model children and merges
+			// result with rootEObject associated with this element
+			if (parentElement instanceof IWrapperItemProvider || parentElement instanceof FeatureMap.Entry || parentElement instanceof EObject) {
+				// Model children
+				List<Object> children = new ArrayList<Object>();
+				Object[] modelChildren = delegatedModelProvider.getChildren(AdapterFactoryEditingDomain.unwrap(parentElement));
+				for (int i = 0; i < modelChildren.length; i++) {
+					children.add(modelChildren[i]);
+				}
+
+				return children.toArray(new Object[children.size()]);
+			}
+
+			return NO_CHILDREN;
+		}
+
+		/**
+		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
+		 */
+		public Object getParent(Object element) {
+			// Delegates
+			if (element instanceof IWrapperItemProvider || element instanceof FeatureMap.Entry || element instanceof EObject) {
+				return delegatedModelProvider.getParent(AdapterFactoryEditingDomain.unwrap(element));
+			}
+
+			return null;
+		}
+
+		/**
+		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
+		 */
+		public boolean hasChildren(Object element) {
+			if (element instanceof IWrapperItemProvider || element instanceof FeatureMap.Entry || element instanceof EObject) {
+				return getChildren(AdapterFactoryEditingDomain.unwrap(element)).length > 0;
+			}
+
+			return false;
+		}
+
+		/**
+		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
+		 */
+		public Object[] getElements(Object inputElement) {
+			return getChildren(inputElement);
+		}
+
+		/**
+		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+		 */
+		public void dispose() {
+			// Do nothing
+		}
+
+		/**
+		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
+		 *      java.lang.Object, java.lang.Object)
+		 */
+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+			// Do nothing
+		}
+
+	}
+
+}
diff --git a/plugins/org.eclipse.emf.ecoretools.diagram/src/org/eclipse/emf/ecoretools/diagram/part/EcoreCreationWizardPage.java b/plugins/org.eclipse.emf.ecoretools.diagram/src/org/eclipse/emf/ecoretools/diagram/part/EcoreCreationWizardPage.java
deleted file mode 100644
index bc201da..0000000
--- a/plugins/org.eclipse.emf.ecoretools.diagram/src/org/eclipse/emf/ecoretools/diagram/part/EcoreCreationWizardPage.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2007 Anyware Technologies
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Anyware Technologies - initial API and implementation
- **********************************************************************/
-
-package org.eclipse.emf.ecoretools.diagram.part;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-/**
- * @generated
- */
-public class EcoreCreationWizardPage extends WizardNewFileCreationPage {
-
-	/**
-	 * @generated
-	 */
-	private final String fileExtension;
-
-	/**
-	 * @generated
-	 */
-	public EcoreCreationWizardPage(String pageName, IStructuredSelection selection, String fileExtension) {
-		super(pageName, selection);
-		this.fileExtension = fileExtension;
-	}
-
-	/**
-	 * Override to create files with this extension.
-	 * 
-	 * @generated
-	 */
-	protected String getExtension() {
-		return fileExtension;
-	}
-
-	/**
-	 * @generated
-	 */
-	public URI getURI() {
-		return URI.createPlatformResourceURI(getFilePath().toString(), false);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IPath getFilePath() {
-		IPath path = getContainerFullPath();
-		if (path == null) {
-			path = new Path(""); //$NON-NLS-1$
-		}
-		String fileName = getFileName();
-		if (fileName != null) {
-			path = path.append(fileName);
-		}
-		return path;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		setFileName(EcoreDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), getFileName(), getExtension()));
-		setPageComplete(validatePage());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean validatePage() {
-		if (!super.validatePage()) {
-			return false;
-		}
-		String extension = getExtension();
-		if (extension != null && !getFilePath().toString().endsWith("." + extension)) {
-			setErrorMessage(NLS.bind(Messages.EcoreCreationWizardPageExtensionError, extension));
-			return false;
-		}
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.ecoretools.diagram/src/org/eclipse/emf/ecoretools/diagram/part/EcoreDiagramEditorUtil.java b/plugins/org.eclipse.emf.ecoretools.diagram/src/org/eclipse/emf/ecoretools/diagram/part/EcoreDiagramEditorUtil.java
index 1af51bd..860aff9 100644
--- a/plugins/org.eclipse.emf.ecoretools.diagram/src/org/eclipse/emf/ecoretools/diagram/part/EcoreDiagramEditorUtil.java
+++ b/plugins/org.eclipse.emf.ecoretools.diagram/src/org/eclipse/emf/ecoretools/diagram/part/EcoreDiagramEditorUtil.java
@@ -41,6 +41,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.emf.ecoretools.diagram.edit.parts.EPackageEditPart;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;
 import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
 import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
@@ -197,6 +198,54 @@ public class EcoreDiagramEditorUtil {
 	}
 
 	/**
+	 * This method should be called within a workspace modify operation since it
+	 * creates resources.<br>
+	 * <b>Updated</b> : here we only need to create the diagram resource, the domain
+	 * resource already exist, we just load it
+	 * 
+	 * @param diagramURI the diagram model EMF URI
+	 * @param modelURI the domain model EMF URI
+	 * @param domainElement the domain element that should be associated with the Diagram
+	 * @param progressMonitor the progressMonitor
+	 * 
+	 * @return Resource the diagram resource 
+	 */
+	public static Resource createDiagramOnly(URI diagramURI, URI modelURI, EObject domainElement, boolean initializeDiagram, IProgressMonitor progressMonitor) {
+		TransactionalEditingDomain editingDomain = WorkspaceEditingDomainFactory.INSTANCE.createEditingDomain();
+		progressMonitor.beginTask(Messages.EcoreDiagramEditorUtil_CreateDiagramProgressTask, 3);
+		final Resource diagramResource = editingDomain.getResourceSet().createResource(diagramURI);
+		final EObject model = domainElement;
+		final String diagramName = diagramURI.lastSegment();
+		AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, Messages.EcoreDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST) {
+
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				// TODO Handle diagram initialization or not
+				Diagram diagram = ViewService.createDiagram(model, EPackageEditPart.MODEL_ID, EcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
+				if (diagram != null) {
+					diagramResource.getContents().add(diagram);
+					diagram.setName(diagramName);
+					diagram.setElement(model);
+				}
+
+				try {
+					diagramResource.save(org.eclipse.emf.ecoretools.diagram.part.EcoreDiagramEditorUtil.getSaveOptions());
+				} catch (IOException e) {
+
+					EcoreDiagramEditorPlugin.getInstance().logError("Unable to store diagram resources", e); //$NON-NLS-1$
+				}
+				return CommandResult.newOKCommandResult();
+			}
+		};
+		try {
+			OperationHistoryFactory.getOperationHistory().execute(command, new SubProgressMonitor(progressMonitor, 1), null);
+		} catch (ExecutionException e) {
+			EcoreDiagramEditorPlugin.getInstance().logError("Unable to create diagram", e); //$NON-NLS-1$
+		}
+		setCharset(WorkspaceSynchronizer.getFile(diagramResource));
+		return diagramResource;
+	}
+
+	/**
 	 * Create a new instance of domain element associated with canvas. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -346,10 +395,10 @@ public class EcoreDiagramEditorUtil {
 						View view = (View) element;
 						if (view.getDiagram() == scope.getDiagram()) {
 							element2ViewMap.put(element, element); // take only
-																	// those
-																	// that part
-																	// of our
-																	// diagram
+							// those
+							// that part
+							// of our
+							// diagram
 						}
 					}
 				}