diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta')
12 files changed, 139 insertions, 11 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java index 94750990ed..05ca812eb8 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOAddFeatureDeltaImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2012, 2014-2018 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008-2012, 2014-2019 Eike Stepper (Loehne, 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 @@ -40,11 +40,13 @@ public class CDOAddFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl imple super(in, eClass); } + @Override public Type getType() { return Type.ADD; } + @Override public Object applyTo(CDORevision revision) { EStructuralFeature feature = getFeature(); @@ -71,16 +73,19 @@ public class CDOAddFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl imple return null; } + @Override public void accept(CDOFeatureDeltaVisitor visitor) { visitor.visit(this); } + @Override public CDOAddFeatureDelta copy() { return new CDOAddFeatureDeltaImpl(getFeature(), getIndex(), getValue()); } + @Override public void affectIndices(ListTargetAdding[] source, int[] indices) { int index = getIndex(); @@ -98,6 +103,7 @@ public class CDOAddFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl imple } } + @Override public int projectIndex(int index) { if (index >= getIndex()) diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOClearFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOClearFeatureDeltaImpl.java index 21ff5838e0..c942921ce2 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOClearFeatureDeltaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOClearFeatureDeltaImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2012, 2014 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008-2012, 2014, 2019 Eike Stepper (Loehne, 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 @@ -39,16 +39,19 @@ public class CDOClearFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDO super(in, eClass); } + @Override public Type getType() { return Type.CLEAR; } + @Override public CDOFeatureDelta copy() { return new CDOClearFeatureDeltaImpl(getFeature()); } + @Override public Object applyTo(CDORevision revision) { EStructuralFeature feature = getFeature(); @@ -58,6 +61,7 @@ public class CDOClearFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDO return null; } + @Override public void accept(CDOFeatureDeltaVisitor visitor) { visitor.visit(this); 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 9c07e9b670..e2560d0580 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,5 +1,5 @@ /* - * Copyright (c) 2008-2012, 2014, 2016, 2017 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008-2012, 2014, 2016, 2017, 2019 Eike Stepper (Loehne, 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 @@ -58,31 +58,37 @@ public class CDOContainerFeatureDeltaImpl extends CDOFeatureDeltaImpl implements newResourceID = in.readCDOID(); } + @Override public Type getType() { return Type.CONTAINER; } + @Override public CDOFeatureDelta copy() { return new CDOContainerFeatureDeltaImpl(newResourceID, newContainerID, newContainerFeatureID); } + @Override public CDOID getResourceID() { return newResourceID; } + @Override public Object getContainerID() { return newContainerID; } + @Override public int getContainerFeatureID() { return newContainerFeatureID; } + @Override public Object applyTo(CDORevision revision) { InternalCDORevision internalRevision = (InternalCDORevision)revision; @@ -123,6 +129,7 @@ public class CDOContainerFeatureDeltaImpl extends CDOFeatureDeltaImpl implements out.writeCDOID(newResourceID); } + @Override public void accept(CDOFeatureDeltaVisitor visitor) { visitor.visit(this); diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDODetachedRevisionDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDODetachedRevisionDeltaImpl.java index 370e0a5ab8..25c462391d 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDODetachedRevisionDeltaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDODetachedRevisionDeltaImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2014 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2010-2014, 2019 Eike Stepper (Loehne, 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 @@ -34,36 +34,43 @@ public class CDODetachedRevisionDeltaImpl implements CDORevisionDelta { } + @Override public CDOID getID() { throw new UnsupportedOperationException(); } + @Override public CDOBranch getBranch() { throw new UnsupportedOperationException(); } + @Override public int getVersion() { throw new UnsupportedOperationException(); } + @Override public EClass getEClass() { throw new UnsupportedOperationException(); } + @Override public CDORevisable getTarget() { throw new UnsupportedOperationException(); } + @Override public int size() { throw new UnsupportedOperationException(); } + @Override public boolean isEmpty() { throw new UnsupportedOperationException(); @@ -74,37 +81,44 @@ public class CDODetachedRevisionDeltaImpl implements CDORevisionDelta throw new UnsupportedOperationException(); } + @Override public CDORevisionDelta copy() { return this; } + @Override public CDOFeatureDelta getFeatureDelta(EStructuralFeature feature) { throw new UnsupportedOperationException(); } + @Override public List<CDOFeatureDelta> getFeatureDeltas() { throw new UnsupportedOperationException(); } + @Override @Deprecated public void apply(CDORevision revision) { throw new UnsupportedOperationException(); } + @Override public void applyTo(CDORevision revision) { throw new UnsupportedOperationException(); } + @Override public void accept(CDOFeatureDeltaVisitor visitor) { throw new UnsupportedOperationException(); } + @Override public void accept(CDOFeatureDeltaVisitor visitor, Predicate<EStructuralFeature> filter) { throw new UnsupportedOperationException(); diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOFeatureDeltaImpl.java index e074add4ac..84a294cda8 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOFeatureDeltaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOFeatureDeltaImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2012, 2014, 2017 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008-2012, 2014, 2017, 2019 Eike Stepper (Loehne, 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 @@ -53,17 +53,20 @@ public abstract class CDOFeatureDeltaImpl implements InternalCDOFeatureDelta out.writeXInt(eClass.getFeatureID(feature)); } + @Override public EStructuralFeature getFeature() { return feature; } + @Override @Deprecated public void apply(CDORevision revision) { applyTo(revision); } + @Override public boolean isStructurallyEqual(Object obj) { if (obj == this) diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java index 2a75416d0a..c2779b84ef 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOListFeatureDeltaImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2018 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008-2019 Eike Stepper (Loehne, 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 @@ -74,6 +74,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL } } + @Override public CDOListFeatureDelta copy() { CDOListFeatureDeltaImpl result = new CDOListFeatureDeltaImpl(getFeature(), getOriginSize()); @@ -143,16 +144,19 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL } } + @Override public Type getType() { return Type.LIST; } + @Override public int getOriginSize() { return originSize; } + @Override public List<CDOFeatureDelta> getListChanges() { return listChanges; @@ -447,11 +451,13 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL return indexIntoListChanges; } + @Override public int getIndex() { return index; } + @Override public void adjustAfterAddition(int index) { if (index <= this.index) @@ -460,6 +466,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL } } + @Override public void adjustAfterRemoval(int index) { if (index < this.index && this.index > 0) @@ -468,6 +475,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL } } + @Override public void adjustAfterMove(int oldPosition, int newPosition) { if (index == oldPosition) @@ -577,6 +585,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL } } + @Override public Object applyTo(CDORevision revision) { for (CDOFeatureDelta featureDelta : listChanges) @@ -599,6 +608,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL return changed; } + @Override public void accept(CDOFeatureDeltaVisitor visitor) { visitor.visit(this); diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java index 77528b3a0a..7f4e666517 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOMoveFeatureDeltaImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2012, 2014-2018 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008-2012, 2014-2019 Eike Stepper (Loehne, 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 @@ -68,26 +68,31 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM out.writeXInt(oldPosition); } + @Override public int getNewPosition() { return newPosition; } + @Override public int getOldPosition() { return oldPosition; } + @Override public Type getType() { return Type.MOVE; } + @Override public int getIndex() { return oldPosition; } + @Override public Object getValue() { return value; @@ -108,6 +113,7 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM this.newPosition = newPosition; } + @Override public CDOFeatureDelta copy() { CDOFeatureDelta copy = new CDOMoveFeatureDeltaImpl(getFeature(), newPosition, oldPosition); @@ -115,6 +121,7 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM return copy; } + @Override public Object applyTo(CDORevision revision) { EStructuralFeature feature = getFeature(); @@ -145,6 +152,7 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM return list.move(newPosition, oldPosition); } + @Override public void affectIndices(ListTargetAdding[] source, int[] indices) { if (oldPosition < newPosition) @@ -205,6 +213,7 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM System.out.println(index); } + @Override public int projectIndex(int index) { if (oldPosition < newPosition) @@ -235,11 +244,13 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM return index; } + @Override public void accept(CDOFeatureDeltaVisitor visitor) { visitor.visit(this); } + @Override public void adjustAfterAddition(int index) { if (index <= oldPosition) @@ -253,6 +264,7 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM } } + @Override public void adjustAfterRemoval(int index) { if (index < oldPosition && oldPosition > 0) @@ -272,6 +284,7 @@ public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOM } } + @Override public void adjustAfterMove(int oldPosition, int newPosition) { if (this.oldPosition == oldPosition) diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java index f657a2f0fc..775ad7e884 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORemoveFeatureDeltaImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2012, 2014-2018 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008-2012, 2014-2019 Eike Stepper (Loehne, 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 @@ -53,11 +53,13 @@ public class CDORemoveFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl im return UNKNOWN_VALUE; } + @Override public Type getType() { return Type.REMOVE; } + @Override public CDOFeatureDelta copy() { CDORemoveFeatureDeltaImpl delta = new CDORemoveFeatureDeltaImpl(getFeature(), getIndex()); @@ -65,6 +67,7 @@ public class CDORemoveFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl im return delta; } + @Override public Object applyTo(CDORevision revision) { EStructuralFeature feature = getFeature(); @@ -80,11 +83,13 @@ public class CDORemoveFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl im return list.remove(index); } + @Override public void accept(CDOFeatureDeltaVisitor visitor) { visitor.visit(this); } + @Override public void affectIndices(ListTargetAdding sources[], int[] indices) { int index = getIndex(); @@ -107,6 +112,7 @@ public class CDORemoveFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl im } } + @Override public int projectIndex(int index) { if (index >= getIndex()) diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java index c7826ddd98..725c65a29d 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDORevisionDeltaImpl.java @@ -184,82 +184,98 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa } } + @Override public EClass getEClass() { return eClass; } + @Override public CDOID getID() { return id; } + @Override public CDOBranch getBranch() { return branch; } + @Override public void setBranch(CDOBranch branch) { this.branch = branch; } + @Override public int getVersion() { return version; } + @Override public void setVersion(int version) { this.version = version; } + @Override public CDORevisable getTarget() { return target; } + @Override public void setTarget(CDORevisable target) { this.target = target; } + @Override public int size() { return featureDeltas.size(); } + @Override public boolean isEmpty() { return featureDeltas.isEmpty(); } + @Override public CDORevisionDelta copy() { return new CDORevisionDeltaImpl(this, true); } + @Override public Map<EStructuralFeature, CDOFeatureDelta> getFeatureDeltaMap() { return featureDeltas; } + @Override public CDOFeatureDelta getFeatureDelta(EStructuralFeature feature) { return featureDeltas.get(feature); } + @Override public List<CDOFeatureDelta> getFeatureDeltas() { return new ArrayList<CDOFeatureDelta>(featureDeltas.values()); } + @Override @Deprecated public void apply(CDORevision revision) { applyTo(revision); } + @Override public void applyTo(CDORevision revision) { for (CDOFeatureDelta featureDelta : featureDeltas.values()) @@ -268,12 +284,14 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa } } + @Override @Deprecated public void addFeatureDelta(CDOFeatureDelta delta) { throw new UnsupportedOperationException(); } + @Override public void addFeatureDelta(CDOFeatureDelta delta, CDOOriginSizeProvider originSizeProvider) { if (delta instanceof CDOListFeatureDelta) @@ -323,6 +341,7 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa } } + @Override public boolean adjustReferences(CDOReferenceAdjuster referenceAdjuster) { boolean changed = false; @@ -334,6 +353,7 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa return changed; } + @Override public void adjustBranches(CDOBranchManager newBranchManager) { if (branch != null) @@ -347,11 +367,13 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa } } + @Override public void accept(CDOFeatureDeltaVisitor visitor) { accept(visitor, Predicates.<EStructuralFeature> alwaysTrue()); } + @Override public void accept(CDOFeatureDeltaVisitor visitor, Predicate<EStructuralFeature> filter) { for (CDOFeatureDelta featureDelta : featureDeltas.values()) @@ -364,11 +386,13 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa } } + @Override public void addDelta(CDOListFeatureDelta listFeatureDelta) { featureDeltas.put(listFeatureDelta.getFeature(), listFeatureDelta); } + @Override public void addClearDelta(CDOClearFeatureDelta clearFeatureDelta, CDOOriginSizeProvider originSizeProvider) { addFeatureDelta(clearFeatureDelta, originSizeProvider); @@ -476,6 +500,7 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa { handler.addClearDelta(new CDOClearFeatureDeltaImpl(feature), new CDOOriginSizeProvider() { + @Override public int getOriginSize() { return originSize; @@ -589,11 +614,13 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa final CDOListFeatureDelta[] result = { null }; compareLists(originRevision, dirtyRevision, feature, new ListComparisonHandler() { + @Override public void addDelta(CDOListFeatureDelta listFeatureDelta) { result[0] = listFeatureDelta; } + @Override public void addClearDelta(CDOClearFeatureDelta clearFeatureDelta, CDOOriginSizeProvider originSizeProvider) { CDOListFeatureDeltaImpl listFeatureDelta = new CDOListFeatureDeltaImpl(feature, originRevision.size(feature)); @@ -622,123 +649,148 @@ public class CDORevisionDeltaImpl implements InternalCDORevisionDelta, ListCompa { } + @Override public int size() { return 0; } + @Override public boolean isEmpty() { return true; } + @Override public boolean contains(Object o) { return false; } + @Override public Iterator<ListChange> iterator() { return LIST.iterator(); } + @Override public Object[] toArray() { return LIST.toArray(); } + @Override public <T> T[] toArray(T[] a) { return LIST.toArray(a); } + @Override public boolean add(ListChange o) { return false; } + @Override public boolean remove(Object o) { return false; } + @Override public boolean containsAll(Collection<?> c) { return false; } + @Override public boolean addAll(Collection<? extends ListChange> c) { return false; } + @Override public boolean addAll(int index, Collection<? extends ListChange> c) { return false; } + @Override public boolean removeAll(Collection<?> c) { return false; } + @Override public boolean retainAll(Collection<?> c) { return false; } + @Override public void clear() { } + @Override public ListChange get(int index) { return LIST.get(index); } + @Override public ListChange set(int index, ListChange element) { return null; } + @Override public void add(int index, ListChange element) { } + @Override public ListChange remove(int index) { return null; } + @Override public int indexOf(Object o) { return LIST.indexOf(o); } + @Override public int lastIndexOf(Object o) { return LIST.lastIndexOf(o); } + @Override public ListIterator<ListChange> listIterator() { return LIST.listIterator(); } + @Override public ListIterator<ListChange> listIterator(int index) { return LIST.listIterator(index); } + @Override public List<ListChange> subList(int fromIndex, int toIndex) { return LIST.subList(fromIndex, toIndex); } + @Override public void move(int newPosition, ListChange object) { } + @Override public ListChange move(int newPosition, int oldPosition) { return null; diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java index 320c1ae372..890801362c 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSetFeatureDeltaImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2012, 2014-2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008-2012, 2014-2016, 2019 Eike Stepper (Loehne, 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 @@ -67,16 +67,19 @@ public class CDOSetFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl imple } } + @Override public Type getType() { return Type.SET; } + @Override public CDOFeatureDelta copy() { return new CDOSetFeatureDeltaImpl(getFeature(), getIndex(), getValue(), getOldValue()); } + @Override public Object applyTo(CDORevision revision) { EStructuralFeature feature = getFeature(); @@ -87,11 +90,13 @@ public class CDOSetFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl imple return internalRevision.set(feature, index, value); } + @Override public void accept(CDOFeatureDeltaVisitor visitor) { visitor.visit(this); } + @Override public Object getOldValue() { return oldValue; diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSingleValueFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSingleValueFeatureDeltaImpl.java index de1e82b335..9a4c8ef6a1 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSingleValueFeatureDeltaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOSingleValueFeatureDeltaImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2013, 2016-2018 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008-2013, 2016-2019 Eike Stepper (Loehne, 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 @@ -108,6 +108,7 @@ public abstract class CDOSingleValueFeatureDeltaImpl extends CDOFeatureDeltaImpl return in.readCDOFeatureValue(feature); } + @Override public int getIndex() { return index; @@ -133,6 +134,7 @@ public abstract class CDOSingleValueFeatureDeltaImpl extends CDOFeatureDeltaImpl setValue(CDOID.NULL); } + @Override public void adjustAfterAddition(int index) { if (index <= this.index) @@ -141,6 +143,7 @@ public abstract class CDOSingleValueFeatureDeltaImpl extends CDOFeatureDeltaImpl } } + @Override public void adjustAfterRemoval(int index) { if (index < this.index && this.index > 0) @@ -149,6 +152,7 @@ public abstract class CDOSingleValueFeatureDeltaImpl extends CDOFeatureDeltaImpl } } + @Override public void adjustAfterMove(int oldPosition, int newPosition) { if (index == oldPosition) diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOUnsetFeatureDeltaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOUnsetFeatureDeltaImpl.java index 6b0a55afae..fe89e73718 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOUnsetFeatureDeltaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/delta/CDOUnsetFeatureDeltaImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2012, 2014 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008-2012, 2014, 2019 Eike Stepper (Loehne, 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 @@ -42,16 +42,19 @@ public class CDOUnsetFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDO super(in, eClass); } + @Override public Type getType() { return Type.UNSET; } + @Override public CDOFeatureDelta copy() { return new CDOUnsetFeatureDeltaImpl(getFeature()); } + @Override public Object applyTo(CDORevision revision) { EStructuralFeature feature = getFeature(); @@ -90,6 +93,7 @@ public class CDOUnsetFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDO return null; } + @Override public void accept(CDOFeatureDeltaVisitor visitor) { visitor.visit(this); |