1 files changed, 173 insertions, 173 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java
index 33eb961254..27097627e6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOContainerFeatureDeltaImpl.java
@@ -1,173 +1,173 @@
-/*
- * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Simon McDuff - initial API and implementation
- *    Eike Stepper - maintenance
- *    Simon McDuff - bug 204890
- *    Simon McDuff - bug 213402
- */
-package org.eclipse.emf.cdo.internal.common.revision.delta;
-
-import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.protocol.CDODataInput;
-import org.eclipse.emf.cdo.common.protocol.CDODataOutput;
-import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.delta.CDOContainerFeatureDelta;
-import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta;
-import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDeltaVisitor;
-import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-
-import org.eclipse.net4j.util.ObjectUtil;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EReferenceImpl;
-
-import java.io.IOException;
-import java.text.MessageFormat;
-
-/**
- * @author Simon McDuff
- */
-public class CDOContainerFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOContainerFeatureDelta
-{
-  private CDOID newResourceID;
-
-  private Object newContainerID;
-
-  private int newContainerFeatureID;
-
-  public CDOContainerFeatureDeltaImpl(CDOID newResourceID, Object newContainerID, int newContainerFeatureID)
-  {
-    super(CONTAINER_FEATURE);
-    this.newResourceID = newResourceID;
-    this.newContainerID = newContainerID;
-    this.newContainerFeatureID = newContainerFeatureID;
-  }
-
-  public CDOContainerFeatureDeltaImpl(CDODataInput in, EClass eClass) throws IOException
-  {
-    super(CONTAINER_FEATURE);
-    newContainerFeatureID = in.readInt();
-    newContainerID = in.readCDOID();
-    newResourceID = in.readCDOID();
-  }
-
-  public Type getType()
-  {
-    return Type.CONTAINER;
-  }
-
-  public CDOFeatureDelta copy()
-  {
-    return new CDOContainerFeatureDeltaImpl(newResourceID, newContainerID, newContainerFeatureID);
-  }
-
-  public CDOID getResourceID()
-  {
-    return newResourceID;
-  }
-
-  public Object getContainerID()
-  {
-    return newContainerID;
-  }
-
-  public int getContainerFeatureID()
-  {
-    return newContainerFeatureID;
-  }
-
-  public void apply(CDORevision revision)
-  {
-    ((InternalCDORevision)revision).setResourceID(newResourceID);
-    ((InternalCDORevision)revision).setContainerID(newContainerID);
-    ((InternalCDORevision)revision).setContainingFeatureID(newContainerFeatureID);
-  }
-
-  @Override
-  public boolean adjustReferences(CDOReferenceAdjuster referenceAdjuster)
-  {
-    boolean changed = false;
-
-    CDOID id1 = (CDOID)referenceAdjuster.adjustReference(newResourceID, CONTAINER_FEATURE, NO_INDEX);
-    if (id1 != newResourceID)
-    {
-      newResourceID = id1;
-      changed = true;
-    }
-
-    Object id2 = referenceAdjuster.adjustReference(newContainerID, CONTAINER_FEATURE, NO_INDEX);
-    if (id2 != newContainerID)
-    {
-      newContainerID = id2;
-      changed = true;
-    }
-
-    return changed;
-  }
-
-  @Override
-  public void write(CDODataOutput out, EClass eClass) throws IOException
-  {
-    out.writeInt(getType().ordinal());
-    out.writeInt(newContainerFeatureID);
-    out.writeCDOID(out.getIDProvider().provideCDOID(newContainerID));
-    out.writeCDOID(newResourceID);
-  }
-
-  public void accept(CDOFeatureDeltaVisitor visitor)
-  {
-    visitor.visit(this);
-  }
-
-  @Override
-  public boolean isStructurallyEqual(Object obj)
-  {
-    if (!super.isStructurallyEqual(obj))
-    {
-      return false;
-    }
-
-    CDOContainerFeatureDelta that = (CDOContainerFeatureDelta)obj;
-    return ObjectUtil.equals(newResourceID, that.getResourceID())
-        && ObjectUtil.equals(newContainerID, that.getContainerID())
-        && newContainerFeatureID == that.getContainerFeatureID();
-  }
-
-  @Override
-  protected String toStringAdditional()
-  {
-    return MessageFormat.format("resource={0}, container={1}, feature={2}", newResourceID, newContainerID,
-        newContainerFeatureID);
-  }
-
-  /**
-   * @author Simon McDuff
-   */
-  public static final class ContainerFeature extends EReferenceImpl
-  {
-    public static final String NAME = "eContainer";
-
-    public ContainerFeature()
-    {
-    }
-
-    @Override
-    public String getName()
-    {
-      return null;
-    }
-
-    @Override
-    public String toString()
-    {
-      return NAME;
-    }
-  }
-}
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Simon McDuff - initial API and implementation
+ *    Eike Stepper - maintenance
+ *    Simon McDuff - bug 204890
+ *    Simon McDuff - bug 213402
+ */
+package org.eclipse.emf.cdo.internal.common.revision.delta;
+
+import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.common.protocol.CDODataInput;
+import org.eclipse.emf.cdo.common.protocol.CDODataOutput;
+import org.eclipse.emf.cdo.common.revision.CDORevision;
+import org.eclipse.emf.cdo.common.revision.delta.CDOContainerFeatureDelta;
+import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta;
+import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDeltaVisitor;
+import org.eclipse.emf.cdo.spi.common.revision.CDOReferenceAdjuster;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
+
+import org.eclipse.net4j.util.ObjectUtil;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.EReferenceImpl;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+
+/**
+ * @author Simon McDuff
+ */
+public class CDOContainerFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOContainerFeatureDelta
+{
+  private CDOID newResourceID;
+
+  private Object newContainerID;
+
+  private int newContainerFeatureID;
+
+  public CDOContainerFeatureDeltaImpl(CDOID newResourceID, Object newContainerID, int newContainerFeatureID)
+  {
+    super(CONTAINER_FEATURE);
+    this.newResourceID = newResourceID;
+    this.newContainerID = newContainerID;
+    this.newContainerFeatureID = newContainerFeatureID;
+  }
+
+  public CDOContainerFeatureDeltaImpl(CDODataInput in, EClass eClass) throws IOException
+  {
+    super(CONTAINER_FEATURE);
+    newContainerFeatureID = in.readInt();
+    newContainerID = in.readCDOID();
+    newResourceID = in.readCDOID();
+  }
+
+  public Type getType()
+  {
+    return Type.CONTAINER;
+  }
+
+  public CDOFeatureDelta copy()
+  {
+    return new CDOContainerFeatureDeltaImpl(newResourceID, newContainerID, newContainerFeatureID);
+  }
+
+  public CDOID getResourceID()
+  {
+    return newResourceID;
+  }
+
+  public Object getContainerID()
+  {
+    return newContainerID;
+  }
+
+  public int getContainerFeatureID()
+  {
+    return newContainerFeatureID;
+  }
+
+  public void apply(CDORevision revision)
+  {
+    ((InternalCDORevision)revision).setResourceID(newResourceID);
+    ((InternalCDORevision)revision).setContainerID(newContainerID);
+    ((InternalCDORevision)revision).setContainingFeatureID(newContainerFeatureID);
+  }
+
+  @Override
+  public boolean adjustReferences(CDOReferenceAdjuster referenceAdjuster)
+  {
+    boolean changed = false;
+
+    CDOID id1 = (CDOID)referenceAdjuster.adjustReference(newResourceID, CONTAINER_FEATURE, NO_INDEX);
+    if (id1 != newResourceID)
+    {
+      newResourceID = id1;
+      changed = true;
+    }
+
+    Object id2 = referenceAdjuster.adjustReference(newContainerID, CONTAINER_FEATURE, NO_INDEX);
+    if (id2 != newContainerID)
+    {
+      newContainerID = id2;
+      changed = true;
+    }
+
+    return changed;
+  }
+
+  @Override
+  public void write(CDODataOutput out, EClass eClass) throws IOException
+  {
+    out.writeInt(getType().ordinal());
+    out.writeInt(newContainerFeatureID);
+    out.writeCDOID(out.getIDProvider().provideCDOID(newContainerID));
+    out.writeCDOID(newResourceID);
+  }
+
+  public void accept(CDOFeatureDeltaVisitor visitor)
+  {
+    visitor.visit(this);
+  }
+
+  @Override
+  public boolean isStructurallyEqual(Object obj)
+  {
+    if (!super.isStructurallyEqual(obj))
+    {
+      return false;
+    }
+
+    CDOContainerFeatureDelta that = (CDOContainerFeatureDelta)obj;
+    return ObjectUtil.equals(newResourceID, that.getResourceID())
+        && ObjectUtil.equals(newContainerID, that.getContainerID())
+        && newContainerFeatureID == that.getContainerFeatureID();
+  }
+
+  @Override
+  protected String toStringAdditional()
+  {
+    return MessageFormat.format("resource={0}, container={1}, feature={2}", newResourceID, newContainerID,
+        newContainerFeatureID);
+  }
+
+  /**
+   * @author Simon McDuff
+   */
+  public static final class ContainerFeature extends EReferenceImpl
+  {
+    public static final String NAME = "eContainer";
+
+    public ContainerFeature()
+    {
+    }
+
+    @Override
+    public String getName()
+    {
+      return null;
+    }
+
+    @Override
+    public String toString()
+    {
+      return NAME;
+    }
+  }
+}