updated emfstore dependencies to 0.9.0
set version of ecp editor to 1.0.0.qualifier
diff --git a/ECP2/org.eclipse.emf.ecp.editor/META-INF/MANIFEST.MF b/ECP2/org.eclipse.emf.ecp.editor/META-INF/MANIFEST.MF
index b8bc223..17d46ed 100644
--- a/ECP2/org.eclipse.emf.ecp.editor/META-INF/MANIFEST.MF
+++ b/ECP2/org.eclipse.emf.ecp.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Editor Plug-in
Bundle-SymbolicName: org.eclipse.emf.ecp.editor;singleton:=true
-Bundle-Version: 0.8.1
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.editor.Activator
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.0.0,2.0.0)",
diff --git a/ECP2/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF b/ECP2/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF
index c7207f9..b121717 100644
--- a/ECP2/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF
+++ b/ECP2/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
Bundle-Activator: org.eclipse.emf.ecp.emfstore.core.internal.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecp.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.emfstore.client;bundle-version="[0.8.9,1.0.0)",
+ org.eclipse.emf.emfstore.client;bundle-version="[0.9.0,1.0.0)",
org.eclipse.net4j.util;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
diff --git a/ECP2/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF b/ECP2/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF
index 12c415c..ee9ce3b 100644
--- a/ECP2/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF
+++ b/ECP2/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecp.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.emfstore.client;bundle-version="[0.8.9,1.0.0)",
- org.eclipse.emf.emfstore.client.ui;bundle-version="[0.8.9,1.0.0)",
+ org.eclipse.emf.emfstore.client;bundle-version="[0.9.0,1.0.0)",
+ org.eclipse.emf.emfstore.client.ui;bundle-version="[0.9.0,1.0.0)",
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/handler/ShareProjectHandler.java b/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/handler/ShareProjectHandler.java
index a5dab17..2e27424 100644
--- a/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/handler/ShareProjectHandler.java
+++ b/ECP2/org.eclipse.emf.ecp.emfstore.ui/src/org/eclipse/emf/ecp/emfstore/handler/ShareProjectHandler.java
@@ -6,14 +6,11 @@
import org.eclipse.emf.ecp.wizards.RepositoryWizard;
import org.eclipse.emf.emfstore.client.model.ProjectSpace;
import org.eclipse.emf.emfstore.client.model.ServerInfo;
-import org.eclipse.emf.emfstore.client.model.util.WorkspaceUtil;
import org.eclipse.emf.emfstore.client.ui.controller.UIShareProjectController;
-import org.eclipse.emf.emfstore.server.exceptions.EmfStoreException;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.ui.handlers.HandlerUtil;
@@ -46,20 +43,8 @@
ServerInfo serverInfo = EMFStoreProvider.INSTANCE.getServerInfo(project.getRepository());
projectSpace.setUsersession(serverInfo.getLastUsersession());
}
- try
- {
- new UIShareProjectController(HandlerUtil.getActiveShell(event)).share(projectSpace);
- }
- catch (EmfStoreException ex)
- {
- String title = "Error";
- StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.append(ex.getMessage());
- title = ex.getClass().getName();
+ new UIShareProjectController(HandlerUtil.getActiveShell(event)).share(projectSpace);
- MessageDialog.openError(HandlerUtil.getActiveShell(event), title, stringBuilder.toString());
- WorkspaceUtil.handleException("An unexpected error in a EMFStore plugin occured.", ex);
- }
}
return null;
}
diff --git a/ECP2/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF b/ECP2/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
index 19f5421..ceb8e6e 100644
--- a/ECP2/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
+++ b/ECP2/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
Bundle-Activator: org.eclipse.emf.ecp.explorereditorbridge.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecp.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.editor;bundle-version="[0.8.1,1.0.0)"
+ org.eclipse.emf.ecp.editor;bundle-version="[1.0.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.emf.ecp.explorereditorbridge;version="1.0.0";x-internal:=true
