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/DefaultCDOMerger.PerFeature.ManyValuedOld.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html423
1 files changed, 423 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html
new file mode 100644
index 0000000000..9f476abc51
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html
@@ -0,0 +1,423 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+
+<title>DefaultCDOMerger.PerFeature.ManyValuedOld (CDO Model Repository Documentation)</title>
+<meta name="date" content="">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="DefaultCDOMerger.PerFeature.ManyValuedOld (CDO Model Repository Documentation)";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var methods = {"i0":10,"i1":9,"i2":10};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.html">Use</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html" title="class in org.eclipse.emf.spi.cdo"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Element.html" title="class in org.eclipse.emf.spi.cdo"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html" target="_top">Frames</a></li>
+<li><a href="DefaultCDOMerger.PerFeature.ManyValuedOld.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.eclipse.emf.spi.cdo</div>
+<h2 title="Class DefaultCDOMerger.PerFeature.ManyValuedOld" class="title">Class DefaultCDOMerger.PerFeature.ManyValuedOld</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html" title="class in org.eclipse.emf.spi.cdo">org.eclipse.emf.spi.cdo.DefaultCDOMerger</a></li>
+<li>
+<ul class="inheritance">
+<li><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html" title="class in org.eclipse.emf.spi.cdo">org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature</a></li>
+<li>
+<ul class="inheritance">
+<li>org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a></dd>
+</dl>
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature</a></dd>
+</dl>
+<hr>
+<br>
+<pre>public static class <span class="typeNameLabel">DefaultCDOMerger.PerFeature.ManyValuedOld</span>
+extends <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature</a></pre>
+<div class="block">If the meaning of this type isn't clear, there really should be more of a description here...</div>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.6</dd>
+<dt><span class="simpleTagLabel">Author:</span></dt>
+<dd>Eike Stepper</dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="nested.class.summary">
+<!-- -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Class and Description</th>
+</tr>
+<tr class="altColor">
+<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.Element.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValuedOld.Element</a></span></code>
+<div class="block">A virtual list element to establish unique relations between ancestor, source and target sides.</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.PerSide.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide</a>&lt;<a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html" title="type parameter in DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide">T</a>&gt;</span></code>
+<div class="block">Holds data for the source and target sides.</div>
+</td>
+</tr>
+<tr class="altColor">
+<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.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValuedOld.Side</a></span></code>
+<div class="block">Enumerates the possible sides of a merge, i.e., <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html#SOURCE"><code>DefaultCDOMerger.PerFeature.ManyValuedOld.Side.SOURCE</code></a> and <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html#TARGET"><code>DefaultCDOMerger.PerFeature.ManyValuedOld.Side.TARGET</code></a>.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature">
+<!-- -->
+</a>
+<h3>Nested classes/interfaces inherited from class&nbsp;org.eclipse.emf.spi.cdo.<a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature</a></h3>
+<code><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValuedOld</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.org.eclipse.emf.spi.cdo.DefaultCDOMerger">
+<!-- -->
+</a>
+<h3>Nested classes/interfaces inherited from class&nbsp;org.eclipse.emf.spi.cdo.<a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger</a></h3>
+<code><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInSourceAndTargetConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInSourceAndTargetConflict</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.Conflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.Conflict</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="nested.classes.inherited.from.class.org.eclipse.emf.cdo.transaction.CDOMerger">
+<!-- -->
+</a>
+<h3>Nested classes/interfaces inherited from interface&nbsp;org.eclipse.emf.cdo.transaction.<a href="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</a></h3>
+<code><a href="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html" title="class in org.eclipse.emf.cdo.transaction">CDOMerger.ConflictException</a></code></li>
+</ul>
+</li>
+</ul>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Constructor and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html#ManyValuedOld--">ManyValuedOld</a></span>()</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html#ManyValuedOld-org.eclipse.emf.spi.cdo.DefaultCDOMerger.ResolutionPreference-">ManyValuedOld</a></span>(<a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</a>&nbsp;resolutionPreference)</code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>protected <a href="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html#changedInSourceAndTargetManyValued-org.eclipse.emf.ecore.EStructuralFeature-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">changedInSourceAndTargetManyValued</a></span>(<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EStructuralFeature</a>&nbsp;feature,
+ <a href="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</a>&nbsp;targetFeatureDelta,
+ <a href="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</a>&nbsp;sourceFeatureDelta)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>protected static <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValuedOld.Side</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html#other-org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.Side-">other</a></span>(<a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValuedOld.Side</a>&nbsp;side)</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>protected boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html#treatAsUnique-org.eclipse.emf.ecore.EStructuralFeature-">treatAsUnique</a></span>(<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EStructuralFeature</a>&nbsp;feature)</code>&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature">
+<!-- -->
+</a>
+<h3>Methods inherited from class&nbsp;org.eclipse.emf.spi.cdo.<a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature</a></h3>
+<code><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html#changedInSource-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">changedInSource</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html#changedInSourceAndTarget-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">changedInSourceAndTarget</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html#changedInSourceAndTarget-org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta-org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta-">changedInSourceAndTarget</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html#changedInSourceAndTargetSingleValued-org.eclipse.emf.ecore.EStructuralFeature-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">changedInSourceAndTargetSingleValued</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html#changedInTarget-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">changedInTarget</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.eclipse.emf.spi.cdo.DefaultCDOMerger">
+<!-- -->
+</a>
+<h3>Methods inherited from class&nbsp;org.eclipse.emf.spi.cdo.<a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger</a></h3>
+<code><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#addedInSource-org.eclipse.emf.cdo.common.revision.CDORevision-">addedInSource</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#addedInSourceAndTarget-org.eclipse.emf.cdo.common.revision.CDORevision-org.eclipse.emf.cdo.common.revision.CDORevision-">addedInSourceAndTarget</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#addedInTarget-org.eclipse.emf.cdo.common.revision.CDORevision-">addedInTarget</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#changedInSource-org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta-">changedInSource</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#changedInSourceAndDetachedInTarget-org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta-">changedInSourceAndDetachedInTarget</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#changedInTarget-org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta-">changedInTarget</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#changedInTargetAndDetachedInSource-org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta-">changedInTargetAndDetachedInSource</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#detachedInSource-org.eclipse.emf.cdo.common.id.CDOID-">detachedInSource</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#detachedInSourceAndTarget-org.eclipse.emf.cdo.common.id.CDOID-">detachedInSourceAndTarget</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#detachedInTarget-org.eclipse.emf.cdo.common.id.CDOID-">detachedInTarget</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getConflicts--">getConflicts</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getListOrdering--">getListOrdering</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getResolutionPreference--">getResolutionPreference</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getResult--">getResult</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getSourceMap--">getSourceMap</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getTargetMap--">getTargetMap</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#merge-org.eclipse.emf.cdo.common.commit.CDOChangeSet-org.eclipse.emf.cdo.common.commit.CDOChangeSet-">merge</a>, <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#merge-java.lang.Object-java.lang.Object-">merge</a></code></li>
+</ul>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class&nbsp;java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<ul class="blockList">
+<li class="blockList"><a name="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a name="ManyValuedOld--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ManyValuedOld</h4>
+<pre>public&nbsp;ManyValuedOld()</pre>
+</li>
+</ul>
+<a name="ManyValuedOld-org.eclipse.emf.spi.cdo.DefaultCDOMerger.ResolutionPreference-">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ManyValuedOld</h4>
+<pre>public&nbsp;ManyValuedOld(<a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</a>&nbsp;resolutionPreference)</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.2</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a name="treatAsUnique-org.eclipse.emf.ecore.EStructuralFeature-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>treatAsUnique</h4>
+<pre>protected&nbsp;boolean&nbsp;treatAsUnique(<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EStructuralFeature</a>&nbsp;feature)</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.2</dd>
+</dl>
+</li>
+</ul>
+<a name="changedInSourceAndTargetManyValued-org.eclipse.emf.ecore.EStructuralFeature-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>changedInSourceAndTargetManyValued</h4>
+<pre>protected&nbsp;<a href="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</a>&nbsp;changedInSourceAndTargetManyValued(<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EStructuralFeature</a>&nbsp;feature,
+ <a href="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</a>&nbsp;targetFeatureDelta,
+ <a href="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDOFeatureDelta</a>&nbsp;sourceFeatureDelta)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html#changedInSourceAndTargetManyValued-org.eclipse.emf.ecore.EStructuralFeature-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta-">changedInSourceAndTargetManyValued</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature</a></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the result feature delta, or <code>null</code> to indicate an unresolved conflict.</dd>
+</dl>
+</li>
+</ul>
+<a name="other-org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.Side-">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>other</h4>
+<pre>protected static&nbsp;<a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValuedOld.Side</a>&nbsp;other(<a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValuedOld.Side</a>&nbsp;side)</pre>
+<dl>
+<dt><span class="simpleTagLabel">Since:</span></dt>
+<dd>4.2</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.html">Use</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html" title="class in org.eclipse.emf.spi.cdo"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Element.html" title="class in org.eclipse.emf.spi.cdo"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html" target="_top">Frames</a></li>
+<li><a href="DefaultCDOMerger.PerFeature.ManyValuedOld.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested.class.summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a name="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small><i class="copyright">Copyright (c) 2014 Eike Stepper (Berlin, Germany) and others.<br>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</i></small></p>
+</body>
+</html>

Back to the top