Attachment #212546 for bug #374056

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 374056
Collapse All | Expand All

Lines 27-32 Link Here

(-)a/ECP2/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/internal/core/ECPProjectManagerImpl.java (-1 / +5 lines)
27		27
28	import java.io.IOException;	28	import java.io.IOException;
29	import java.io.ObjectInput;	29	import java.io.ObjectInput;
		30	import java.util.Collections;
30	import java.util.Set;	31	import java.util.Set;
31		32
32	/**	33	/**
Lines 43-49 Link Here
43		44
44	public ECPProject createProject(ECPProvider provider, String name, ECPProperties properties)	45	public ECPProject createProject(ECPProvider provider, String name, ECPProperties properties)
45	{	46	{
46	return provider.createProject(name, properties);	47	InternalProject project = (InternalProject)provider.createProject(name, properties);
		48	changeElements(null, Collections.singleton(project));
		49	return project;
		50
47	}	51	}
48		52
49	public InternalProject getProject(Object adaptable)	53	public InternalProject getProject(Object adaptable)




import org.eclipse.emf.ecp.core.ECPRepository;
import org.eclipse.emf.ecp.core.util.ECPModelContext;
import org.eclipse.emf.ecp.core.util.ECPProperties;
import org.eclipse.emf.ecp.internal.core.ECPProjectImpl;
import org.eclipse.emf.ecp.spi.core.DefaultProvider;
import org.eclipse.emf.ecp.spi.core.InternalProject;
import org.eclipse.emf.ecp.spi.core.InternalRepository;


public class EMFStoreProvider extends DefaultProvider
{
  public static final String NAME = "org.eclipse.emf.ecp.emfstore.provider";

  public static EMFStoreProvider INSTANCE = new EMFStoreProvider();



  public ECPProject createProject(String name, ECPProperties properties)
  {
    return new ECPProjectImpl(this, name, properties);
    throw new UnsupportedOperationException();
  }

  public boolean hasUnsharedProjectSupport()




package org.eclipse.emf.ecp.emfstore.handler;

import org.eclipse.emf.ecp.core.ECPProject;
import org.eclipse.emf.ecp.core.ECPProjectManager;
import org.eclipse.emf.ecp.core.util.ECPProperties;
import org.eclipse.emf.ecp.core.util.ECPUtil;
import org.eclipse.emf.ecp.emfstore.core.internal.EMFStoreProvider;
import org.eclipse.emf.ecp.spi.core.InternalProvider.LifecycleEvent;
import org.eclipse.emf.emfstore.client.model.ProjectSpace;
import org.eclipse.emf.emfstore.client.ui.controller.UIProjectController;

import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.ui.handlers.HandlerUtil;

public class CreateProjectHandler extends AbstractHandler
{

  public Object execute(ExecutionEvent event) throws ExecutionException
  {
    UIProjectController uiProjectController = new UIProjectController(HandlerUtil.getActiveShell(event));
    ProjectSpace projectSpace = uiProjectController.createLocalProject();
//		ProjectSpace projectSpace = dialog.getProjectSpace();
//	    InternalProject project = new ECPProjectImpl(projectSpace.getProjectName(), EMFStoreProvider.INSTANCE);
//	    ECPProperties projectProperties = project.getProperties();
//	    projectProperties.addProperty(EMFStoreProvider.PROP_PROJECTSPACEID, projectSpace.getIdentifier());
//	    EMFStoreProvider.INSTANCE.handleLifecycle(project, LifecycleEvent.CREATE);
//	    project.open();
//	    ECPProjectManager.INSTANCE.addProject(project);
		return null;
	}

    ECPProperties projectProperties = ECPUtil.createProperties();
    projectProperties.addProperty(EMFStoreProvider.PROP_PROJECTSPACEID, projectSpace.getIdentifier());

    ECPProject project = ECPProjectManager.INSTANCE.createProject(EMFStoreProvider.INSTANCE,
        projectSpace.getProjectName(), projectProperties);

    EMFStoreProvider.INSTANCE.handleLifecycle(project, LifecycleEvent.CREATE);
    project.open();
    return null;
  }
}

Return to bug 374056

Lines 6-11 Link Here

(-)a/ECP2/org.eclipse.emf.ecp.emfstore.core/src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java (-3 / +3 lines)
6	import org.eclipse.emf.ecp.core.ECPRepository;	6	import org.eclipse.emf.ecp.core.ECPRepository;
7	import org.eclipse.emf.ecp.core.util.ECPModelContext;	7	import org.eclipse.emf.ecp.core.util.ECPModelContext;
8	import org.eclipse.emf.ecp.core.util.ECPProperties;	8	import org.eclipse.emf.ecp.core.util.ECPProperties;
		9	import org.eclipse.emf.ecp.internal.core.ECPProjectImpl;
9	import org.eclipse.emf.ecp.spi.core.DefaultProvider;	10	import org.eclipse.emf.ecp.spi.core.DefaultProvider;
10	import org.eclipse.emf.ecp.spi.core.InternalProject;	11	import org.eclipse.emf.ecp.spi.core.InternalProject;
11	import org.eclipse.emf.ecp.spi.core.InternalRepository;	12	import org.eclipse.emf.ecp.spi.core.InternalRepository;
Lines 16-22 Link Here
16		17
17	public class EMFStoreProvider extends DefaultProvider	18	public class EMFStoreProvider extends DefaultProvider
18	{	19	{
19	public static final String NAME = "org.eclipse.emf.ecp.cdo.provider";	20	public static final String NAME = "org.eclipse.emf.ecp.emfstore.provider";
20		21
21	public static EMFStoreProvider INSTANCE = new EMFStoreProvider();	22	public static EMFStoreProvider INSTANCE = new EMFStoreProvider();
22		23
Lines 72-79 Link Here
72		73
73	public ECPProject createProject(String name, ECPProperties properties)	74	public ECPProject createProject(String name, ECPProperties properties)
74	{	75	{
75	// TODO: implement WorkspaceProvider.createProject(name, properties)	76	return new ECPProjectImpl(this, name, properties);
76	throw new UnsupportedOperationException();
77	}	77	}
78		78
79	public boolean hasUnsharedProjectSupport()	79	public boolean hasUnsharedProjectSupport()

Lines 1-23 Link Here

(-)a/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/handler/CreateProjectHandler.java (-14 / +26 lines)
1	package org.eclipse.emf.ecp.emfstore.handler;	1	package org.eclipse.emf.ecp.emfstore.handler;
2		2
		3	import org.eclipse.emf.ecp.core.ECPProject;
		4	import org.eclipse.emf.ecp.core.ECPProjectManager;
		5	import org.eclipse.emf.ecp.core.util.ECPProperties;
		6	import org.eclipse.emf.ecp.core.util.ECPUtil;
		7	import org.eclipse.emf.ecp.emfstore.core.internal.EMFStoreProvider;
		8	import org.eclipse.emf.ecp.spi.core.InternalProvider.LifecycleEvent;
		9	import org.eclipse.emf.emfstore.client.model.ProjectSpace;
		10	import org.eclipse.emf.emfstore.client.ui.controller.UIProjectController;
		11
3	import org.eclipse.core.commands.AbstractHandler;	12	import org.eclipse.core.commands.AbstractHandler;
4	import org.eclipse.core.commands.ExecutionEvent;	13	import org.eclipse.core.commands.ExecutionEvent;
5	import org.eclipse.core.commands.ExecutionException;	14	import org.eclipse.core.commands.ExecutionException;
		15	import org.eclipse.ui.handlers.HandlerUtil;
6		16
7	public class CreateProjectHandler extends AbstractHandler {	17	public class CreateProjectHandler extends AbstractHandler
		18	{
8		19
9	public Object execute(ExecutionEvent event) throws ExecutionException {	20	public Object execute(ExecutionEvent event) throws ExecutionException
10	// CreateProjectDialog dialog = new CreateProjectDialog(HandlerUtil.getActiveShell(event),	21	{
11	// null);	22	UIProjectController uiProjectController = new UIProjectController(HandlerUtil.getActiveShell(event));
12	// dialog.open();	23	ProjectSpace projectSpace = uiProjectController.createLocalProject();
13	// ProjectSpace projectSpace = dialog.getProjectSpace();
14	// InternalProject project = new ECPProjectImpl(projectSpace.getProjectName(), EMFStoreProvider.INSTANCE);
15	// ECPProperties projectProperties = project.getProperties();
16	// projectProperties.addProperty(EMFStoreProvider.PROP_PROJECTSPACEID, projectSpace.getIdentifier());
17	// EMFStoreProvider.INSTANCE.handleLifecycle(project, LifecycleEvent.CREATE);
18	// project.open();
19	// ECPProjectManager.INSTANCE.addProject(project);
20	return null;
21	}
22		24
		25	ECPProperties projectProperties = ECPUtil.createProperties();
		26	projectProperties.addProperty(EMFStoreProvider.PROP_PROJECTSPACEID, projectSpace.getIdentifier());
		27
		28	ECPProject project = ECPProjectManager.INSTANCE.createProject(EMFStoreProvider.INSTANCE,
		29	projectSpace.getProjectName(), projectProperties);
		30
		31	EMFStoreProvider.INSTANCE.handleLifecycle(project, LifecycleEvent.CREATE);
		32	project.open();
		33	return null;
		34	}
23	}	35	}