Attachment 212546 Details for Bug 374056 – Patch for createProject() method

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

[patch] Patch for createProject() method

ecp.other.patch (text/plain), 5.25 KB, created by Eugen Neufeld

on 2012-03-13 08:46:56 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eugen Neufeld

Created: 2012-03-13 08:46:56 EDT

Size: 5.25 KB

patch

obsolete

>diff --git a/ECP2/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/internal/core/ECPProjectManagerImpl.java b/ECP2/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/internal/core/ECPProjectManagerImpl.java
>index 7081403..b53032d 100644
>--- a/ECP2/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/internal/core/ECPProjectManagerImpl.java
>+++ b/ECP2/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/internal/core/ECPProjectManagerImpl.java
>@@ -27,6 +27,7 @@
> 
> import java.io.IOException;
> import java.io.ObjectInput;
>+import java.util.Collections;
> import java.util.Set;
> 
> /**
>@@ -43,7 +44,10 @@
> 
>   public ECPProject createProject(ECPProvider provider, String name, ECPProperties properties)
>   {
>-    return provider.createProject(name, properties);
>+    InternalProject project = (InternalProject)provider.createProject(name, properties);
>+    changeElements(null, Collections.singleton(project));
>+    return project;
>+
>   }
> 
>   public InternalProject getProject(Object adaptable)
>diff --git a/ECP2/org.eclipse.emf.ecp.emfstore.core/src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java b/ECP2/org.eclipse.emf.ecp.emfstore.core/src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java
>index 0f83d91..2868fef 100644
>--- a/ECP2/org.eclipse.emf.ecp.emfstore.core/src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java
>+++ b/ECP2/org.eclipse.emf.ecp.emfstore.core/src/org/eclipse/emf/ecp/emfstore/core/internal/EMFStoreProvider.java
>@@ -6,6 +6,7 @@
> 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;
>@@ -16,7 +17,7 @@
> 
> public class EMFStoreProvider extends DefaultProvider
> {
>-  public static final String NAME = "org.eclipse.emf.ecp.cdo.provider";
>+  public static final String NAME = "org.eclipse.emf.ecp.emfstore.provider";
> 
>   public static EMFStoreProvider INSTANCE = new EMFStoreProvider();
> 
>@@ -72,8 +73,7 @@
> 
>   public ECPProject createProject(String name, ECPProperties properties)
>   {
>-    // TODO: implement WorkspaceProvider.createProject(name, properties)
>-    throw new UnsupportedOperationException();
>+    return new ECPProjectImpl(this, name, properties);
>   }
> 
>   public boolean hasUnsharedProjectSupport()
>diff --git a/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/handler/CreateProjectHandler.java b/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/handler/CreateProjectHandler.java
>index dcc98fc..45360ec 100644
>--- a/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/handler/CreateProjectHandler.java
>+++ b/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/handler/CreateProjectHandler.java
>@@ -1,23 +1,35 @@
> 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 class CreateProjectHandler extends AbstractHandler
>+{
> 
>-	public Object execute(ExecutionEvent event) throws ExecutionException {
>-//		CreateProjectDialog dialog = new CreateProjectDialog(HandlerUtil.getActiveShell(event),
>-//			null);
>-//		dialog.open();
>-//		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;
>-	}
>+  public Object execute(ExecutionEvent event) throws ExecutionException
>+  {
>+    UIProjectController uiProjectController = new UIProjectController(HandlerUtil.getActiveShell(event));
>+    ProjectSpace projectSpace = uiProjectController.createLocalProject();
> 
>+    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;
>+  }
> }

Flags:

eclipse: iplog+

Actions: View | Diff

Attachments on bug 374056: 212546