summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2010-09-13 04:54:01 (EDT)
committerCaspar De Groot2010-09-13 04:54:01 (EDT)
commit3172b20d40a9ab331498e1adbd7bc6ccd75691e5 (patch)
tree78afee0553b584bfa6af572f092402991926a8c1
parent560e0a80885b109cb5190d086d860803b249b75b (diff)
downloadcdo-3172b20d40a9ab331498e1adbd7bc6ccd75691e5.zip
cdo-3172b20d40a9ab331498e1adbd7bc6ccd75691e5.tar.gz
cdo-3172b20d40a9ab331498e1adbd7bc6ccd75691e5.tar.bz2
[312535] Partial commits (moved get/setCommitables to CDOTransaction)
https://bugs.eclipse.org/bugs/show_bug.cgi?id=312535
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java11
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java14
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java11
3 files changed, 11 insertions, 25 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
index cb816e2..8861225 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
@@ -30,6 +30,7 @@ import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.net4j.util.options.IOptionsEvent;
import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.ResourceSet;
import java.io.IOException;
@@ -142,6 +143,16 @@ public interface CDOTransaction extends CDOView, CDOUserTransaction, CDOChangeSe
*/
public void setCommitComment(String comment);
+ /**
+ * @since 4.0
+ */
+ public void setCommittables(Set<EObject> committables);
+
+ /**
+ * @since 4.0
+ */
+ public Set<EObject> getCommittables();
+
public Options options();
/**
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java
index 7e86d9a..378ad14 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java
@@ -14,12 +14,8 @@ package org.eclipse.emf.cdo.transaction;
import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
import org.eclipse.emf.cdo.util.CommitException;
-import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.core.runtime.IProgressMonitor;
-import java.util.Set;
-
/**
* Only deal with transaction process.
*
@@ -54,14 +50,4 @@ public interface CDOUserTransaction
* @since 3.0
*/
public CDOUserSavepoint getLastSavepoint();
-
- /**
- * @since 4.0
- */
- public void setCommittables(Set<EObject> committables);
-
- /**
- * @since 4.0
- */
- public Set<EObject> getCommittables();
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
index e9d23ac..9da79f9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
@@ -34,7 +34,6 @@ import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.spi.cdo.CDOSessionProtocol;
import org.eclipse.emf.spi.cdo.CDOSessionProtocol.CommitTransactionResult;
import org.eclipse.emf.spi.cdo.CDOTransactionStrategy;
@@ -436,16 +435,6 @@ public class CDOXATransactionImpl implements InternalCDOXATransaction
}
}
- public void setCommittables(Set<EObject> committables)
- {
- throw new UnsupportedOperationException();
- }
-
- public Set<EObject> getCommittables()
- {
- throw new UnsupportedOperationException();
- }
-
/**
* @author Simon McDuff
*/