Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html44
1 files changed, 24 insertions, 20 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html
index c699e11dc0..fbbb87b025 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html
@@ -322,124 +322,128 @@
</td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.MergeDataResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.MergeDataResult</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.OpenSessionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.OpenSessionResult</a></td>
<td class="colLast">
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.RefreshSessionResult</a></td>
<td class="colLast">
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.RepositoryTimeResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.RepositoryTimeResult</a></td>
<td class="colLast">
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.UnlockObjectsResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.UnlockObjectsResult</a></td>
<td class="colLast">
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger</a></td>
<td class="colLast">
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict</a></td>
<td class="colLast">
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndTargetConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInSourceAndTargetConflict</a></td>
<td class="colLast">
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict</a></td>
<td class="colLast">
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.Conflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.Conflict</a></td>
<td class="colLast">
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature</a></td>
<td class="colLast">
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued</a></td>
<td class="colLast">
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Element.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Element</a></td>
<td class="colLast">
<div class="block">A virtual list element to establish unique relations between ancestor, source and target sides.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.PerSide</a>&lt;T&gt;</td>
<td class="colLast">
<div class="block">Holds data for the source and target sides.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/FSMUtil.html" title="class in org.eclipse.emf.spi.cdo">FSMUtil</a></td>
<td class="colLast">
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.CommitToken.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.CommitToken</a></td>
<td class="colLast">&nbsp;</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.InvalidationData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.InvalidationData</a></td>
<td class="colLast">
<div class="block">A data structure that holds all input values of <a href="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#invalidate-org.eclipse.emf.spi.cdo.InternalCDOSession.InvalidationData-"><code>InternalCDOSession#invalidate()</code></a>.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</a></td>
<td class="colLast">
<div class="block">A data structure that holds all input and output values of <a href="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#getMergeData-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-boolean-"><code>InternalCDOSession.getMergeData()</code></a>.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.ApplyChangeSetResult.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOTransaction.ApplyChangeSetResult</a></td>
<td class="colLast">
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.ViewAndState.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOView.ViewAndState</a></td>
<td class="colLast">
<div class="block">Optimizes the storage of <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html#cdoView--"><code>CDOObject.cdoView()</code></a> and <a href="../../../../../org/eclipse/emf/cdo/CDOObject.html#cdoState--"><code>CDOObject.cdoState()</code></a>.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.ViewInvalidationData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOView.ViewInvalidationData</a></td>
<td class="colLast">
<div class="block">A data structure that holds all input values of <a href="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#invalidate-org.eclipse.emf.spi.cdo.InternalCDOView.ViewInvalidationData-"><code>InternalCDOView#invalidate()</code></a>.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="../../../../../org/eclipse/emf/spi/cdo/InternalCDOXATransaction.InternalCDOXACommitContext.CDOXAState.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOXATransaction.InternalCDOXACommitContext.CDOXAState</a></td>
<td class="colLast">
<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>

Back to the top