true
if this mapping strategy supports the efficient lookup of object types,
- * false
otherwise.
- */
- public boolean hasEfficientTypeLookup();
-
public IDBStore getStore();
public void setStore(IDBStore store);
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
index 11cf8561c7..9955b8839b 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
@@ -109,11 +109,6 @@ public class DBStore extends Store implements IDBStore
return false;
}
- public boolean hasEfficientTypeLookup()
- {
- return mappingStrategy.hasEfficientTypeLookup();
- }
-
public DBStoreAccessor getReader(ISession session) throws DBException
{
return new DBStoreAccessor(this, session);
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
index 2b8b58d43e..8c6efa74fc 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
@@ -526,7 +526,7 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor
{
IRepository repository = getStore().getRepository();
IPackageManager packageManager = repository.getPackageManager();
- CDOClassRef type = repository.getTypeManager().getObjectType(this, id);
+ CDOClassRef type = readObjectType(id);
return (CDOClassImpl)type.resolve(packageManager);
}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java
index 1f111b6a2f..6c84241842 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java
@@ -32,11 +32,6 @@ public class HorizontalMappingStrategy extends MappingStrategy
return "horizontal";
}
- public boolean hasEfficientTypeLookup()
- {
- return false;
- }
-
@Override
protected IClassMapping createClassMapping(CDOClass cdoClass)
{
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMappingStrategy.java
index 1106778cff..4cf04d24b2 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMappingStrategy.java
@@ -33,11 +33,6 @@ public class VerticalMappingStrategy extends MappingStrategy
return "vertical";
}
- public boolean hasEfficientTypeLookup()
- {
- return true;
- }
-
public RootClassMapping getRootClassMapping()
{
if (rootClassMapping == null)
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStore.java
index 8e81a38aaa..b9f68cf4cd 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStore.java
@@ -94,11 +94,6 @@ public class MEMStore extends Store
return false;
}
- public boolean hasEfficientTypeLookup()
- {
- return true;
- }
-
public void repairAfterCrash()
{
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStore.java
index 361b449ef8..9e5ac1a078 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStore.java
@@ -35,11 +35,6 @@ public class NOOPStore extends Store
return false;
}
- public boolean hasEfficientTypeLookup()
- {
- return true;
- }
-
public void repairAfterCrash()
{
}
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 4463d40c1e..9644a6751d 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
@@ -39,8 +39,6 @@ public class Repository extends Container
- * The contract includes that store implementations with efficient type lookup support must also implement
- * {@link IStoreReader#readObjectType(org.eclipse.emf.cdo.protocol.CDOID) IStoreReader.readObjectType(CDOID)} in a way
- * that it performs similar to a HashMap
or TreeMap
.
- *
- * @return true
if this store supports the efficient lookup of object types, false
- * otherwise.
- */
- public boolean hasEfficientTypeLookup();
-
public boolean wasCrashed();
public void repairAfterCrash();
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITypeManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITypeManager.java
deleted file mode 100644
index 9e6c9d3b75..0000000000
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/ITypeManager.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * 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.server;
-
-import org.eclipse.emf.cdo.protocol.CDOID;
-import org.eclipse.emf.cdo.protocol.model.CDOClassRef;
-
-/**
- * @author Eike Stepper
- */
-public interface ITypeManager extends IRepositoryElement
-{
- public boolean isPersistent();
-
- public CDOClassRef getObjectType(IStoreReader storeReader, CDOID id);
-
- public void registerObjectType(CDOID id, CDOClassRef type);
-}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java
index e74217df77..7130c14b9b 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java
@@ -33,9 +33,6 @@ public class QueryObjectTypesRequest extends CDOClientRequest