Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2009-07-10 12:40:21 -0400
committerEike Stepper2009-07-10 12:40:21 -0400
commit906ddac14e3e924f161f88cbe1b2e4ef95e5030b (patch)
treee8e48d7b352b70a1dbf292b2a7f37fdffc0d29ec
parentd61b83708cc4f3b9d6e77c3d82a9c0b38df7d2d4 (diff)
downloadcdo-906ddac14e3e924f161f88cbe1b2e4ef95e5030b.tar.gz
cdo-906ddac14e3e924f161f88cbe1b2e4ef95e5030b.tar.xz
cdo-906ddac14e3e924f161f88cbe1b2e4ef95e5030b.zip
[282481] Provide an EmbeddedSessionProtocol
https://bugs.eclipse.org/bugs/show_bug.cgi?id=282481
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionManager.java (renamed from plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionResolver.java)14
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java (renamed from plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionResolverImpl.java)8
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java (renamed from plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionResolver.java)4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/AbstractSyncRevisionsRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChunkIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionIndication.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/VerifyRevisionIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaWithDeltaSupportTest.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaWithoutDeltaSupportTest.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246456_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java8
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOCollectionLoadingPolicy.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.java8
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java14
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOAuditImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java6
-rw-r--r--releng/org.eclipse.emf.cdo.formatchecker/src/org/eclipse/emf/cdo/formatchecker/CopyOfFormatChecker.java847
42 files changed, 113 insertions, 972 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java
index 05f5d867d1..303a764433 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/db/CDOCommonDBUtil.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.common.id.CDOIDProvider;
import org.eclipse.emf.cdo.common.internal.db.cache.DBRevisionCache;
import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.common.revision.CDOListFactory;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache;
import org.eclipse.net4j.db.IDBAdapter;
@@ -42,12 +42,12 @@ public final class CDOCommonDBUtil
* @param idObjectFactory
* @param listFactory
* @param packageRegistry
- * @param revisionResolver
+ * @param revisionManager
* @param dbConnectionProvider
*/
public static CDORevisionCache createDBCache(IDBAdapter dbAdapter, IDBConnectionProvider dbConnectionProvider,
CDOIDProvider idProvider, CDOIDObjectFactory idObjectFactory, CDOListFactory listFactory,
- CDOPackageRegistry packageRegistry, CDORevisionResolver revisionResolver)
+ CDOPackageRegistry packageRegistry, CDORevisionManager revisionManager)
{
DBRevisionCache cache = new DBRevisionCache();
cache.setDBAdapter(dbAdapter);
@@ -56,7 +56,7 @@ public final class CDOCommonDBUtil
cache.setIDObjectFactory(idObjectFactory);
cache.setListFactory(listFactory);
cache.setPackageRegistry(packageRegistry);
- cache.setRevisionResolver(revisionResolver);
+ cache.setRevisionManager(revisionManager);
return cache;
}
diff --git a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
index c7a42f566f..ae53a242c3 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common.db/src/org/eclipse/emf/cdo/common/internal/db/cache/DBRevisionCache.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.common.io.CDODataOutput;
import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.common.revision.CDOListFactory;
import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache;
import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl;
import org.eclipse.emf.cdo.internal.common.io.CDODataOutputImpl;
@@ -65,7 +65,7 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
private CDOPackageRegistry packageRegistry;
- private CDORevisionResolver revisionResolver;
+ private CDORevisionManager revisionManager;
private IDBAdapter dbAdapter;
@@ -115,14 +115,14 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
this.packageRegistry = packageRegistry;
}
- public CDORevisionResolver getRevisionResolver()
+ public CDORevisionManager getRevisionManager()
{
- return revisionResolver;
+ return revisionManager;
}
- public void setRevisionResolver(CDORevisionResolver revisionResolver)
+ public void setRevisionManager(CDORevisionManager revisionManager)
{
- this.revisionResolver = revisionResolver;
+ this.revisionManager = revisionManager;
}
public IDBAdapter getDBAdapter()
@@ -722,7 +722,7 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
checkState(idProvider, "idProvider"); //$NON-NLS-1$
checkState(listFactory, "listFactory");//$NON-NLS-1$
checkState(packageRegistry, "packageRegistry"); //$NON-NLS-1$
- checkState(revisionResolver, "revisionResolver"); //$NON-NLS-1$
+ checkState(revisionManager, "revisionManager"); //$NON-NLS-1$
checkState(dbAdapter, "dbAdapter"); //$NON-NLS-1$
checkState(dbConnectionProvider, "dbConnectionProvider"); //$NON-NLS-1$
}
@@ -817,9 +817,9 @@ public class DBRevisionCache extends Lifecycle implements CDORevisionCache
}
@Override
- protected CDORevisionResolver getRevisionResolver()
+ protected CDORevisionManager getRevisionManager()
{
- return revisionResolver;
+ return revisionManager;
}
};
}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionResolver.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionManager.java
index 860ab54a22..97d0781250 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionResolver.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/CDORevisionManager.java
@@ -20,13 +20,12 @@ import java.util.List;
/**
* @author Eike Stepper
- * @noimplement This interface is not intended to be implemented by clients.
+ * @since 3.0
*/
-public interface CDORevisionResolver
+public interface CDORevisionManager
{
/**
* @return The type of an object if a revision for that object is in the revision cache, <code>null</code> otherwise.
- * @since 2.0
*/
public EClass getObjectType(CDOID id);
@@ -50,19 +49,10 @@ public interface CDORevisionResolver
public List<CDORevision> getRevisions(Collection<CDOID> ids, int referenceChunk);
- /**
- * @since 2.0
- */
public List<CDORevision> getRevisionsByTime(Collection<CDOID> ids, int referenceChunk, long timeStamp,
boolean loadMissingRevisions);
- /**
- * @since 2.0
- */
public CDOID getResourceID(CDOID folderID, String name, long timeStamp);
- /**
- * @since 2.0
- */
public CDORevisionCache getCache();
}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java
index cecf738ff6..2382786c0d 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/io/CDODataInputImpl.java
@@ -27,7 +27,7 @@ import org.eclipse.emf.cdo.common.model.CDOType;
import org.eclipse.emf.cdo.common.revision.CDOList;
import org.eclipse.emf.cdo.common.revision.CDOListFactory;
import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.common.revision.CDORevisionUtil;
import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta;
import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
@@ -359,7 +359,7 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
protected abstract CDOPackageRegistry getPackageRegistry();
- protected abstract CDORevisionResolver getRevisionResolver();
+ protected abstract CDORevisionManager getRevisionManager();
protected abstract CDOIDObjectFactory getIDFactory();
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionResolverImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
index b661f46a03..9d4c14bcb0 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionResolverImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache;
import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCacheUtil;
import org.eclipse.emf.cdo.internal.common.bundle.OM;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.net4j.util.ReflectUtil.ExcludeFromDump;
import org.eclipse.net4j.util.lifecycle.Lifecycle;
@@ -35,9 +35,9 @@ import java.util.List;
/**
* @author Eike Stepper
*/
-public class CDORevisionResolverImpl extends Lifecycle implements InternalCDORevisionResolver
+public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevisionManager
{
- private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_REVISION, CDORevisionResolverImpl.class);
+ private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_REVISION, CDORevisionManagerImpl.class);
private RevisionLoader revisionLoader;
@@ -51,7 +51,7 @@ public class CDORevisionResolverImpl extends Lifecycle implements InternalCDORev
@ExcludeFromDump
private Object revisedLock = new Object();
- public CDORevisionResolverImpl()
+ public CDORevisionManagerImpl()
{
}
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionResolver.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java
index 9a5bc3e183..5b12f57ad6 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionResolver.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/spi/common/revision/InternalCDORevisionManager.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.spi.common.revision;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache;
import java.util.Collection;
@@ -22,7 +22,7 @@ import java.util.List;
* @author Eike Stepper
* @since 3.0
*/
-public interface InternalCDORevisionResolver extends CDORevisionResolver
+public interface InternalCDORevisionManager extends CDORevisionManager
{
public RevisionLoader getRevisionLoader();
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/AbstractSyncRevisionsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/AbstractSyncRevisionsRequest.java
index 93b7f2a756..37724b169c 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/AbstractSyncRevisionsRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/AbstractSyncRevisionsRequest.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.common.revision.CDORevision;
import org.eclipse.emf.cdo.internal.net4j.bundle.OM;
import org.eclipse.emf.cdo.internal.net4j.messages.Messages;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.transaction.CDOTimeStampContext;
import org.eclipse.emf.internal.cdo.transaction.CDOTimeStampContextImpl;
@@ -74,7 +74,7 @@ public abstract class AbstractSyncRevisionsRequest extends CDOClientRequest<Coll
@Override
protected Collection<CDOTimeStampContext> confirming(CDODataInput in) throws IOException
{
- InternalCDORevisionResolver revisionManager = getSession().getRevisionManager();
+ InternalCDORevisionManager revisionManager = getSession().getRevisionManager();
TreeMap<Long, CDOTimeStampContext> mapofContext = new TreeMap<Long, CDOTimeStampContext>();
int size = in.readInt();
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientIndication.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientIndication.java
index aa0fc451bf..dd5040a7ce 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientIndication.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientIndication.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.common.id.CDOIDObjectFactory;
import org.eclipse.emf.cdo.common.io.CDODataInput;
import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.common.revision.CDOListFactory;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl;
import org.eclipse.emf.internal.cdo.revision.CDOListWithElementProxiesImpl;
@@ -79,7 +79,7 @@ public abstract class CDOClientIndication extends Indication
}
@Override
- protected CDORevisionResolver getRevisionResolver()
+ protected CDORevisionManager getRevisionManager()
{
return getSession().getRevisionManager();
}
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequest.java
index b7aeb9de2d..352fabb592 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientRequest.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.common.io.CDODataInput;
import org.eclipse.emf.cdo.common.io.CDODataOutput;
import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.common.revision.CDOListFactory;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl;
import org.eclipse.emf.cdo.internal.common.io.CDODataOutputImpl;
@@ -101,7 +101,7 @@ public abstract class CDOClientRequest<RESULT> extends RequestWithConfirmation<R
}
@Override
- protected CDORevisionResolver getRevisionResolver()
+ protected CDORevisionManager getRevisionManager()
{
return getSession().getRevisionManager();
}
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java
index 55314f8e0c..2d618b70e5 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java
@@ -28,7 +28,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackageUnit;
import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.common.revision.CDOListFactory;
import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl;
@@ -132,7 +132,7 @@ public class CommitTransactionRequest extends RequestWithMonitoring<CommitTransa
}
@Override
- protected CDORevisionResolver getRevisionResolver()
+ protected CDORevisionManager getRevisionManager()
{
return getSession().getRevisionManager();
}
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionRequest.java
index d6f95b46c1..5a716cbd01 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LoadRevisionRequest.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.common.io.CDODataOutput;
import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.internal.net4j.bundle.OM;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.view.CDOFetchRuleManager;
import org.eclipse.net4j.util.om.trace.ContextTracer;
@@ -133,7 +133,7 @@ public class LoadRevisionRequest extends CDOClientRequest<List<InternalCDORevisi
TRACER.format("Reading {0} additional revisions", additionalSize); //$NON-NLS-1$
}
- InternalCDORevisionResolver revisionManager = getSession().getRevisionManager();
+ InternalCDORevisionManager revisionManager = getSession().getRevisionManager();
for (int i = 0; i < additionalSize; i++)
{
InternalCDORevision revision = (InternalCDORevision)in.readCDORevision();
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java
index 6c4d0997fd..5b09f654ee 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CDOServerIndication.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.common.io.CDODataInput;
import org.eclipse.emf.cdo.common.io.CDODataOutput;
import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.common.revision.CDOListFactory;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl;
import org.eclipse.emf.cdo.internal.common.io.CDODataOutputImpl;
import org.eclipse.emf.cdo.internal.common.revision.CDOListImpl;
@@ -82,7 +82,7 @@ public abstract class CDOServerIndication extends IndicationWithResponse
indicating(new CDODataInputImpl(in)
{
@Override
- protected CDORevisionResolver getRevisionResolver()
+ protected CDORevisionManager getRevisionManager()
{
return getRepository().getRevisionManager();
}
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
index b5c33f7981..0c5778f0b2 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/CommitTransactionIndication.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.common.io.CDODataOutput;
import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.common.revision.CDOListFactory;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.internal.common.io.CDODataInputImpl;
import org.eclipse.emf.cdo.internal.common.io.CDODataOutputImpl;
import org.eclipse.emf.cdo.internal.common.revision.CDOListImpl;
@@ -140,7 +140,7 @@ public class CommitTransactionIndication extends IndicationWithMonitoring
indicating(new CDODataInputImpl(in)
{
@Override
- protected CDORevisionResolver getRevisionResolver()
+ protected CDORevisionManager getRevisionManager()
{
return CommitTransactionIndication.this.getRepository().getRevisionManager();
}
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChunkIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChunkIndication.java
index a59f4369e7..ee7ee2f779 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChunkIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadChunkIndication.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.cdo.common.model.CDOType;
import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.server.internal.net4j.bundle.OM;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.spi.server.InternalRepository;
import org.eclipse.net4j.util.collection.MoveableList;
@@ -92,7 +92,7 @@ public class LoadChunkIndication extends CDOReadIndication
protected void responding(CDODataOutput out) throws IOException
{
InternalRepository repository = getRepository();
- InternalCDORevisionResolver revisionManager = repository.getRevisionManager();
+ InternalCDORevisionManager revisionManager = repository.getRevisionManager();
InternalCDORevision revision = (InternalCDORevision)revisionManager.getRevisionByVersion(id, 0, version);
repository.ensureChunk(revision, feature, fromIndex, toIndex + 1);
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionIndication.java
index 7da867354d..7adef50aee 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LoadRevisionIndication.java
@@ -17,10 +17,10 @@ import org.eclipse.emf.cdo.common.io.CDODataInput;
import org.eclipse.emf.cdo.common.io.CDODataOutput;
import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.server.internal.net4j.bundle.OM;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.net4j.util.collection.MoveableList;
import org.eclipse.net4j.util.om.trace.ContextTracer;
@@ -174,7 +174,7 @@ public class LoadRevisionIndication extends CDOReadIndication
protected InternalCDORevision getRevision(CDOID id)
{
- CDORevisionResolver revisionManager = getRepository().getRevisionManager();
+ CDORevisionManager revisionManager = getRepository().getRevisionManager();
return (InternalCDORevision)revisionManager.getRevision(id, referenceChunk);
}
@@ -190,7 +190,7 @@ public class LoadRevisionIndication extends CDOReadIndication
visitedFetchRules.add(fetchRule);
- InternalCDORevisionResolver revisionManager = getSession().getManager().getRepository().getRevisionManager();
+ InternalCDORevisionManager revisionManager = getSession().getManager().getRepository().getRevisionManager();
for (EStructuralFeature feature : fetchRule.getFeatures())
{
if (feature.isMany())
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/VerifyRevisionIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/VerifyRevisionIndication.java
index c3c7b1a913..c07afab6d4 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/VerifyRevisionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/VerifyRevisionIndication.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.common.io.CDODataOutput;
import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.server.internal.net4j.bundle.OM;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.net4j.util.om.trace.ContextTracer;
@@ -45,7 +45,7 @@ public class VerifyRevisionIndication extends CDOReadIndication
TRACER.format("Reading {0} IDs and versions", size); //$NON-NLS-1$
}
- InternalCDORevisionResolver revisionManager = getRepository().getRevisionManager();
+ InternalCDORevisionManager revisionManager = getRepository().getRevisionManager();
timeStamps = new long[size];
for (int i = 0; i < size; i++)
{
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
index f0571260a1..0269b87839 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.common.revision.CDORevision;
import org.eclipse.emf.cdo.eresource.EresourcePackage;
import org.eclipse.emf.cdo.internal.common.model.CDOPackageRegistryImpl;
-import org.eclipse.emf.cdo.internal.common.revision.CDORevisionResolverImpl;
+import org.eclipse.emf.cdo.internal.common.revision.CDORevisionManagerImpl;
import org.eclipse.emf.cdo.server.IQueryHandler;
import org.eclipse.emf.cdo.server.IQueryHandlerProvider;
import org.eclipse.emf.cdo.server.IStore;
@@ -39,7 +39,7 @@ import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry;
import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDOList;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.spi.server.ContainerQueryHandlerProvider;
import org.eclipse.emf.cdo.spi.server.InternalCommitManager;
import org.eclipse.emf.cdo.spi.server.InternalLockManager;
@@ -93,7 +93,7 @@ public class Repository extends Container<Object> implements InternalRepository
private InternalCDOPackageRegistry packageRegistry;
- private InternalCDORevisionResolver revisionManager;
+ private InternalCDORevisionManager revisionManager;
private InternalSessionManager sessionManager;
@@ -427,7 +427,7 @@ public class Repository extends Container<Object> implements InternalRepository
this.sessionManager = sessionManager;
}
- public InternalCDORevisionResolver getRevisionManager()
+ public InternalCDORevisionManager getRevisionManager()
{
return revisionManager;
}
@@ -435,7 +435,7 @@ public class Repository extends Container<Object> implements InternalRepository
/**
* @since 2.0
*/
- public void setRevisionManager(InternalCDORevisionResolver revisionManager)
+ public void setRevisionManager(InternalCDORevisionManager revisionManager)
{
this.revisionManager = revisionManager;
}
@@ -937,9 +937,9 @@ public class Repository extends Container<Object> implements InternalRepository
return new SessionManager();
}
- protected InternalCDORevisionResolver createRevisionManager()
+ protected InternalCDORevisionManager createRevisionManager()
{
- return new CDORevisionResolverImpl();
+ return new CDORevisionManagerImpl();
}
protected InternalQueryManager createQueryManager()
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
index b4a1cd7793..0d195137c1 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
@@ -26,7 +26,7 @@ import org.eclipse.emf.cdo.server.ITransaction;
import org.eclipse.emf.cdo.server.IView;
import org.eclipse.emf.cdo.server.SessionCreationException;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.spi.server.ISessionProtocol;
import org.eclipse.emf.cdo.spi.server.InternalAudit;
import org.eclipse.emf.cdo.spi.server.InternalSession;
@@ -330,7 +330,7 @@ public class Session extends Container<IView> implements InternalSession
public void collectContainedRevisions(InternalCDORevision revision, int referenceChunk, Set<CDOID> revisions,
List<CDORevision> additionalRevisions)
{
- InternalCDORevisionResolver revisionManager = getManager().getRepository().getRevisionManager();
+ InternalCDORevisionManager revisionManager = getManager().getRepository().getRevisionManager();
EClass eClass = revision.getEClass();
EStructuralFeature[] features = CDOModelUtil.getAllPersistentFeatures(eClass);
for (int i = 0; i < features.length; i++)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java
index da44f4d5a0..98fbdeea2d 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TransactionCommitContextImpl.java
@@ -30,7 +30,7 @@ import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit;
import org.eclipse.emf.cdo.spi.common.revision.CDOIDMapper;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionDelta;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.spi.server.InternalCommitContext;
import org.eclipse.emf.cdo.spi.server.InternalLockManager;
import org.eclipse.emf.cdo.spi.server.InternalRepository;
@@ -463,7 +463,7 @@ public class TransactionCommitContextImpl implements InternalCommitContext
int version = dirtyObjectDelta.getOriginVersion();
InternalRepository repository = transaction.getRepository();
- InternalCDORevisionResolver revisionManager = repository.getRevisionManager();
+ InternalCDORevisionManager revisionManager = repository.getRevisionManager();
CDORevision originObject = revisionManager.getRevisionByVersion(id, CDORevision.UNCHUNKED, version, loadOnDemand);
if (originObject != null)
@@ -609,7 +609,7 @@ public class TransactionCommitContextImpl implements InternalCommitContext
try
{
monitor.begin(revisions.length);
- InternalCDORevisionResolver revisionManager = transaction.getRepository().getRevisionManager();
+ InternalCDORevisionManager revisionManager = transaction.getRepository().getRevisionManager();
for (CDORevision revision : revisions)
{
if (revision != null)
@@ -646,7 +646,7 @@ public class TransactionCommitContextImpl implements InternalCommitContext
private void detachObjects(OMMonitor monitor)
{
detachedRevisions.clear();
- InternalCDORevisionResolver revisionManager = transaction.getRepository().getRevisionManager();
+ InternalCDORevisionManager revisionManager = transaction.getRepository().getRevisionManager();
CDOID[] detachedObjects = getDetachedObjects();
try
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java
index 3d0bebf6a6..0390ff2e6a 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java
@@ -145,7 +145,7 @@ public class MEMStoreAccessor extends LongIDStoreAccessor
public InternalCDORevision readRevision(CDOID id, int listChunk, CDORevisionCacheAdder cache)
{
InternalCDORevision storeRevision = getStore().getRevision(id);
- // CDORevisionResolver revisionManager = getStore().getRepository().getRevisionManager();
+ // CDORevisionManager revisionManager = getStore().getRepository().getRevisionManager();
// InternalCDORevision newRevision = new InternalCDORevision(revisionManager, storeRevision.getEClass(),
// storeRevision
// .getID());
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
index a75ddc3633..0aa54aa724 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IRepository.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.server;
import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.om.monitor.OMMonitor;
@@ -61,7 +61,7 @@ public interface IRepository extends IContainer<Object>, IQueryHandlerProvider
/**
* @since 3.0
*/
- public CDORevisionResolver getRevisionManager();
+ public CDORevisionManager getRevisionManager();
public ISessionManager getSessionManager();
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
index b45525643c..0134b70b1a 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalRepository.java
@@ -19,8 +19,8 @@ import org.eclipse.emf.cdo.server.InternalNotificationManager;
import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry;
import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry.PackageLoader;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver.RevisionLoader;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager.RevisionLoader;
import org.eclipse.net4j.util.om.monitor.OMMonitor;
@@ -34,9 +34,9 @@ import java.util.List;
*/
public interface InternalRepository extends IRepository, PackageLoader, RevisionLoader
{
- public InternalCDORevisionResolver getRevisionManager();
+ public InternalCDORevisionManager getRevisionManager();
- public void setRevisionManager(InternalCDORevisionResolver revisionManager);
+ public void setRevisionManager(InternalCDORevisionManager revisionManager);
public InternalSessionManager getSessionManager();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java
index 63e9de42ac..1ca2d91ed7 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java
@@ -14,7 +14,7 @@ package org.eclipse.emf.cdo.tests;
import org.eclipse.emf.cdo.common.revision.CDORevision;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.tests.model1.Customer;
import org.eclipse.emf.cdo.tests.model1.SalesOrder;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
@@ -62,7 +62,7 @@ public class ChunkingWithMEMTest extends AbstractCDOTest
session.close();
}
- InternalCDORevisionResolver revisionManager = getRepository().getRevisionManager();
+ InternalCDORevisionManager revisionManager = getRepository().getRevisionManager();
revisionManager.removeCachedRevision(revisionToRemove);
msg("Opening session");
@@ -121,7 +121,7 @@ public class ChunkingWithMEMTest extends AbstractCDOTest
session.close();
}
- InternalCDORevisionResolver revisionManager = getRepository().getRevisionManager();
+ InternalCDORevisionManager revisionManager = getRepository().getRevisionManager();
revisionManager.removeCachedRevision(revisionToRemove);
msg("Opening session");
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java
index 554be95cec..2cb0eb1cec 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.internal.common.revision.delta.CDOListFeatureDeltaImpl;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.tests.model1.Category;
import org.eclipse.emf.cdo.tests.model1.Company;
import org.eclipse.emf.cdo.tests.model1.Customer;
@@ -203,7 +203,7 @@ public abstract class RevisionDeltaTest extends AbstractCDOTest
transaction.commit();
- InternalCDORevisionResolver revisionManager = getRepository().getRevisionManager();
+ InternalCDORevisionManager revisionManager = getRepository().getRevisionManager();
CDORevision revision = CDOUtil.getCDOObject(customer).cdoRevision();
revisionManager.removeCachedRevision(revision.getID(), revision.getVersion());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaWithDeltaSupportTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaWithDeltaSupportTest.java
index b224ded7c6..5a4707945e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaWithDeltaSupportTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaWithDeltaSupportTest.java
@@ -11,7 +11,6 @@
*/
package org.eclipse.emf.cdo.tests;
-
/**
* @see http://bugs.eclipse.org/201266
* @author Simon McDuff
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaWithoutDeltaSupportTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaWithoutDeltaSupportTest.java
index e27a65cfc8..85ffad87c0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaWithoutDeltaSupportTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaWithoutDeltaSupportTest.java
@@ -11,7 +11,6 @@
*/
package org.eclipse.emf.cdo.tests;
-
/**
* @see http://bugs.eclipse.org/201266
* @author Simon McDuff
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246456_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246456_Test.java
index fddafbb0a5..b400dfb10a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246456_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_246456_Test.java
@@ -14,7 +14,7 @@ package org.eclipse.emf.cdo.tests.bugzilla;
import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.internal.common.revision.cache.lru.LRURevisionCache;
import org.eclipse.emf.cdo.internal.common.revision.cache.two.TwoLevelRevisionCache;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.tests.AbstractCDOTest;
import org.eclipse.emf.cdo.tests.model1.Supplier;
@@ -33,7 +33,7 @@ public class Bugzilla_246456_Test extends AbstractCDOTest
msg("Opening transaction");
InternalCDOTransaction transaction = (InternalCDOTransaction)session.openTransaction();
- InternalCDORevisionResolver revisionManager = transaction.getSession().getRevisionManager();
+ InternalCDORevisionManager revisionManager = transaction.getSession().getRevisionManager();
((LRURevisionCache)((TwoLevelRevisionCache)revisionManager.getCache()).getLevel1()).setCapacityRevised(10);
((LRURevisionCache)((TwoLevelRevisionCache)revisionManager.getCache()).getLevel1()).setCapacityCurrent(10);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
index f237bcf142..e8cbfd8530 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
@@ -10,10 +10,10 @@
*/
package org.eclipse.emf.cdo.tests.config.impl;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.server.IRepository;
import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.spi.server.InternalRepository;
import org.eclipse.emf.cdo.tests.config.IConstants;
import org.eclipse.emf.cdo.tests.config.IContainerConfig;
@@ -491,9 +491,9 @@ public abstract class ConfigTest extends AbstractOMTest implements IConstants
&& !ObjectUtil.equals(getModelConfig(), name));
}
- protected void clearCache(CDORevisionResolver revisionManager)
+ protected void clearCache(CDORevisionManager revisionManager)
{
- ((InternalCDORevisionResolver)revisionManager).getCache().clear();
+ ((InternalCDORevisionManager)revisionManager).getCache().clear();
}
public void restartScenario() throws Exception
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
index 3a12292ead..dcd79a1a5e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.server.IStore;
import org.eclipse.emf.cdo.server.IRepository.Props;
import org.eclipse.emf.cdo.server.mem.MEMStoreUtil;
import org.eclipse.emf.cdo.server.net4j.CDONet4jServerUtil;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.spi.server.InternalRepository;
import org.eclipse.emf.cdo.spi.server.InternalSessionManager;
import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
@@ -149,7 +149,7 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
Map<String, String> props = getRepositoryProperties();
InternalRepository repository = (InternalRepository)CDOServerUtil.createRepository(name, store, props);
- InternalCDORevisionResolver revisionManager = getTestRevisionManager();
+ InternalCDORevisionManager revisionManager = getTestRevisionManager();
if (revisionManager != null)
{
repository.setRevisionManager(revisionManager);
@@ -179,9 +179,9 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
return (InternalRepository)getTestProperty(PROP_TEST_REPOSITORY);
}
- protected InternalCDORevisionResolver getTestRevisionManager()
+ protected InternalCDORevisionManager getTestRevisionManager()
{
- return (InternalCDORevisionResolver)getTestProperty(PROP_TEST_REVISION_MANAGER);
+ return (InternalCDORevisionManager)getTestProperty(PROP_TEST_REVISION_MANAGER);
}
protected IUserManager getTestUserManager()
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOCollectionLoadingPolicy.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOCollectionLoadingPolicy.java
index 7dd61587c4..186db4e5c4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOCollectionLoadingPolicy.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOCollectionLoadingPolicy.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.session;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -61,7 +61,7 @@ public interface CDOCollectionLoadingPolicy
/**
* Defines a strategy to be used when the collection needs to resolve one element.
- * {@link CDORevisionResolver#loadChunkByRange(CDORevision, EStructuralFeature, int, int, int, int)} should be used to
+ * {@link CDORevisionManager#loadChunkByRange(CDORevision, EStructuralFeature, int, int, int, int)} should be used to
* resolve them.
*
* @since 3.0
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
index ec5f3627c3..0aa3e6baf9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSession.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.common.model.CDOPackageUnit;
import org.eclipse.emf.cdo.common.revision.CDORevision;
import org.eclipse.emf.cdo.common.revision.CDORevisionFactory;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.session.remote.CDORemoteSessionManager;
import org.eclipse.emf.cdo.transaction.CDOTimeStampContext;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
@@ -70,12 +70,12 @@ public interface CDOSession extends CDOCommonSession, IContainer<CDOView>, IOpti
public CDOPackageRegistry getPackageRegistry();
/**
- * Returns the CDO {@link CDORevisionResolver revision manager} that manages the {@link CDORevision revisions} of the
+ * Returns the CDO {@link CDORevisionManager revision manager} that manages the {@link CDORevision revisions} of the
* repository of this session.
*
* @since 3.0
*/
- public CDORevisionResolver getRevisionManager();
+ public CDORevisionManager getRevisionManager();
/**
* @since 3.0
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java
index 7d29c2fc54..169a71d869 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/session/CDOSessionConfiguration.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.session;
import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.common.protocol.CDOAuthenticator;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache;
/**
@@ -46,14 +46,14 @@ public interface CDOSessionConfiguration
public void setPackageRegistry(CDOPackageRegistry packageRegistry);
/**
- * @see CDORevisionResolver#getCache()
+ * @see CDORevisionManager#getCache()
*/
public CDORevisionCache getRevisionCache();
/**
* A special revision cache can be set <b>before</b> the session is opened and can not be changed thereafter.
*
- * @see CDORevisionResolver#setCache(CDORevisionCache)
+ * @see CDORevisionManager#setCache(CDORevisionCache)
*/
public void setRevisionCache(CDORevisionCache revisionCache);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.java
index f823fb0347..02881d607f 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.view;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.revision.CDOList;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -29,7 +29,7 @@ public interface CDORevisionPrefetchingPolicy
{
public static final CDORevisionPrefetchingPolicy NO_PREFETCHING = new CDORevisionPrefetchingPolicy()
{
- public Collection<CDOID> loadAhead(CDORevisionResolver revisionManager, EObject targetObject,
+ public Collection<CDOID> loadAhead(CDORevisionManager revisionManager, EObject targetObject,
EStructuralFeature feature, CDOList list, int accessIndex, CDOID accessID)
{
return Collections.emptyList();
@@ -38,7 +38,7 @@ public interface CDORevisionPrefetchingPolicy
/**
* @param revisionManager
- * Lookup availability of objects in the cache with {@link CDORevisionResolver#containsRevision(CDOID)}.
+ * Lookup availability of objects in the cache with {@link CDORevisionManager#containsRevision(CDOID)}.
* @param targetObject
* Container of the list
* @param feature
@@ -48,6 +48,6 @@ public interface CDORevisionPrefetchingPolicy
* @return Should return a list of id's to be fetch.
* @since 3.0
*/
- public Collection<CDOID> loadAhead(CDORevisionResolver revisionManager, EObject targetObject,
+ public Collection<CDOID> loadAhead(CDORevisionManager revisionManager, EObject targetObject,
EStructuralFeature feature, CDOList list, int accessIndex, CDOID accessID);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
index 3be0d637fa..3e5ea32f1b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.cdo.common.revision.CDORevision;
import org.eclipse.emf.cdo.common.revision.CDORevisionFactory;
import org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.util.InvalidObjectException;
import org.eclipse.emf.cdo.view.CDOView;
@@ -723,7 +723,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
revision.adjustReferences(data.getReferenceAdjuster());
}
- InternalCDORevisionResolver revisionManager = view.getSession().getRevisionManager();
+ InternalCDORevisionManager revisionManager = view.getSession().getRevisionManager();
revisionManager.addCachedRevision(revision);
changeState(object, CDOState.CLEAN);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
index 0957867cc8..7538350f9e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
@@ -29,7 +29,7 @@ import org.eclipse.emf.cdo.internal.common.revision.delta.CDORemoveFeatureDeltaI
import org.eclipse.emf.cdo.internal.common.revision.delta.CDOSetFeatureDeltaImpl;
import org.eclipse.emf.cdo.internal.common.revision.delta.CDOUnsetFeatureDeltaImpl;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.view.CDORevisionPrefetchingPolicy;
import org.eclipse.emf.internal.cdo.bundle.OM;
@@ -365,7 +365,7 @@ public final class CDOStore implements EStore
{
CDOID id = (CDOID)value;
CDOList list = revision.getList(feature);
- InternalCDORevisionResolver revisionManager = view.getSession().getRevisionManager();
+ InternalCDORevisionManager revisionManager = view.getSession().getRevisionManager();
CDORevisionPrefetchingPolicy policy = view.options().getRevisionPrefetchingPolicy();
Collection<CDOID> listOfIDs = policy.loadAhead(revisionManager, eObject, feature, list, index, id);
if (!listOfIDs.isEmpty())
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
index 42321873c9..56dffaf6aa 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
@@ -33,7 +33,7 @@ import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
import org.eclipse.emf.cdo.common.util.CDOException;
import org.eclipse.emf.cdo.eresource.EresourcePackage;
import org.eclipse.emf.cdo.internal.common.model.CDOPackageRegistryImpl;
-import org.eclipse.emf.cdo.internal.common.revision.CDORevisionResolverImpl;
+import org.eclipse.emf.cdo.internal.common.revision.CDORevisionManagerImpl;
import org.eclipse.emf.cdo.session.CDOCollectionLoadingPolicy;
import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.session.CDOSessionInvalidationEvent;
@@ -41,7 +41,7 @@ import org.eclipse.emf.cdo.session.remote.CDORemoteSession;
import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry;
import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
import org.eclipse.emf.cdo.transaction.CDOTimeStampContext;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.cdo.view.CDOFetchRuleManager;
@@ -142,7 +142,7 @@ public abstract class CDOSessionImpl extends Container<CDOView> implements Inter
private InternalCDOPackageRegistry packageRegistry;
- private InternalCDORevisionResolver revisionManager;
+ private InternalCDORevisionManager revisionManager;
private CDOFetchRuleManager ruleManager = CDOFetchRuleManager.NOOP;
@@ -320,12 +320,12 @@ public abstract class CDOSessionImpl extends Container<CDOView> implements Inter
lockmanager.unlock(LockType.WRITE, key, singletonCollection);
}
- public InternalCDORevisionResolver getRevisionManager()
+ public InternalCDORevisionManager getRevisionManager()
{
return revisionManager;
}
- public void setRevisionManager(InternalCDORevisionResolver revisionManager)
+ public void setRevisionManager(InternalCDORevisionManager revisionManager)
{
this.revisionManager = revisionManager;
}
@@ -720,9 +720,9 @@ public abstract class CDOSessionImpl extends Container<CDOView> implements Inter
return new CDOPackageRegistryImpl();
}
- protected InternalCDORevisionResolver createRevisionManager()
+ protected InternalCDORevisionManager createRevisionManager()
{
- return new CDORevisionResolverImpl();
+ return new CDORevisionManagerImpl();
}
protected InternalCDORemoteSessionManager createRemoteSessionManager()
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOAuditImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOAuditImpl.java
index 6431d60ba3..0047db6172 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOAuditImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOAuditImpl.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.internal.cdo.view;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
import org.eclipse.emf.cdo.view.CDOAudit;
@@ -97,7 +97,7 @@ public class CDOAuditImpl extends CDOViewImpl implements CDOAudit
InternalCDOSession session = getSession();
int initialChunkSize = session.options().getCollectionLoadingPolicy().getInitialChunkSize();
- CDORevisionResolver revisionManager = session.getRevisionManager();
+ CDORevisionManager revisionManager = session.getRevisionManager();
return (InternalCDORevision)revisionManager.getRevisionByTime(id, initialChunkSize, timeStamp, loadOnDemand);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java
index 19d4c234bb..446e4636d9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDORevisionPrefetchingPolicyImpl.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.internal.cdo.view;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.revision.CDOList;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.view.CDORevisionPrefetchingPolicy;
import org.eclipse.emf.ecore.EObject;
@@ -37,7 +37,7 @@ public class CDORevisionPrefetchingPolicyImpl implements CDORevisionPrefetchingP
this.chunkSize = chunkSize;
}
- public Collection<CDOID> loadAhead(CDORevisionResolver revisionManager, EObject eObject, EStructuralFeature feature,
+ public Collection<CDOID> loadAhead(CDORevisionManager revisionManager, EObject eObject, EStructuralFeature feature,
CDOList list, int accessIndex, CDOID accessID)
{
if (chunkSize > 1 && !revisionManager.containsRevision(accessID))
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
index 7293b36c9c..311d1939bd 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.common.id.CDOIDUtil;
import org.eclipse.emf.cdo.common.model.CDOModelUtil;
import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionResolver;
+import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta;
import org.eclipse.emf.cdo.common.util.CDOException;
import org.eclipse.emf.cdo.eresource.CDOResource;
@@ -679,7 +679,7 @@ public class CDOViewImpl extends Lifecycle implements InternalCDOView
public InternalCDORevision getRevision(CDOID id, boolean loadOnDemand)
{
- CDORevisionResolver revisionManager = session.getRevisionManager();
+ CDORevisionManager revisionManager = session.getRevisionManager();
int initialChunkSize = session.options().getCollectionLoadingPolicy().getInitialChunkSize();
return (InternalCDORevision)revisionManager.getRevision(id, initialChunkSize, loadOnDemand);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
index 4595022496..e0bdd19bdf 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit;
import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry.PackageLoader;
import org.eclipse.emf.cdo.spi.common.revision.CDOIDMapper;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver.RevisionLoader;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager.RevisionLoader;
import org.eclipse.emf.cdo.transaction.CDOTimeStampContext;
import org.eclipse.emf.cdo.view.CDOView;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java
index 487a2c605e..53ef541128 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java
@@ -21,8 +21,8 @@ import org.eclipse.emf.cdo.session.CDOSession;
import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry;
import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry.PackageLoader;
import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry.PackageProcessor;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver;
-import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionResolver.RevisionLocker;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager.RevisionLocker;
import org.eclipse.emf.cdo.view.CDOFetchRuleManager;
import org.eclipse.net4j.util.lifecycle.ILifecycle;
@@ -44,7 +44,7 @@ public interface InternalCDOSession extends CDOSession, CDOIDObjectFactory, Pack
/**
* @since 3.0
*/
- public InternalCDORevisionResolver getRevisionManager();
+ public InternalCDORevisionManager getRevisionManager();
public void setExceptionHandler(CDOSession.ExceptionHandler exceptionHandler);
diff --git a/releng/org.eclipse.emf.cdo.formatchecker/src/org/eclipse/emf/cdo/formatchecker/CopyOfFormatChecker.java b/releng/org.eclipse.emf.cdo.formatchecker/src/org/eclipse/emf/cdo/formatchecker/CopyOfFormatChecker.java
deleted file mode 100644
index 97fc919647..0000000000
--- a/releng/org.eclipse.emf.cdo.formatchecker/src/org/eclipse/emf/cdo/formatchecker/CopyOfFormatChecker.java
+++ /dev/null
@@ -1,847 +0,0 @@
-/**
- * Copyright (c) 2004 - 2009 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:
- * Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.formatchecker;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-/**
- * @author Eike Stepper
- */
-public class CopyOfFormatChecker
-{
- private static Map<String, List<Integer>> complaints = new HashMap<String, List<Integer>>();
-
- public static void main(String[] args) throws IOException
- {
- File folder = new File(args.length == 0 ? "/develop/ws/cdo" : args[0]);
- recurse(folder);
-
- ignore("base.BaseClass", 1);
- ignore("base.BaseFactory", 1);
- ignore("base.BasePackage", 2);
- ignore("base.impl.BaseClassImpl", 1);
- ignore("base.impl.BaseFactoryImpl", 2);
- ignore("base.impl.BasePackageImpl", 3);
- ignore("base.util.BaseAdapterFactory", 3);
- ignore("base.util.BaseSwitch", 3);
- ignore("derived.DerivedClass", 1);
- ignore("derived.DerivedFactory", 1);
- ignore("derived.DerivedPackage", 2);
- ignore("derived.impl.DerivedClassImpl", 1);
- ignore("derived.impl.DerivedFactoryImpl", 2);
- ignore("derived.impl.DerivedPackageImpl", 3);
- ignore("derived.util.DerivedAdapterFactory", 3);
- ignore("derived.util.DerivedSwitch", 4);
- ignore("interface_.IInterface", 1);
- ignore("interface_.InterfaceFactory", 1);
- ignore("interface_.InterfacePackage", 2);
- ignore("interface_.impl.InterfaceFactoryImpl", 2);
- ignore("interface_.impl.InterfacePackageImpl", 3);
- ignore("interface_.util.InterfaceAdapterFactory", 3);
- ignore("interface_.util.InterfaceSwitch", 3);
- ignore("org.eclipse.emf.cdo.common.CDOFetchRule", 1);
- ignore("org.eclipse.emf.cdo.common.model.CDOPackageInfo", 1);
- ignore("org.eclipse.emf.cdo.defs.CDOAuditDef", 1);
- ignore("org.eclipse.emf.cdo.defs.CDODefsFactory", 1);
- ignore("org.eclipse.emf.cdo.defs.CDODefsPackage", 2);
- ignore("org.eclipse.emf.cdo.defs.CDOPackageRegistryDef", 1);
- ignore("org.eclipse.emf.cdo.defs.CDOResourceDef", 1);
- ignore("org.eclipse.emf.cdo.defs.CDOSessionDef", 1);
- ignore("org.eclipse.emf.cdo.defs.CDOTransactionDef", 2);
- ignore("org.eclipse.emf.cdo.defs.CDOViewDef", 1);
- ignore("org.eclipse.emf.cdo.defs.EDynamicPackageDef", 1);
- ignore("org.eclipse.emf.cdo.defs.EPackageDef", 1);
- ignore("org.eclipse.emf.cdo.defs.FailOverStrategyDef", 1);
- ignore("org.eclipse.emf.cdo.defs.ResourceMode", 4);
- ignore("org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef", 1);
- ignore("org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl", 5);
- ignore("org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl", 1);
- ignore("org.eclipse.emf.cdo.defs.impl.CDODefsFactoryImpl", 2);
- ignore("org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl", 1);
- ignore("org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl", 1);
- ignore("org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl", 9);
- ignore("org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl", 8);
- ignore("org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl", 10);
- ignore("org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl", 2);
- ignore("org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl", 5);
- ignore("org.eclipse.emf.cdo.defs.impl.EPackageDefImpl", 5);
- ignore("org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl", 6);
- ignore("org.eclipse.emf.cdo.defs.util.CDODefsAdapterFactory", 3);
- ignore("org.eclipse.emf.cdo.defs.util.CDODefsSwitch", 2);
- ignore("org.eclipse.emf.cdo.defs.util.CDODefsUtil", 3);
- ignore("org.eclipse.emf.cdo.emodel.CDOAnnotation", 1);
- ignore("org.eclipse.emf.cdo.emodel.CDOModelElement", 1);
- ignore("org.eclipse.emf.cdo.emodel.CDONamedElement", 1);
- ignore("org.eclipse.emf.cdo.emodel.EmodelFactory", 1);
- ignore("org.eclipse.emf.cdo.emodel.EmodelPackage", 2);
- ignore("org.eclipse.emf.cdo.emodel.impl.CDOAnnotationImpl", 1);
- ignore("org.eclipse.emf.cdo.emodel.impl.CDOModelElementImpl", 1);
- ignore("org.eclipse.emf.cdo.emodel.impl.CDONamedElementImpl", 1);
- ignore("org.eclipse.emf.cdo.emodel.impl.EmodelFactoryImpl", 2);
- ignore("org.eclipse.emf.cdo.emodel.impl.EmodelPackageImpl", 2);
- ignore("org.eclipse.emf.cdo.emodel.provider.CDOAnnotationItemProvider", 4);
- ignore("org.eclipse.emf.cdo.emodel.provider.CDOModelElementItemProvider", 5);
- ignore("org.eclipse.emf.cdo.emodel.provider.CDONamedElementItemProvider", 3);
- ignore("org.eclipse.emf.cdo.emodel.provider.EmodelEditPlugin", 1);
- ignore("org.eclipse.emf.cdo.emodel.provider.EmodelItemProviderAdapterFactory", 1);
- ignore("org.eclipse.emf.cdo.emodel.util.EmodelAdapterFactory", 3);
- ignore("org.eclipse.emf.cdo.emodel.util.EmodelSwitch", 2);
- ignore("org.eclipse.emf.cdo.eresource.CDOResource", 1);
- ignore("org.eclipse.emf.cdo.eresource.CDOResourceFolder", 1);
- ignore("org.eclipse.emf.cdo.eresource.CDOResourceNode", 1);
- ignore("org.eclipse.emf.cdo.eresource.EresourceFactory", 1);
- ignore("org.eclipse.emf.cdo.eresource.EresourcePackage", 2);
- ignore("org.eclipse.emf.cdo.eresource.impl.EresourceFactoryImpl", 2);
- ignore("org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl", 3);
- ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceFolderItemProvider", 5);
- ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceItemProvider", 4);
- ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceNodeItemProvider", 3);
- ignore("org.eclipse.emf.cdo.eresource.provider.EresourceEditPlugin", 1);
- ignore("org.eclipse.emf.cdo.eresource.provider.EresourceItemProviderAdapterFactory", 2);
- ignore("org.eclipse.emf.cdo.eresource.util.EresourceAdapterFactory", 3);
- ignore("org.eclipse.emf.cdo.eresource.util.EresourceSwitch", 7);
- ignore("org.eclipse.emf.cdo.internal.common.model.CDOTypeImpl", 2);
- ignore("org.eclipse.emf.cdo.internal.common.revision.delta.CDORevisionDeltaImpl", 1);
- ignore("org.eclipse.emf.cdo.internal.server.protocol.CommitTransactionPhase1Indication", 1);
- ignore("org.eclipse.emf.cdo.internal.ui.dialogs.RollbackTransactionDialog", 1);
- ignore("org.eclipse.emf.cdo.internal.ui.editor.CDOEditor", 13);
- ignore("org.eclipse.emf.cdo.internal.ui.editor.PluginDelegator", 1);
- ignore("org.eclipse.emf.cdo.internal.ui.filters.CDOObjectFilter", 1);
- ignore("org.eclipse.emf.cdo.server.ITransaction", 1);
- ignore("org.eclipse.emf.cdo.server.db.mapping.IClassMapping", 1);
- ignore("org.eclipse.emf.cdo.server.db.mapping.IClassMappingAuditSupport", 1);
- ignore("org.eclipse.emf.cdo.server.db.mapping.ITypeMapping", 1);
- ignore("org.eclipse.emf.cdo.server.file.FileStoreAccessor", 1);
- ignore("org.eclipse.emf.cdo.server.internal.db.DBStore", 1);
- ignore("org.eclipse.emf.cdo.server.internal.db.mapping.AbstractMappingStrategy", 1);
- ignore("org.eclipse.emf.cdo.server.internal.db.mapping.horizontal.HorizontalNonAuditClassMapping", 1);
- ignore("org.eclipse.emf.cdo.server.internal.db.mapping.horizontal.NonAuditListTableMapping", 2);
- ignore("org.eclipse.emf.cdo.server.internal.db.mapping.horizontal.ObjectTypeCache", 1);
- ignore("org.eclipse.emf.cdo.server.internal.hibernate.HibernateEPackage", 1);
- ignore("org.eclipse.emf.cdo.server.internal.hibernate.HibernateStoreAccessor", 1);
- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOContainerIDGetter", 1);
- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOContainerIDSetter", 1);
- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOContainingFeatureIDGetter", 1);
- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOContainingFeatureNameGetter", 1);
- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOResourceIDGetter", 1);
- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOResourceIDSetter", 1);
- ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.WrappedHibernateList", 1);
- ignore("org.eclipse.emf.cdo.session.CDOSessionInvalidationEvent", 1);
- ignore("org.eclipse.emf.cdo.tests.AttributeTest", 2);
- ignore("org.eclipse.emf.cdo.tests.ChangeSubscriptionTest", 6);
- ignore("org.eclipse.emf.cdo.tests.ChunkingTest", 1);
- ignore("org.eclipse.emf.cdo.tests.ComplexTest", 2);
- ignore("org.eclipse.emf.cdo.tests.ConflictResolverTest", 1);
- ignore("org.eclipse.emf.cdo.tests.ContainmentTest", 2);
- ignore("org.eclipse.emf.cdo.tests.ExternalReferenceTest", 1);
- ignore("org.eclipse.emf.cdo.tests.FetchRuleAnalyzerTest", 1);
- ignore("org.eclipse.emf.cdo.tests.InvalidationTest", 1);
- ignore("org.eclipse.emf.cdo.tests.LockingManagerTest", 1);
- ignore("org.eclipse.emf.cdo.tests.ResourceTest", 1);
- ignore("org.eclipse.emf.cdo.tests.RevisionHolderTest", 1);
- ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_250910_Test", 2);
- ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251263_Test", 1);
- ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251544_Test", 1);
- ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_256141_Test", 1);
- ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_258850_Test", 1);
- ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_259695_Test", 1);
- ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_260756_Test", 1);
- ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_260764_Test", 2);
- ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_261218_Test", 1);
- ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_265114_Test", 2);
- ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_273233_Test", 1);
- ignore("org.eclipse.emf.cdo.tests.db.verifier.DBStoreVerifier", 1);
- ignore("org.eclipse.emf.cdo.tests.defs.CDOViewDefImplTest", 1);
- ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesFactoryImpl", 2);
- ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl", 3);
- ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesFactory", 1);
- ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage", 2);
- ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.util.model4interfacesAdapterFactory", 3);
- ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.util.model4interfacesSwitch", 16);
- ignore("org.eclipse.emf.cdo.tests.mango.MangoFactory", 1);
- ignore("org.eclipse.emf.cdo.tests.mango.MangoPackage", 2);
- ignore("org.eclipse.emf.cdo.tests.mango.Parameter", 1);
- ignore("org.eclipse.emf.cdo.tests.mango.ParameterPassing", 4);
- ignore("org.eclipse.emf.cdo.tests.mango.Value", 1);
- ignore("org.eclipse.emf.cdo.tests.mango.ValueList", 1);
- ignore("org.eclipse.emf.cdo.tests.mango.impl.MangoFactoryImpl", 2);
- ignore("org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.mango.impl.ValueImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.mango.provider.MangoEditPlugin", 1);
- ignore("org.eclipse.emf.cdo.tests.mango.provider.MangoItemProviderAdapterFactory", 1);
- ignore("org.eclipse.emf.cdo.tests.mango.provider.ParameterItemProvider", 3);
- ignore("org.eclipse.emf.cdo.tests.mango.provider.ValueItemProvider", 3);
- ignore("org.eclipse.emf.cdo.tests.mango.provider.ValueListItemProvider", 3);
- ignore("org.eclipse.emf.cdo.tests.mango.util.MangoAdapterFactory", 3);
- ignore("org.eclipse.emf.cdo.tests.mango.util.MangoSwitch", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.Address", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.Category", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.Company", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.Customer", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.Model1Factory", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.Model1Package", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.Order", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.OrderAddress", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.OrderDetail", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.Product1", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.PurchaseOrder", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.SalesOrder", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.Supplier", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.VAT", 4);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.CategoryCreateCommand", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.CustomerCreateCommand", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.OrderAddressCreateCommand", 4);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.OrderDetailCreateCommand", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.Product1CreateCommand", 4);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.PurchaseOrderCreateCommand", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.SalesOrderCreateCommand", 4);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.SupplierCreateCommand", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryEditPart", 18);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryNameEditPart", 19);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryProducts2EditPart", 5);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryProductsEditPart", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CompanyEditPart", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CustomerEditPart", 18);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CustomerNameEditPart", 19);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderAddressEditPart", 18);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderAddressNameEditPart", 19);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderDetailEditPart", 18);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderDetailPriceEditPart", 19);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderOrderDetails2EditPart", 5);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderOrderDetailsEditPart", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.Product1EditPart", 18);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.Product1NameEditPart", 19);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.PurchaseOrderDateEditPart", 19);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.PurchaseOrderEditPart", 18);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SalesOrderCustomerEditPart", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SalesOrderEditPart", 18);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SalesOrderIdEditPart", 19);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SupplierEditPart", 18);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SupplierNameEditPart", 19);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryCanonicalEditPolicy", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryItemSemanticEditPolicy", 6);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryProducts2ItemSemanticEditPolicy", 4);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryProductsItemSemanticEditPolicy", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CompanyItemSemanticEditPolicy", 17);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CustomerCanonicalEditPolicy", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CustomerItemSemanticEditPolicy", 6);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.Model1BaseItemSemanticEditPolicy", 30);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderAddressCanonicalEditPolicy", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderAddressItemSemanticEditPolicy", 8);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderDetailCanonicalEditPolicy", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderDetailItemSemanticEditPolicy", 8);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderOrderDetails2ItemSemanticEditPolicy", 4);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderOrderDetailsItemSemanticEditPolicy", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.Product1CanonicalEditPolicy", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.Product1ItemSemanticEditPolicy", 8);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.PurchaseOrderCanonicalEditPolicy", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.PurchaseOrderItemSemanticEditPolicy", 8);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SalesOrderCanonicalEditPolicy", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SalesOrderCustomerItemSemanticEditPolicy", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SalesOrderItemSemanticEditPolicy", 8);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SupplierCanonicalEditPolicy", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SupplierItemSemanticEditPolicy", 6);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1AbstractNavigatorItem", 5);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1DomainNavigatorContentProvider", 15);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1DomainNavigatorItem", 5);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1DomainNavigatorLabelProvider", 4);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorActionProvider", 9);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorContentProvider", 45);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorGroup", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorItem", 5);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorLabelProvider", 17);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorLinkHelper", 11);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorSorter", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramEditor", 16);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramEditorUtil", 19);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramUpdateCommand", 5);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramUpdater", 26);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DocumentProvider", 61);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DomainModelElementTester", 14);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1LinkDescriptor", 4);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1LoadResourceAction", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1MatchingStrategy", 4);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1NodeDescriptor", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1UriEditorInputTester", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1VisualIDRegistry", 40);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.ModelElementSelectionPage", 6);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.ElementInitializers", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.Model1ElementTypes", 13);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.Model1ParserProvider", 17);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.sheet.Model1PropertySection", 13);
- ignore("org.eclipse.emf.cdo.tests.model1.diagram.sheet.Model1SheetLabelProvider", 7);
- ignore("org.eclipse.emf.cdo.tests.model1.impl.AddressImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.impl.Model1FactoryImpl", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl", 5);
- ignore("org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.impl.OrderImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.impl.Product1Impl", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.provider.AddressItemProvider", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.provider.CategoryItemProvider", 4);
- ignore("org.eclipse.emf.cdo.tests.model1.provider.CompanyItemProvider", 5);
- ignore("org.eclipse.emf.cdo.tests.model1.provider.CustomerItemProvider", 2);
- ignore("org.eclipse.emf.cdo.tests.model1.provider.Model1EditPlugin", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.provider.Model1ItemProviderAdapterFactory", 1);
- ignore("org.eclipse.emf.cdo.tests.model1.provider.OrderAddressItemProvider", 4);
- ignore("org.eclipse.emf.cdo.tests.model1.provider.OrderDetailItemProvider", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.provider.OrderItemProvider", 5);
- ignore("org.eclipse.emf.cdo.tests.model1.provider.Product1ItemProvider", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.provider.PurchaseOrderItemProvider", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.provider.SalesOrderItemProvider", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.provider.SupplierItemProvider", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.util.Model1AdapterFactory", 3);
- ignore("org.eclipse.emf.cdo.tests.model1.util.Model1Switch", 2);
- ignore("org.eclipse.emf.cdo.tests.model2.Model2Factory", 1);
- ignore("org.eclipse.emf.cdo.tests.model2.Model2Package", 2);
- ignore("org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder", 1);
- ignore("org.eclipse.emf.cdo.tests.model2.Task", 1);
- ignore("org.eclipse.emf.cdo.tests.model2.TaskContainer", 1);
- ignore("org.eclipse.emf.cdo.tests.model2.impl.Model2FactoryImpl", 2);
- ignore("org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model2.impl.SpecialPurchaseOrderImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model2.impl.TaskContainerImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model2.impl.TaskImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model2.provider.Model2EditPlugin", 1);
- ignore("org.eclipse.emf.cdo.tests.model2.provider.Model2ItemProviderAdapterFactory", 2);
- ignore("org.eclipse.emf.cdo.tests.model2.provider.SpecialPurchaseOrderItemProvider", 5);
- ignore("org.eclipse.emf.cdo.tests.model2.provider.TaskContainerItemProvider", 5);
- ignore("org.eclipse.emf.cdo.tests.model2.provider.TaskItemProvider", 3);
- ignore("org.eclipse.emf.cdo.tests.model2.util.Model2AdapterFactory", 3);
- ignore("org.eclipse.emf.cdo.tests.model2.util.Model2Switch", 2);
- ignore("org.eclipse.emf.cdo.tests.model3.Class1", 1);
- ignore("org.eclipse.emf.cdo.tests.model3.MetaRef", 1);
- ignore("org.eclipse.emf.cdo.tests.model3.Model3Factory", 1);
- ignore("org.eclipse.emf.cdo.tests.model3.Model3Package", 2);
- ignore("org.eclipse.emf.cdo.tests.model3.impl.Class1Impl", 1);
- ignore("org.eclipse.emf.cdo.tests.model3.impl.MetaRefImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model3.impl.Model3FactoryImpl", 2);
- ignore("org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model3.subpackage.Class2", 1);
- ignore("org.eclipse.emf.cdo.tests.model3.subpackage.SubpackageFactory", 1);
- ignore("org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage", 2);
- ignore("org.eclipse.emf.cdo.tests.model3.subpackage.impl.Class2Impl", 1);
- ignore("org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackageFactoryImpl", 2);
- ignore("org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackagePackageImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model3.subpackage.util.SubpackageAdapterFactory", 3);
- ignore("org.eclipse.emf.cdo.tests.model3.subpackage.util.SubpackageSwitch", 2);
- ignore("org.eclipse.emf.cdo.tests.model3.util.Model3AdapterFactory", 3);
- ignore("org.eclipse.emf.cdo.tests.model3.util.Model3Switch", 2);
- ignore("org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.GenRefMultiContained", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.GenRefSingleContained", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.MultiContainedElement", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.RefMultiContained", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.RefMultiContainedNPL", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.RefMultiNonContained", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.RefSingleContained", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.RefSingleNonContained", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.SingleContainedElement", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.ContainedElementNoOppositeImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefMapNonContainedImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiContainedImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNUNonContainedImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNonContainedImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefSingleContainedImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefSingleNonContainedImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplContainedElementNPLImpl", 3);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainedElementImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerNPLImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainedElementImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerNPLImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainedElementImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerNPLImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainedElementImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerNPLImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.MultiContainedElementImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.MultiNonContainedElementImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.RefMultiContainedImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.RefMultiContainedNPLImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedNPLImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.RefSingleContainedImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.RefSingleContainedNPLImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.RefSingleNonContainedImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.RefSingleNonContainedNPLImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.SingleContainedElementImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.SingleNonContainedElementImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.StringToEObjectImpl", 2);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.model4FactoryImpl", 2);
- ignore("org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.model4Factory", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.model4Package", 2);
- ignore("org.eclipse.emf.cdo.tests.model4.util.model4AdapterFactory", 3);
- ignore("org.eclipse.emf.cdo.tests.model4.util.model4Switch", 2);
- ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplContainedElementNPLValidator", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplMultiRefContainerNPLValidator", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplMultiRefContainerValidator", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplMultiRefNonContainerNPLValidator", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplMultiRefNonContainerValidator", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplSingleRefContainerNPLValidator", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplSingleRefContainerValidator", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplSingleRefNonContainerNPLValidator", 1);
- ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplSingleRefNonContainerValidator", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.INamedElement", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesFactoryImpl", 2);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesFactory", 1);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage", 2);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.util.model4interfacesAdapterFactory", 3);
- ignore("org.eclipse.emf.cdo.tests.model4interfaces.util.model4interfacesSwitch", 2);
- ignore("org.eclipse.emf.cdo.tests.model5.GenListOfBoolean", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.GenListOfChar", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.GenListOfDate", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.GenListOfDouble", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.GenListOfFloat", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.GenListOfInt", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.GenListOfInteger", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.GenListOfLong", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.GenListOfShort", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.GenListOfString", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.Model5Factory", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.Model5Package", 2);
- ignore("org.eclipse.emf.cdo.tests.model5.TestFeatureMap", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.DoctorImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfBooleanImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfCharImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfDateImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfDoubleImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfFloatImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntegerImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfLongImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfShortImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfStringImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.ManagerImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.Model5FactoryImpl", 2);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.impl.TestFeatureMapImpl", 1);
- ignore("org.eclipse.emf.cdo.tests.model5.util.Model5AdapterFactory", 3);
- ignore("org.eclipse.emf.cdo.tests.model5.util.Model5Switch", 2);
- ignore("org.eclipse.emf.cdo.ui.defs.CDOEditorDef", 1);
- ignore("org.eclipse.emf.cdo.ui.defs.CDOUIDefsFactory", 1);
- ignore("org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage", 2);
- ignore("org.eclipse.emf.cdo.ui.defs.EditorDef", 1);
- ignore("org.eclipse.emf.cdo.ui.defs.impl.CDOEditorDefImpl", 9);
- ignore("org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsFactoryImpl", 2);
- ignore("org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsPackageImpl", 1);
- ignore("org.eclipse.emf.cdo.ui.defs.util.CDOUIDefsAdapterFactory", 3);
- ignore("org.eclipse.emf.cdo.ui.defs.util.CDOUIDefsSwitch", 2);
- ignore("org.eclipse.emf.cdo.ui.ide.RepositoryContentProvider", 1);
- ignore("org.eclipse.emf.internal.cdo.CDOObjectImpl", 2);
- ignore("org.eclipse.emf.internal.cdo.CDOObjectWrapper", 1);
- ignore("org.eclipse.emf.internal.cdo.net4j.protocol.CDOClientIndication", 1);
- ignore("org.eclipse.emf.internal.cdo.net4j.protocol.CommitTransactionRequest", 1);
- ignore("org.eclipse.emf.internal.cdo.net4j.protocol.RemoteSessionNotificationIndication", 1);
- ignore("org.eclipse.emf.internal.cdo.transaction.CDOXASavepointImpl", 1);
- ignore("org.eclipse.emf.internal.cdo.view.CDOViewImpl", 2);
- ignore("org.eclipse.emf.spi.cdo.CDOElementProxy", 1);
- ignore("org.eclipse.net4j.buddies.IBuddyCollaboration", 1);
- ignore("org.eclipse.net4j.defs.AcceptorDef", 1);
- ignore("org.eclipse.net4j.defs.BufferPoolDef", 2);
- ignore("org.eclipse.net4j.defs.BufferProviderDef", 2);
- ignore("org.eclipse.net4j.defs.ClientProtocolFactoryDef", 2);
- ignore("org.eclipse.net4j.defs.ConnectorDef", 1);
- ignore("org.eclipse.net4j.defs.HTTPConnectorDef", 1);
- ignore("org.eclipse.net4j.defs.JVMAcceptorDef", 1);
- ignore("org.eclipse.net4j.defs.JVMConnectorDef", 1);
- ignore("org.eclipse.net4j.defs.Net4jDefsFactory", 1);
- ignore("org.eclipse.net4j.defs.Net4jDefsPackage", 2);
- ignore("org.eclipse.net4j.defs.ProtocolProviderDef", 2);
- ignore("org.eclipse.net4j.defs.ServerProtocolFactoryDef", 2);
- ignore("org.eclipse.net4j.defs.TCPAcceptorDef", 1);
- ignore("org.eclipse.net4j.defs.TCPConnectorDef", 1);
- ignore("org.eclipse.net4j.defs.TCPSelectorDef", 2);
- ignore("org.eclipse.net4j.defs.impl.AcceptorDefImpl", 11);
- ignore("org.eclipse.net4j.defs.impl.BufferProviderDefImpl", 1);
- ignore("org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl", 1);
- ignore("org.eclipse.net4j.defs.impl.ConnectorDefImpl", 12);
- ignore("org.eclipse.net4j.defs.impl.JVMConnectorDefImpl", 5);
- ignore("org.eclipse.net4j.defs.impl.Net4jDefsFactoryImpl", 2);
- ignore("org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl", 1);
- ignore("org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl", 1);
- ignore("org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl", 1);
- ignore("org.eclipse.net4j.defs.util.Net4jDefsAdapterFactory", 3);
- ignore("org.eclipse.net4j.defs.util.Net4jDefsSwitch", 2);
- ignore("org.eclipse.net4j.internal.tcp.TCPAcceptorFactory", 1);
- ignore("org.eclipse.net4j.signal.Request", 1);
- ignore("org.eclipse.net4j.tests.defs.TCPConnectorDefImplTest", 1);
- ignore("org.eclipse.net4j.ui.defs.Net4JUIDefsFactory", 1);
- ignore("org.eclipse.net4j.ui.defs.Net4JUIDefsPackage", 2);
- ignore("org.eclipse.net4j.ui.defs.impl.Net4JUIDefsPackageImpl", 1);
- ignore("org.eclipse.net4j.ui.defs.util.Net4JUIDefsAdapterFactory", 3);
- ignore("org.eclipse.net4j.ui.defs.util.Net4JUIDefsSwitch", 2);
- ignore("org.eclipse.net4j.util.collection.MoveableArrayList", 1);
- ignore("org.eclipse.net4j.util.defs.ChallengeNegotiatorDef", 1);
- ignore("org.eclipse.net4j.util.defs.CredentialsProviderDef", 1);
- ignore("org.eclipse.net4j.util.defs.DefContainer", 1);
- ignore("org.eclipse.net4j.util.defs.DefException", 2);
- ignore("org.eclipse.net4j.util.defs.NegotiatorDef", 2);
- ignore("org.eclipse.net4j.util.defs.Net4jUtilDefsFactory", 1);
- ignore("org.eclipse.net4j.util.defs.Net4jUtilDefsPackage", 2);
- ignore("org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef", 1);
- ignore("org.eclipse.net4j.util.defs.RandomizerDef", 1);
- ignore("org.eclipse.net4j.util.defs.ResponseNegotiatorDef", 1);
- ignore("org.eclipse.net4j.util.defs.User", 1);
- ignore("org.eclipse.net4j.util.defs.UserManagerDef", 1);
- ignore("org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl", 8);
- ignore("org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl", 5);
- ignore("org.eclipse.net4j.util.defs.impl.DefContainerImpl", 8);
- ignore("org.eclipse.net4j.util.defs.impl.DefImpl", 6);
- ignore("org.eclipse.net4j.util.defs.impl.ExecutorServiceDefImpl", 1);
- ignore("org.eclipse.net4j.util.defs.impl.NegotiatorDefImpl", 1);
- ignore("org.eclipse.net4j.util.defs.impl.Net4jUtilDefsFactoryImpl", 2);
- ignore("org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl", 1);
- ignore("org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl", 6);
- ignore("org.eclipse.net4j.util.defs.impl.RandomizerDefImpl", 8);
- ignore("org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl", 6);
- ignore("org.eclipse.net4j.util.defs.impl.ThreadPoolDefImpl", 2);
- ignore("org.eclipse.net4j.util.defs.impl.UserImpl", 5);
- ignore("org.eclipse.net4j.util.defs.impl.UserManagerDefImpl", 7);
- ignore("org.eclipse.net4j.util.defs.util.Net4jUtilDefsAdapterFactory", 3);
- ignore("org.eclipse.net4j.util.defs.util.Net4jUtilDefsSwitch", 2);
- ignore("org.eclipse.net4j.util.om.trace.RemoteTraceServer", 1);
- ignore("org.eclipse.net4j.util.tests.defs.DefsFactory", 1);
- ignore("org.eclipse.net4j.util.tests.defs.DefsPackage", 2);
- ignore("org.eclipse.net4j.util.tests.defs.TestDef", 1);
- ignore("org.eclipse.net4j.util.tests.defs.TestDefsFactory", 1);
- ignore("org.eclipse.net4j.util.tests.defs.TestDefsPackage", 2);
- ignore("org.eclipse.net4j.util.tests.defs.impl.DefsFactoryImpl", 2);
- ignore("org.eclipse.net4j.util.tests.defs.impl.DefsPackageImpl", 3);
- ignore("org.eclipse.net4j.util.tests.defs.impl.TestDefImpl", 6);
- ignore("org.eclipse.net4j.util.tests.defs.impl.TestDefsFactoryImpl", 2);
- ignore("org.eclipse.net4j.util.tests.defs.impl.TestDefsPackageImpl", 3);
- ignore("org.eclipse.net4j.util.tests.defs.util.DefsAdapterFactory", 3);
- ignore("org.eclipse.net4j.util.tests.defs.util.DefsSwitch", 4);
- ignore("org.eclipse.net4j.util.tests.defs.util.TestDefsAdapterFactory", 3);
- ignore("org.eclipse.net4j.util.tests.defs.util.TestDefsSwitch", 4);
- ignore("org.eclipse.net4j.util.ui.views.ContainerItemProvider", 1);
- ignore("org.gastro.business.BusinessDay", 1);
- ignore("org.gastro.business.BusinessFactory", 1);
- ignore("org.gastro.business.BusinessPackage", 2);
- ignore("org.gastro.business.Order", 1);
- ignore("org.gastro.business.OrderDetail", 1);
- ignore("org.gastro.business.OrderState", 4);
- ignore("org.gastro.business.Waiter", 1);
- ignore("org.gastro.business.impl.BusinessDayImpl", 1);
- ignore("org.gastro.business.impl.BusinessFactoryImpl", 2);
- ignore("org.gastro.business.impl.BusinessPackageImpl", 1);
- ignore("org.gastro.business.impl.OrderImpl", 1);
- ignore("org.gastro.business.impl.WaiterImpl", 1);
- ignore("org.gastro.business.provider.BusinessDayItemProvider", 4);
- ignore("org.gastro.business.provider.BusinessEditPlugin", 1);
- ignore("org.gastro.business.provider.BusinessItemProviderAdapterFactory", 1);
- ignore("org.gastro.business.provider.OrderDetailItemProvider", 3);
- ignore("org.gastro.business.provider.OrderItemProvider", 4);
- ignore("org.gastro.business.provider.WaiterItemProvider", 3);
- ignore("org.gastro.business.util.BusinessAdapterFactory", 3);
- ignore("org.gastro.business.util.BusinessSwitch", 2);
- ignore("org.gastro.inventory.Department", 1);
- ignore("org.gastro.inventory.Employee", 1);
- ignore("org.gastro.inventory.Ingredient", 1);
- ignore("org.gastro.inventory.InventoryFactory", 1);
- ignore("org.gastro.inventory.InventoryPackage", 2);
- ignore("org.gastro.inventory.MenuCard", 1);
- ignore("org.gastro.inventory.Offering", 1);
- ignore("org.gastro.inventory.Recipe", 1);
- ignore("org.gastro.inventory.Restaurant", 1);
- ignore("org.gastro.inventory.Section", 1);
- ignore("org.gastro.inventory.Station", 1);
- ignore("org.gastro.inventory.Stock", 1);
- ignore("org.gastro.inventory.StockProduct", 1);
- ignore("org.gastro.inventory.Table", 1);
- ignore("org.gastro.inventory.impl.DepartmentImpl", 1);
- ignore("org.gastro.inventory.impl.EmployeeImpl", 1);
- ignore("org.gastro.inventory.impl.IngredientImpl", 1);
- ignore("org.gastro.inventory.impl.InventoryFactoryImpl", 2);
- ignore("org.gastro.inventory.impl.InventoryPackageImpl", 1);
- ignore("org.gastro.inventory.impl.MenuCardImpl", 1);
- ignore("org.gastro.inventory.impl.OfferingImpl", 1);
- ignore("org.gastro.inventory.impl.ProductImpl", 1);
- ignore("org.gastro.inventory.impl.RecipeImpl", 1);
- ignore("org.gastro.inventory.impl.RestaurantImpl", 1);
- ignore("org.gastro.inventory.impl.SectionImpl", 1);
- ignore("org.gastro.inventory.impl.StationImpl", 1);
- ignore("org.gastro.inventory.impl.StockImpl", 1);
- ignore("org.gastro.inventory.impl.StockProductImpl", 1);
- ignore("org.gastro.inventory.impl.TableImpl", 1);
- ignore("org.gastro.inventory.provider.DepartmentItemProvider", 5);
- ignore("org.gastro.inventory.provider.EmployeeItemProvider", 3);
- ignore("org.gastro.inventory.provider.IngredientItemProvider", 3);
- ignore("org.gastro.inventory.provider.InventoryEditPlugin", 1);
- ignore("org.gastro.inventory.provider.InventoryItemProviderAdapterFactory", 1);
- ignore("org.gastro.inventory.provider.MenuCardItemProvider", 4);
- ignore("org.gastro.inventory.provider.OfferingItemProvider", 3);
- ignore("org.gastro.inventory.provider.ProductItemProvider", 3);
- ignore("org.gastro.inventory.provider.RecipeItemProvider", 4);
- ignore("org.gastro.inventory.provider.RestaurantItemProvider", 4);
- ignore("org.gastro.inventory.provider.SectionItemProvider", 4);
- ignore("org.gastro.inventory.provider.StationItemProvider", 3);
- ignore("org.gastro.inventory.provider.StockItemProvider", 4);
- ignore("org.gastro.inventory.provider.StockProductItemProvider", 3);
- ignore("org.gastro.inventory.provider.TableItemProvider", 3);
- ignore("org.gastro.inventory.util.InventoryAdapterFactory", 3);
- ignore("org.gastro.inventory.util.InventorySwitch", 2);
- ignore("reference.Reference", 1);
- ignore("reference.ReferenceFactory", 1);
- ignore("reference.ReferencePackage", 2);
- ignore("reference.impl.ReferenceFactoryImpl", 2);
- ignore("reference.impl.ReferenceImpl", 1);
- ignore("reference.impl.ReferencePackageImpl", 3);
- ignore("reference.util.ReferenceAdapterFactory", 3);
- ignore("reference.util.ReferenceSwitch", 3);
-
- report();
- }
-
- private static void recurse(File folder) throws IOException
- {
- for (File file : folder.listFiles())
- {
- String name = file.getName();
- if (file.isDirectory())
- {
- if (!name.startsWith("."))
- {
- if (new File(file, ".project").exists() && !new File(file, "copyright.txt").exists())
- {
- continue;
- }
-
- recurse(file);
- }
- }
- else
- {
- if (name.endsWith(".java"))
- {
- processJava(file);
- }
- }
- }
- }
-
- private static void processJava(File file) throws IOException
- {
- // System.out.println(file.getAbsolutePath());
- String name = file.getName();
- name = name.substring(0, name.length() - ".java".length());
-
- InputStream stream = new FileInputStream(file);
- BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
-
- try
- {
- String packageName = null;
- String last = "";
- String line;
- int i = 0;
- while ((line = reader.readLine()) != null)
- {
- ++i;
- if (packageName == null)
- {
- if (line.startsWith("package "))
- {
- packageName = line.substring("package ".length()); // Remove prefix "package "
- packageName = packageName.substring(0, packageName.length() - 1); // Remove suffix ";"
- packageName = packageName.trim();
- name = packageName + "." + name;
- continue;
- }
- }
-
- String type = type(line);
- if (last.equals("{"))
- {
- if (type.equals("empty"))
- {
- complain(name, i);
- }
- }
- else if (last.equals("}"))
- {
- if (!(type.equals("empty") || type.equals("}") || type.equals("stmt")))
- {
- complain(name, i);
- }
- }
- else if (last.equals("empty"))
- {
- if (type.equals("empty")||type.equals("}"))
- {
- complain(name, i);
- }
- }
-
- last = type;
- }
- }
- finally
- {
- stream.close();
- }
- }
-
- private static String type(String line)
- {
- line = line.trim();
- int i = line.indexOf("//");
- if (i != -1)
- {
- line = line.substring(0, i).trim();
- if (line.equals(""))
- {
- return "";
- }
- }
-
- if (line.equals(""))
- {
- return "empty";
- }
-
- if (line.equals("{"))
- {
- return "{";
- }
-
- if (line.startsWith("}"))
- {
- return "}";
- }
-
- if (line.equals("else") || line.equals("default") || line.startsWith("case ") || line.startsWith("else if (")
- || line.startsWith("catch (") || line.equals("finally"))
- {
- return "stmt";
- }
-
- return "";
- }
-
- private static void complain(String name, int i)
- {
- List<Integer> list = complaints.get(name);
- if (list == null)
- {
- list = new ArrayList<Integer>();
- complaints.put(name, list);
- }
-
- list.add(i);
- }
-
- private static void ignore(String name, int count)
- {
- List<Integer> list = complaints.get(name);
- int found = list == null ? 0 : list.size();
- if (found == count)
- {
- complaints.remove(name);
- }
- }
-
- private static void report()
- {
- if (complaints.isEmpty())
- {
- System.out.println("No violations found.");
- return;
- }
-
- List<Entry<String, List<Integer>>> list = new ArrayList<Entry<String, List<Integer>>>(complaints.entrySet());
- Collections.sort(list, new Comparator<Entry<String, List<Integer>>>()
- {
- public int compare(Entry<String, List<Integer>> o1, Entry<String, List<Integer>> o2)
- {
- return o1.getKey().compareTo(o2.getKey());
- }
- });
-
- for (Entry<String, List<Integer>> entry : list)
- {
- String name = entry.getKey();
- for (int i : entry.getValue())
- {
- int dot = name.lastIndexOf('.');
- String file = dot == -1 ? name : name.substring(dot + 1);
- System.err.println(name + ".$(" + file + ".java:" + i + ")");
- }
- }
-
- try
- {
- Thread.sleep(50);
- }
- catch (InterruptedException ex)
- {
- return;
- }
-
- System.out.println();
- System.out.println();
- System.out.println();
- for (Entry<String, List<Integer>> entry : list)
- {
- System.out.println("ignore(\"" + entry.getKey() + "\", " + entry.getValue().size() + ");");
- }
- }
-}

Back to the top