Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html16
1 files changed, 11 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html
index 0feb76cff1..e3e20f6fa4 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html
@@ -208,13 +208,13 @@
</tr>
<tbody>
<tr class="altColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html#ConflictException-java.lang.String-org.eclipse.emf.cdo.transaction.CDOMerger-org.eclipse.emf.cdo.common.commit.CDOChangeSetData-">ConflictException</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;message,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html#ConflictException-java.lang.String-org.eclipse.emf.cdo.transaction.CDOMerger-org.eclipse.emf.cdo.common.commit.CDOChangeSetData-">ConflictException</a></span>(java.lang.String&nbsp;message,
<a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger,
<a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a>&nbsp;result)</code>&nbsp;</td>
</tr>
<tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html#ConflictException-java.lang.String-java.lang.Throwable-org.eclipse.emf.cdo.transaction.CDOMerger-org.eclipse.emf.cdo.common.commit.CDOChangeSetData-">ConflictException</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;message,
- <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Throwable.html?is-external=true" title="class or interface in java.lang">Throwable</a>&nbsp;cause,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html#ConflictException-java.lang.String-java.lang.Throwable-org.eclipse.emf.cdo.transaction.CDOMerger-org.eclipse.emf.cdo.common.commit.CDOChangeSetData-">ConflictException</a></span>(java.lang.String&nbsp;message,
+ java.lang.Throwable&nbsp;cause,
<a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger,
<a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSetData</a>&nbsp;result)</code>&nbsp;</td>
</tr>
@@ -235,12 +235,12 @@
<tr class="altColor">
<td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOWorkspace.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/workspace/CDOWorkspace.html#merge-org.eclipse.emf.cdo.transaction.CDOMerger-java.lang.String-">merge</a></span>(<a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger,
- <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;branchPath)</code>&nbsp;</td>
+ java.lang.String&nbsp;branchPath)</code>&nbsp;</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</a></code></td>
<td class="colLast"><span class="typeNameLabel">CDOWorkspace.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/workspace/CDOWorkspace.html#merge-org.eclipse.emf.cdo.transaction.CDOMerger-java.lang.String-long-">merge</a></span>(<a href="../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a>&nbsp;merger,
- <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;branchPath,
+ java.lang.String&nbsp;branchPath,
long&nbsp;timeStamp)</code>&nbsp;</td>
</tr>
<tr class="altColor">
@@ -279,6 +279,12 @@
<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">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValuedOld</a></span></code>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+</td>
+</tr>
</tbody>
</table>
<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">

Back to the top