summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-12-17 11:31:45 (EST)
committerEike Stepper2007-12-17 11:31:45 (EST)
commitc8fa349753d68e1e10b7993de510d081f7bb506e (patch)
tree7ad1fd419c01a6e1275af12a565b95cc8495abb8
parent49128550ac78f6b8eb3b894a60d322c2140585d4 (diff)
downloadcdo-c8fa349753d68e1e10b7993de510d081f7bb506e.zip
cdo-c8fa349753d68e1e10b7993de510d081f7bb506e.tar.gz
cdo-c8fa349753d68e1e10b7993de510d081f7bb506e.tar.bz2
[213150] Migrate CDO to EMF 2.4M4
https://bugs.eclipse.org/bugs/show_bug.cgi?id=213150
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java15
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java1
2 files changed, 16 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
index 7aa8b0b..7cdb5e5 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
@@ -42,6 +42,7 @@ import org.eclipse.net4j.util.ImplementationError;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
@@ -548,6 +549,20 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource
{
private static final long serialVersionUID = 1L;
+ public TransientContents()
+ {
+ }
+
+ public TransientContents(Collection<? extends E> collection)
+ {
+ super(collection);
+ }
+
+ public TransientContents(int initialCapacity)
+ {
+ super(initialCapacity);
+ }
+
@Override
public Object getNotifier()
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java
index e8d8717..32b1530 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java
@@ -151,6 +151,7 @@ public class CommitTransactionRequest extends CDOClientRequest<CommitTransaction
writeRevisions(out, newObjects);
}
+ @SuppressWarnings("unused")
private void writeDirtyObjects(ExtendedDataOutputStream out) throws IOException
{
Collection<CDOObject> dirtyObjects = transaction.getDirtyObjects().values();