diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common')
23 files changed, 51 insertions, 53 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java index b876db4ed4..1c3eec89ca 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchImpl.java @@ -35,7 +35,7 @@ import java.util.List; /** * @author Eike Stepper */ -public class CDOBranchImpl extends Container<CDOBranch> implements InternalCDOBranch +public class CDOBranchImpl extends Container<CDOBranch>implements InternalCDOBranch { private static final InternalCDOBranch[] NO_BRANCHES = new InternalCDOBranch[0]; diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java index 184abbe9b9..f8ad6d7d69 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/branch/CDOBranchManagerImpl.java @@ -34,7 +34,7 @@ import java.util.Map; /** * @author Eike Stepper */ -public class CDOBranchManagerImpl extends Container<CDOBranch> implements InternalCDOBranchManager +public class CDOBranchManagerImpl extends Container<CDOBranch>implements InternalCDOBranchManager { private CDOCommonRepository repository; @@ -226,8 +226,8 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern { checkActive(); - Pair<Integer, Long> result = branchLoader.createBranch(branchID, new BranchInfo(name, baseBranch.getID(), - baseTimeStamp)); + Pair<Integer, Long> result = branchLoader.createBranch(branchID, + new BranchInfo(name, baseBranch.getID(), baseTimeStamp)); branchID = result.getElement1(); baseTimeStamp = result.getElement2(); @@ -322,8 +322,8 @@ public class CDOBranchManagerImpl extends Container<CDOBranch> implements Intern * @author Eike Stepper */ @Deprecated - private static final class BranchCreatedEvent extends BranchChangedEvent implements - org.eclipse.emf.cdo.common.branch.CDOBranchCreatedEvent + private static final class BranchCreatedEvent extends BranchChangedEvent + implements org.eclipse.emf.cdo.common.branch.CDOBranchCreatedEvent { private static final long serialVersionUID = 1L; diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/bundle/OM.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/bundle/OM.java index e3d8bbb6e4..1d2f77a29c 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/bundle/OM.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/bundle/OM.java @@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer; /** * The <em>Operations & Maintenance</em> class of this bundle. - * + * * @author Eike Stepper */ public abstract class OM diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java index 27e953db85..2c5fbdb22a 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOChangeSetDataImpl.java @@ -212,9 +212,8 @@ public class CDOChangeSetDataImpl implements CDOChangeSetData @Override public String toString() { - return MessageFormat - .format( - "ChangeSetData[newObjects={0}, changedObjects={1}, detachedObjects={2}]", newObjects.size(), changedObjects.size(), detachedObjects.size()); //$NON-NLS-1$ + return MessageFormat.format("ChangeSetData[newObjects={0}, changedObjects={1}, detachedObjects={2}]", //$NON-NLS-1$ + newObjects.size(), changedObjects.size(), detachedObjects.size()); } public static String format(CDOChangeSetData changeSetData) diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java index 8f0375c006..a7ece4baef 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitDataImpl.java @@ -47,7 +47,7 @@ public class CDOCommitDataImpl extends CDOChangeSetDataImpl implements CDOCommit { return MessageFormat.format( "CommitData[newPackageUnits={0}, newObjects={1}, changedObjects={2}, detachedObjects={3}]", //$NON-NLS-1$ - commitData.getNewPackageUnits().size(), commitData.getNewObjects().size(), commitData.getChangedObjects() - .size(), commitData.getDetachedObjects().size()); + commitData.getNewPackageUnits().size(), commitData.getNewObjects().size(), + commitData.getChangedObjects().size(), commitData.getDetachedObjects().size()); } } diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java index 2d54e4ef92..cfc1790348 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java @@ -37,7 +37,7 @@ import java.util.Map; * @author Eike Stepper * @since 4.2 */ -public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CDOCommitHistory +public class CDOCommitHistoryImpl extends Container<CDOCommitInfo>implements CDOCommitHistory { private final TriggerLoadElement triggerLoadElement = new TriggerLoadElementImpl(); @@ -529,7 +529,7 @@ public class CDOCommitHistoryImpl extends Container<CDOCommitInfo> implements CD /** * @author Eike Stepper */ - public static final class Empty extends Container<CDOCommitInfo> implements CDOCommitHistory + public static final class Empty extends Container<CDOCommitInfo>implements CDOCommitHistory { private static final CDOCommitInfo[] NO_ELEMENTS = {}; diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java index 13d850ab21..3188a74a75 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryProviderImpl.java @@ -26,8 +26,8 @@ import java.util.WeakHashMap; * @author Eike Stepper * @since 4.2 */ -public abstract class CDOCommitHistoryProviderImpl<KEY, HISTORY extends CDOCommitHistory> extends Lifecycle implements - CDOCommitHistory.Provider<KEY, HISTORY> +public abstract class CDOCommitHistoryProviderImpl<KEY, HISTORY extends CDOCommitHistory> extends Lifecycle + implements CDOCommitHistory.Provider<KEY, HISTORY> { private Map<CDOCommitHistory, KEY> histories = new WeakHashMap<CDOCommitHistory, KEY>(); diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java index 186ed2e5c1..9cb2ad7d03 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoImpl.java @@ -239,9 +239,8 @@ public class CDOCommitInfoImpl extends CDOBranchPointImpl implements CDOCommitIn long t = commitInfo.getTimeStamp(); String timeStamp = CDOCommonUtil.formatTimeStamp(t) + " (" + t + ")"; - return MessageFormat - .format( - "CommitInfo[{0}, {1}, {2}, {3}, {4}]", timeStamp, commitInfo.getBranch(), commitInfo.getUserID(), commitInfo.getComment(), data); //$NON-NLS-1$ + return MessageFormat.format("CommitInfo[{0}, {1}, {2}, {3}, {4}]", timeStamp, commitInfo.getBranch(), //$NON-NLS-1$ + commitInfo.getUserID(), commitInfo.getComment(), data); } public synchronized boolean isCommitDataLoaded() diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java index 7c2fa4530d..d12e3cf15a 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitInfoManagerImpl.java @@ -32,8 +32,8 @@ import java.util.WeakHashMap; /** * @author Andre Dietisheim */ -public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBranch, CDOCommitHistory> implements - InternalCDOCommitInfoManager +public class CDOCommitInfoManagerImpl extends CDOCommitHistoryProviderImpl<CDOBranch, CDOCommitHistory> + implements InternalCDOCommitInfoManager { private final Map<CDOCommitInfo, WeakReference<CDOCommitInfo>> cache; diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java index 3edbc4efe5..f0ec767611 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectLongWithClassifierImpl.java @@ -29,8 +29,8 @@ import java.io.ObjectStreamException; * @author Martin Taal * @since 3.0 */ -public final class CDOIDObjectLongWithClassifierImpl extends AbstractCDOID implements InternalCDOIDObject, - CDOClassifierRef.Provider +public final class CDOIDObjectLongWithClassifierImpl extends AbstractCDOID + implements InternalCDOIDObject, CDOClassifierRef.Provider { private static final long serialVersionUID = 1L; @@ -77,7 +77,7 @@ public final class CDOIDObjectLongWithClassifierImpl extends AbstractCDOID imple public String toURIFragment() { return classifierRef.getPackageURI() + CDOClassifierRef.URI_SEPARATOR + classifierRef.getClassifierName() - + CDOClassifierRef.URI_SEPARATOR + value; + + CDOClassifierRef.URI_SEPARATOR + value; } public Type getType() diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java index b6e780ec14..15144775ea 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/id/CDOIDObjectStringWithClassifierImpl.java @@ -29,8 +29,8 @@ import java.io.ObjectStreamException; * @author Martin Taal * @since 3.0 */ -public final class CDOIDObjectStringWithClassifierImpl extends AbstractCDOID implements InternalCDOIDObject, - CDOIDString, CDOClassifierRef.Provider +public final class CDOIDObjectStringWithClassifierImpl extends AbstractCDOID + implements InternalCDOIDObject, CDOIDString, CDOClassifierRef.Provider { private static final long serialVersionUID = 1L; @@ -77,7 +77,7 @@ public final class CDOIDObjectStringWithClassifierImpl extends AbstractCDOID imp public String toURIFragment() { return classifierRef.getPackageURI() + CDOClassifierRef.URI_SEPARATOR + classifierRef.getClassifierName() - + CDOClassifierRef.URI_SEPARATOR + value; + + CDOClassifierRef.URI_SEPARATOR + value; } public Type getType() diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java index 7644dd9615..745dac012f 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockAreaImpl.java @@ -4,7 +4,7 @@ * 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: * Eike Stepper - initial API and implementation * Caspar De Groot - maintenance diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockOwnerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockOwnerImpl.java index ea2dc1d53c..6824053a6d 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockOwnerImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/lock/CDOLockOwnerImpl.java @@ -4,7 +4,7 @@ * 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: * Caspar De Groot - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/messages/Messages.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/messages/Messages.java index 34c0e34824..0647442c14 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/messages/Messages.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/messages/Messages.java @@ -4,7 +4,7 @@ * 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: * Victor Roldan Betancort - initial API and implementation * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java index 0440b8f50a..7e8c8fc6d3 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/model/CDOPackageUnitImpl.java @@ -332,7 +332,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit public InternalCDOPackageUnit copy() { InternalCDOPackageUnit packageUnit = (InternalCDOPackageUnit)CDOModelUtil.createPackageUnit(); - + InternalCDOPackageInfo[] thesePackageInfos = getPackageInfos(); InternalCDOPackageInfo[] packageInfos = new InternalCDOPackageInfo[thesePackageInfos.length]; for (int i = 0; i < thesePackageInfos.length; i++) @@ -340,7 +340,7 @@ public class CDOPackageUnitImpl implements InternalCDOPackageUnit packageInfos[i] = thesePackageInfos[i].copy(); packageInfos[i].setPackageUnit(packageUnit); } - + packageUnit.setPackageInfos(packageInfos); packageUnit.setOriginalType(getOriginalType()); packageUnit.setState(getState()); diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java index 2aaf8ea11e..db465fd4bc 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/AbstractCDORevisionCache.java @@ -33,8 +33,8 @@ import java.text.MessageFormat; /** * @author Eike Stepper */ -public abstract class AbstractCDORevisionCache extends ReferenceQueueWorker<InternalCDORevision> implements - InternalCDORevisionCache +public abstract class AbstractCDORevisionCache extends ReferenceQueueWorker<InternalCDORevision> + implements InternalCDORevisionCache { private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_REVISION, AbstractCDORevisionCache.class); @@ -66,8 +66,8 @@ public abstract class AbstractCDORevisionCache extends ReferenceQueueWorker<Inte CDOBranchManager actualBranchManager = branch.getBranchManager(); if (actualBranchManager != branchManager) { - throw new IllegalArgumentException("Wrong branch manager: " + actualBranchManager + "; expected: " - + branchManager); + throw new IllegalArgumentException( + "Wrong branch manager: " + actualBranchManager + "; expected: " + branchManager); } } } @@ -155,7 +155,7 @@ public abstract class AbstractCDORevisionCache extends ReferenceQueueWorker<Inte /** * @author Eike Stepper */ - private static final class CacheSoftReference extends SoftReference<InternalCDORevision> implements CDORevisionKey + private static final class CacheSoftReference extends SoftReference<InternalCDORevision>implements CDORevisionKey { private CDOID id; @@ -196,7 +196,7 @@ public abstract class AbstractCDORevisionCache extends ReferenceQueueWorker<Inte /** * @author Eike Stepper */ - private static final class CacheStrongReference extends SoftReference<InternalCDORevision> implements CDORevisionKey + private static final class CacheStrongReference extends SoftReference<InternalCDORevision>implements CDORevisionKey { private CDOID id; diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java index 05a73f0d05..071d3f8c3d 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDOListImpl.java @@ -27,7 +27,7 @@ import java.util.Collection; /** * @author Simon McDuff */ -public class CDOListImpl extends BasicEList<Object> implements InternalCDOList.ConfigurableEquality +public class CDOListImpl extends BasicEList<Object>implements InternalCDOList.ConfigurableEquality { public static final CDOListFactory FACTORY = new CDOListFactory() { diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java index 685860e3ac..0d0c556879 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java @@ -311,8 +311,8 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi List<? extends CDORevision> primaryLoadedRevisions // = getResultsAndSynthetics(infosToLoad.toArray(new RevisionInfo[0]), null); - if (primaryLoadedRevisions != null && !primaryLoadedRevisions.isEmpty() || additionalLoadedRevisions != null - && !additionalLoadedRevisions.isEmpty()) + if (primaryLoadedRevisions != null && !primaryLoadedRevisions.isEmpty() + || additionalLoadedRevisions != null && !additionalLoadedRevisions.isEmpty()) { if (primaryLoadedRevisions == null) { @@ -428,7 +428,7 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi List<InternalCDORevision> additionalRevisions = null; List<RevisionInfo> additionalRevisionInfos = // - revisionLoader.loadRevisions(infosToLoad, branchPoint, referenceChunk, prefetchDepth); + revisionLoader.loadRevisions(infosToLoad, branchPoint, referenceChunk, prefetchDepth); if (additionalRevisionInfos != null) { 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 6ff65dee44..afb7030351 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 @@ -28,8 +28,8 @@ import java.io.IOException; /** * @author Simon McDuff */ -public class CDOAddFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl implements CDOAddFeatureDelta, - ListIndexAffecting, ListTargetAdding +public class CDOAddFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl + implements CDOAddFeatureDelta, ListIndexAffecting, ListTargetAdding { public CDOAddFeatureDeltaImpl(EStructuralFeature feature, int index, Object value) { 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 b5dd4e1466..1bacbf2689 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 @@ -186,7 +186,7 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL cachedSources = new ListTargetAdding[initialCapacity]; } else - // i.e. unprocessedFeatureDeltas != null + // i.e. unprocessedFeatureDeltas != null { int requiredCapacity = 1 + cachedIndices[0] + unprocessedFeatureDeltas.size(); if (cachedIndices.length < requiredCapacity) @@ -606,8 +606,8 @@ public class CDOListFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOL private static <T, U> T[] copyOf(U[] original, int newLength, Class<? extends T[]> newType) { @SuppressWarnings("unchecked") - T[] copy = (Object)newType == (Object)Object[].class ? (T[])new Object[newLength] : (T[])Array.newInstance( - newType.getComponentType(), newLength); + T[] copy = (Object)newType == (Object)Object[].class ? (T[])new Object[newLength] + : (T[])Array.newInstance(newType.getComponentType(), newLength); System.arraycopy(original, 0, copy, 0, Math.min(original.length, newLength)); return copy; } 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 9c712b50c5..ee432f1ee3 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 @@ -32,8 +32,8 @@ import java.text.MessageFormat; /** * @author Simon McDuff */ -public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl implements CDOMoveFeatureDelta, ListIndexAffecting, - WithIndex +public class CDOMoveFeatureDeltaImpl extends CDOFeatureDeltaImpl + implements CDOMoveFeatureDelta, ListIndexAffecting, WithIndex { private int 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 274666c590..336b146158 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 @@ -29,8 +29,8 @@ import java.io.IOException; /** * @author Simon McDuff */ -public class CDORemoveFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl implements CDORemoveFeatureDelta, - ListIndexAffecting +public class CDORemoveFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl + implements CDORemoveFeatureDelta, ListIndexAffecting { public CDORemoveFeatureDeltaImpl(EStructuralFeature feature, int index) { 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 51938faf3c..7187adfc5d 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 @@ -28,8 +28,8 @@ import java.text.MessageFormat; /** * @author Simon McDuff */ -public class CDOSetFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl implements CDOSetFeatureDelta, - ListTargetAdding +public class CDOSetFeatureDeltaImpl extends CDOSingleValueFeatureDeltaImpl + implements CDOSetFeatureDelta, ListTargetAdding { private Object oldValue = CDOSetFeatureDelta.UNSPECIFIED; |