diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.ResolutionPreference.html')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.ResolutionPreference.html | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.ResolutionPreference.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.ResolutionPreference.html index a388501585..b2ced1770f 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.ResolutionPreference.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.ResolutionPreference.html @@ -109,7 +109,7 @@ </tr> <tr class="rowColor"> <td class="colFirst"><code>static <a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</a></code></td> -<td class="colLast"><span class="typeNameLabel">DefaultCDOMerger.ResolutionPreference.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html#valueOf-java.lang.String-">valueOf</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> name)</code> +<td class="colLast"><span class="typeNameLabel">DefaultCDOMerger.ResolutionPreference.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html#valueOf-java.lang.String-">valueOf</a></span>(java.lang.String name)</code> <div class="block">Returns the enum constant of this type with the specified name.</div> </td> </tr> @@ -139,8 +139,15 @@ the order they are declared.</div> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#DefaultCDOMerger-org.eclipse.emf.spi.cdo.DefaultCDOMerger.ResolutionPreference-">DefaultCDOMerger</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</a> resolutionPreference)</code> </td> </tr> <tr class="rowColor"> +<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#DefaultCDOMerger-org.eclipse.emf.spi.cdo.DefaultCDOMerger.ResolutionPreference-org.eclipse.emf.cdo.common.CDOCommonRepository.ListOrdering-">DefaultCDOMerger</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</a> resolutionPreference, + <a href="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.ListOrdering.html" title="enum in org.eclipse.emf.cdo.common">CDOCommonRepository.ListOrdering</a> listOrdering)</code> </td> +</tr> +<tr class="altColor"> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html#ManyValued-org.eclipse.emf.spi.cdo.DefaultCDOMerger.ResolutionPreference-">ManyValued</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</a> resolutionPreference)</code> </td> </tr> +<tr class="rowColor"> +<td class="colLast"><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> resolutionPreference)</code> </td> +</tr> <tr class="altColor"> <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html#PerFeature-org.eclipse.emf.spi.cdo.DefaultCDOMerger.ResolutionPreference-">PerFeature</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.ResolutionPreference</a> resolutionPreference)</code> </td> </tr> |