Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-12-22 20:09:47 +0000
committerEike Stepper2010-12-22 20:09:47 +0000
commitbe25079fe43113bdfe2a9ce909eae34e299b4425 (patch)
tree68385fe5cac51a5c4feab97d449580dc0eb4ee97 /plugins/org.eclipse.emf.cdo.net4j
parentf8e8a62790ef12d45509652b08e9c40f3a653dea (diff)
downloadcdo-be25079fe43113bdfe2a9ce909eae34e299b4425.tar.gz
cdo-be25079fe43113bdfe2a9ce909eae34e299b4425.tar.xz
cdo-be25079fe43113bdfe2a9ce909eae34e299b4425.zip
[333076] Support Ecore instances
https://bugs.eclipse.org/bugs/show_bug.cgi?id=333076
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.net4j')
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/OpenSessionRequest.java8
2 files changed, 15 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java
index 73b806172c..92ab8e90c9 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java
@@ -147,6 +147,8 @@ public class CDONet4jSessionConfigurationImpl extends CDOSessionConfigurationImp
private boolean supportingBranches;
+ private boolean supportingEcore;
+
private boolean ensuringReferentialIntegrity;
private InternalCDOSession session;
@@ -164,6 +166,7 @@ public class CDONet4jSessionConfigurationImpl extends CDOSessionConfigurationImp
rootResourceID = result.getRootResourceID();
supportingAudits = result.isRepositorySupportingAudits();
supportingBranches = result.isRepositorySupportingBranches();
+ supportingEcore = result.isRepositorySupportingBranches();
ensuringReferentialIntegrity = result.isRepositoryEnsuringReferentialIntegrity();
this.session = session;
}
@@ -246,6 +249,11 @@ public class CDONet4jSessionConfigurationImpl extends CDOSessionConfigurationImp
return supportingBranches;
}
+ public boolean isSupportingEcore()
+ {
+ return supportingEcore;
+ }
+
public boolean isEnsuringReferentialIntegrity()
{
return ensuringReferentialIntegrity;
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/OpenSessionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/OpenSessionRequest.java
index d5f78a49e3..162bd339be 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/OpenSessionRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/OpenSessionRequest.java
@@ -163,6 +163,12 @@ public class OpenSessionRequest extends CDOTimeRequest<OpenSessionResult>
TRACER.format("Read repositorySupportingBranches: {0}", repositorySupportingBranches); //$NON-NLS-1$
}
+ boolean repositorySupportingEcore = in.readBoolean();
+ if (TRACER.isEnabled())
+ {
+ TRACER.format("Read repositorySupportingEcore: {0}", repositorySupportingEcore); //$NON-NLS-1$
+ }
+
boolean repositoryEnsuringReferentialIntegrity = in.readBoolean();
if (TRACER.isEnabled())
{
@@ -171,7 +177,7 @@ public class OpenSessionRequest extends CDOTimeRequest<OpenSessionResult>
result = new OpenSessionResult(sessionID, userID, repositoryUUID, repositoryType, repositoryState, storeType,
objectIDTypes, repositoryCreationTime, lastUpdateTime, rootResourceID, repositorySupportingAudits,
- repositorySupportingBranches, repositoryEnsuringReferentialIntegrity);
+ repositorySupportingBranches, repositorySupportingEcore, repositoryEnsuringReferentialIntegrity);
CDOPackageUnit[] packageUnits = in.readCDOPackageUnits(null);
for (int i = 0; i < packageUnits.length; i++)

Back to the top