Merge branch 'master' of ssh://git.eclipse.org/gitroot/emf-store/org.eclipse.emf.emfstore.other
diff --git a/org.eclipse.emf.emfstore.client.transaction/src/org/eclipse/emf/emfstore/client/transaction/EMFStoreTransactionalCommandStack.java b/org.eclipse.emf.emfstore.client.transaction/src/org/eclipse/emf/emfstore/client/transaction/EMFStoreTransactionalCommandStack.java
index beede0a..90a77c4 100644
--- a/org.eclipse.emf.emfstore.client.transaction/src/org/eclipse/emf/emfstore/client/transaction/EMFStoreTransactionalCommandStack.java
+++ b/org.eclipse.emf.emfstore.client.transaction/src/org/eclipse/emf/emfstore/client/transaction/EMFStoreTransactionalCommandStack.java
@@ -12,11 +12,11 @@
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.emfstore.client.model.Configuration;
-import org.eclipse.emf.emfstore.client.model.changeTracking.commands.CommandObserver;
-import org.eclipse.emf.emfstore.client.model.changeTracking.commands.EMFStoreCommandNotifier;
-import org.eclipse.emf.emfstore.client.model.changeTracking.commands.EMFStoreCommandStack;
-import org.eclipse.emf.emfstore.client.model.util.AbstractEMFStoreCommand;
+import org.eclipse.emf.emfstore.internal.client.model.Configuration;
+import org.eclipse.emf.emfstore.internal.client.model.changeTracking.commands.CommandObserver;
+import org.eclipse.emf.emfstore.internal.client.model.changeTracking.commands.EMFStoreCommandNotifier;
+import org.eclipse.emf.emfstore.internal.client.model.changeTracking.commands.EMFStoreCommandStack;
+import org.eclipse.emf.emfstore.internal.client.model.util.AbstractEMFStoreCommand;
import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.RollbackException;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
@@ -52,7 +52,7 @@
private void runEMFStoreCommand(final AbstractEMFStoreCommand cmd) {
// wrap EMFStoreCommands in RecordingCommands
RecordingCommand recordingCommand = new RecordingCommand(
- (TransactionalEditingDomain) Configuration.getEditingDomain()) {
+ (TransactionalEditingDomain) Configuration.ClIENT_BEHAVIOR.getEditingDomain()) {
@Override
protected void doExecute() {
cmd.execute();
diff --git a/org.eclipse.emf.emfstore.client.transaction/src/org/eclipse/emf/emfstore/client/transaction/TransactionalEditingDomainProvider.java b/org.eclipse.emf.emfstore.client.transaction/src/org/eclipse/emf/emfstore/client/transaction/TransactionalEditingDomainProvider.java
index 5f6feaa..c266a4d 100644
--- a/org.eclipse.emf.emfstore.client.transaction/src/org/eclipse/emf/emfstore/client/transaction/TransactionalEditingDomainProvider.java
+++ b/org.eclipse.emf.emfstore.client.transaction/src/org/eclipse/emf/emfstore/client/transaction/TransactionalEditingDomainProvider.java
@@ -13,7 +13,7 @@
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.emfstore.client.model.util.EditingDomainProvider;
+import org.eclipse.emf.emfstore.client.provider.ESEditingDomainProvider;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl.FactoryImpl;
@@ -23,7 +23,7 @@
*
* @author wesendon
*/
-public class TransactionalEditingDomainProvider implements EditingDomainProvider {
+public class TransactionalEditingDomainProvider implements ESEditingDomainProvider {
private static final String TRANSACTIONAL_EDITINGDOMAIN_ID = "org.eclipse.emf.emfstore.EditingDomain";
