diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse')
3 files changed, 6 insertions, 21 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties index 7664ea2615..adfdafe53c 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/messages/messages.properties @@ -111,8 +111,6 @@ SessionPropertyTester_24=Store Type SessionPropertyTester_25=The type of the store that backs the repository of this session. SessionPropertyTester_26=Object ID Types SessionPropertyTester_27=The types of object IDs created by the store that backs the repository of this session. -SessionPropertyTester_28=Supporting Ecore -SessionPropertyTester_29=Whether the repository of this session is supporting Ecore instances. SessionPropertyTester_30=Ensure Referential Integrity SessionPropertyTester_31=Whether the repository of this session is ensuring referential integrity. SessionPropertyTester_32=ID Generation Location diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionProperties.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionProperties.java index a77b5a4805..a44794fd66 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionProperties.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/SessionProperties.java @@ -186,17 +186,6 @@ public class SessionProperties extends Properties<CDOSession> implements CDOComm } }); - add(new Property<CDOSession>("supportingEcore", Messages.getString("SessionPropertyTester_28"), // - Messages.getString("SessionPropertyTester_29"), //$NON-NLS-1$ - CATEGORY_REPOSITORY) - { - @Override - protected Object eval(CDOSession session) - { - return session.getRepositoryInfo().isSupportingEcore(); - } - }); - add(new Property<CDOSession>("serializeCommits", Messages.getString("SessionPropertyTester_38"), // Messages.getString("SessionPropertyTester_39"), //$NON-NLS-1$ CATEGORY_REPOSITORY) @@ -329,6 +318,7 @@ public class SessionProperties extends Properties<CDOSession> implements CDOComm throw new UnsupportedOperationException(); } + @Deprecated public boolean isSupportingEcore() { throw new UnsupportedOperationException(); 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 ee0d6a7147..2669431a9b 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 @@ -331,8 +331,6 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo private boolean repositorySupportingBranches; - private boolean repositorySupportingEcore; - private boolean repositorySerializingCommits; private boolean repositoryEnsuringReferentialIntegrity; @@ -347,9 +345,8 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo public OpenSessionResult(int sessionID, String userID, String repositoryUUID, CDOCommonRepository.Type repositoryType, CDOCommonRepository.State repositoryState, String storeType, Set<CDOID.ObjectType> objectIDTypes, long repositoryCreationTime, long lastUpdateTime, CDOID rootResourceID, - boolean repositorySupportingAudits, boolean repositorySupportingBranches, boolean repositorySupportingEcore, - boolean repositorySerializingCommits, boolean repositoryEnsuringReferentialIntegrity, - IDGenerationLocation repositoryIDGenerationLocation) + boolean repositorySupportingAudits, boolean repositorySupportingBranches, boolean repositorySerializingCommits, + boolean repositoryEnsuringReferentialIntegrity, IDGenerationLocation repositoryIDGenerationLocation) { this.sessionID = sessionID; this.userID = userID; @@ -363,7 +360,6 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo this.rootResourceID = rootResourceID; this.repositorySupportingAudits = repositorySupportingAudits; this.repositorySupportingBranches = repositorySupportingBranches; - this.repositorySupportingEcore = repositorySupportingEcore; this.repositorySerializingCommits = repositoryEnsuringReferentialIntegrity; this.repositoryEnsuringReferentialIntegrity = repositoryEnsuringReferentialIntegrity; this.repositoryIDGenerationLocation = repositoryIDGenerationLocation; @@ -446,11 +442,12 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo } /** - * @since 4.0 + * @deprecated As of 4.2 instances of Ecore are always supported (on demand). */ + @Deprecated public boolean isRepositorySupportingEcore() { - return repositorySupportingEcore; + return true; } /** |