diff options
| author | Eike Stepper | 2017-12-31 16:47:41 +0000 |
|---|---|---|
| committer | Eike Stepper | 2017-12-31 16:47:41 +0000 |
| commit | f51ad03ffde9e4b0ebb4967592266088e7bbe604 (patch) | |
| tree | 9dc40b47c06d89c9a64877bb8bcbae30d9053d23 /plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use | |
| parent | bf25a5213129a0dd477e4cac7012828abb2d6ef5 (diff) | |
| download | cdo-f51ad03ffde9e4b0ebb4967592266088e7bbe604.tar.gz cdo-f51ad03ffde9e4b0ebb4967592266088e7bbe604.tar.xz cdo-f51ad03ffde9e4b0ebb4967592266088e7bbe604.zip | |
[Releng] Regenerate the docs
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use')
18 files changed, 247 insertions, 105 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.CommitTransactionResult.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.CommitTransactionResult.html index 4ca1503493..89d4f39c23 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.CommitTransactionResult.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.CommitTransactionResult.html @@ -106,11 +106,11 @@ <tr class="altColor"> <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.CommitTransactionResult</a></code></td> <td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#commitDelegation-org.eclipse.emf.cdo.common.branch.CDOBranch-java.lang.String-java.lang.String-org.eclipse.emf.cdo.common.commit.CDOCommitData-java.util.Map-java.util.Collection-org.eclipse.net4j.util.om.monitor.OMMonitor-">commitDelegation</a></span>(<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a> branch, - <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> userID, - <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> comment, + java.lang.String userID, + java.lang.String comment, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitData</a> commitData, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EClass.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EClass</a>> detachedObjectTypes, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../../../org/eclipse/emf/cdo/common/lob/CDOLob.html" title="class in org.eclipse.emf.cdo.common.lob">CDOLob</a><?>> lobs, + java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EClass.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EClass</a>> detachedObjectTypes, + java.util.Collection<<a href="../../../../../../org/eclipse/emf/cdo/common/lob/CDOLob.html" title="class in org.eclipse.emf.cdo.common.lob">CDOLob</a><?>> lobs, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/OMMonitor.html?is-external=true" title="class or interface in org.eclipse.net4j.util.om.monitor">OMMonitor</a> monitor)</code> <div class="block"><span class="deprecatedLabel">Deprecated.</span> <div class="block"><span class="deprecationComment">Not called anymore. Use <code>#commitDelegation(InternalCDOCommitContext, OMMonitor)</code> instead.</span></div> @@ -130,11 +130,11 @@ <tr class="rowColor"> <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.CommitTransactionResult</a></code></td> <td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#commitTransaction-int-java.lang.String-boolean-org.eclipse.emf.cdo.common.id.CDOIDProvider-org.eclipse.emf.cdo.common.commit.CDOCommitData-java.util.Collection-org.eclipse.net4j.util.om.monitor.OMMonitor-">commitTransaction</a></span>(int transactionID, - <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> comment, + java.lang.String comment, boolean releaseLocks, <a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOIDProvider.html" title="interface in org.eclipse.emf.cdo.common.id">CDOIDProvider</a> idProvider, <a href="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitData.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitData</a> commitData, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../../../org/eclipse/emf/cdo/common/lob/CDOLob.html" title="class in org.eclipse.emf.cdo.common.lob">CDOLob</a><?>> lobs, + java.util.Collection<<a href="../../../../../../org/eclipse/emf/cdo/common/lob/CDOLob.html" title="class in org.eclipse.emf.cdo.common.lob">CDOLob</a><?>> lobs, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/OMMonitor.html?is-external=true" title="class or interface in org.eclipse.net4j.util.om.monitor">OMMonitor</a> monitor)</code> <div class="block"><span class="deprecatedLabel">Deprecated.</span> <div class="block"><span class="deprecationComment">Not called anymore. Use <code>#commitTransaction(InternalCDOCommitContext, OMMonitor)</code> instead.</span></div> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.LockObjectsResult.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.LockObjectsResult.html index 6bf26c6c02..03dfc980d9 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.LockObjectsResult.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.LockObjectsResult.html @@ -113,7 +113,7 @@ <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.LockObjectsResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.LockObjectsResult</a></code></td> <td class="colLast"><span class="typeNameLabel">InternalRepository.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/spi/server/InternalRepository.html#lock-org.eclipse.emf.cdo.spi.server.InternalView-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-java.util.List-boolean-long-">lock</a></span>(<a href="../../../../../../org/eclipse/emf/cdo/spi/server/InternalView.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalView</a> view, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a> type, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionKey.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionKey</a>> keys, + java.util.List<<a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionKey.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionKey</a>> keys, boolean recursive, long timeout)</code> </td> </tr> @@ -133,8 +133,8 @@ <tbody> <tr class="altColor"> <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.LockObjectsResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.LockObjectsResult</a></code></td> -<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#delegateLockObjects-java.lang.String-java.util.List-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-boolean-long-">delegateLockObjects</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> lockAreaID, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionKey.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionKey</a>> revisionKeys, +<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#delegateLockObjects-java.lang.String-java.util.List-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-boolean-long-">delegateLockObjects</a></span>(java.lang.String lockAreaID, + java.util.List<<a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionKey.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionKey</a>> revisionKeys, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a> viewedBranch, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a> lockType, boolean recursive, @@ -142,7 +142,7 @@ </tr> <tr class="rowColor"> <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.LockObjectsResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.LockObjectsResult</a></code></td> -<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#lockObjects-java.util.List-int-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-long-">lockObjects</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>> viewedRevisions, +<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#lockObjects-java.util.List-int-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-long-">lockObjects</a></span>(java.util.List<<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>> viewedRevisions, int viewID, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a> viewedBranch, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a> lockType, @@ -154,7 +154,7 @@ </tr> <tr class="altColor"> <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.LockObjectsResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.LockObjectsResult</a></code></td> -<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#lockObjects2-java.util.List-int-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-boolean-long-">lockObjects2</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionKey.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionKey</a>> revisionKeys, +<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#lockObjects2-java.util.List-int-org.eclipse.emf.cdo.common.branch.CDOBranch-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-boolean-long-">lockObjects2</a></span>(java.util.List<<a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionKey.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionKey</a>> revisionKeys, int viewID, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a> viewedBranch, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a> lockType, diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.RefreshSessionResult.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.RefreshSessionResult.html index 660e706665..2def156aba 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.RefreshSessionResult.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.RefreshSessionResult.html @@ -105,13 +105,13 @@ <tbody> <tr class="altColor"> <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.RefreshSessionResult</a></code></td> -<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.RefreshSessionResult.Provider.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.Provider.html#getRefreshSessionResult-java.util.Map-java.util.Map-">getRefreshSessionResult</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a>>> views, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>>> viewedRevisions)</code> </td> +<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.RefreshSessionResult.Provider.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.Provider.html#getRefreshSessionResult-java.util.Map-java.util.Map-">getRefreshSessionResult</a></span>(java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,java.util.List<<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a>>> views, + java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>>> viewedRevisions)</code> </td> </tr> <tr class="rowColor"> <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.RefreshSessionResult</a></code></td> <td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#refresh-long-java.util.Map-int-boolean-">refresh</a></span>(long lastUpdateTime, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>>> viewedRevisions, + java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>>> viewedRevisions, int initialChunkSize, boolean enablePassiveUpdates)</code> </td> </tr> @@ -128,8 +128,8 @@ <td class="colFirst"><code>void</code></td> <td class="colLast"><span class="typeNameLabel">InternalCDOSession.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#processRefreshSessionResult-org.eclipse.emf.spi.cdo.CDOSessionProtocol.RefreshSessionResult-org.eclipse.emf.cdo.common.branch.CDOBranch-java.util.List-java.util.Map-">processRefreshSessionResult</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.RefreshSessionResult</a> result, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a> branch, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a>> branchViews, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>>> viewedRevisions)</code> </td> + java.util.List<<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a>> branchViews, + java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>>> viewedRevisions)</code> </td> </tr> </tbody> </table> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.UnlockObjectsResult.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.UnlockObjectsResult.html index f64633f908..c8df21aba5 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.UnlockObjectsResult.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/CDOSessionProtocol.UnlockObjectsResult.html @@ -113,7 +113,7 @@ <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.UnlockObjectsResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.UnlockObjectsResult</a></code></td> <td class="colLast"><span class="typeNameLabel">InternalRepository.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/spi/server/InternalRepository.html#unlock-org.eclipse.emf.cdo.spi.server.InternalView-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-java.util.List-boolean-">unlock</a></span>(<a href="../../../../../../org/eclipse/emf/cdo/spi/server/InternalView.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalView</a> view, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a> type, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>> ids, + java.util.List<<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>> ids, boolean recursive)</code> </td> </tr> </tbody> @@ -132,15 +132,15 @@ <tbody> <tr class="altColor"> <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.UnlockObjectsResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.UnlockObjectsResult</a></code></td> -<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#delegateUnlockObjects-java.lang.String-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-boolean-">delegateUnlockObjects</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> lockAreaID, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>> objectIDs, +<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#delegateUnlockObjects-java.lang.String-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-boolean-">delegateUnlockObjects</a></span>(java.lang.String lockAreaID, + java.util.Collection<<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>> objectIDs, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a> lockType, boolean recursive)</code> </td> </tr> <tr class="rowColor"> <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.UnlockObjectsResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.UnlockObjectsResult</a></code></td> <td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#unlockObjects2-org.eclipse.emf.cdo.view.CDOView-java.util.Collection-org.eclipse.net4j.util.concurrent.IRWLockManager.LockType-boolean-">unlockObjects2</a></span>(<a href="../../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</a> view, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>> objectIDs, + java.util.Collection<<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>> objectIDs, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/concurrent/IRWLockManager.LockType.html?is-external=true" title="class or interface in org.eclipse.net4j.util.concurrent">IRWLockManager.LockType</a> lockType, boolean recursive)</code> </td> </tr> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.Conflict.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.Conflict.html index 7acbd9218a..59e6decf51 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.Conflict.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.Conflict.html @@ -131,7 +131,7 @@ </tr> <tbody> <tr class="altColor"> -<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.Conflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.Conflict</a>></code></td> +<td class="colFirst"><code>java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.Conflict.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger.Conflict</a>></code></td> <td class="colLast"><span class="typeNameLabel">DefaultCDOMerger.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#getConflicts--">getConflicts</a></span>()</code> </td> </tr> </tbody> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.Element.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.Element.html new file mode 100644 index 0000000000..055e4940ca --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.Element.html @@ -0,0 +1,123 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<!-- NewPage --> +<html lang="en"> +<head> + +<title>Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.Element (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="Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.Element (CDO Model Repository Documentation)"; + } + } + catch(err) { + } +//--> +</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><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Element.html" title="class in org.eclipse.emf.spi.cdo">Class</a></li> +<li class="navBarCell1Rev">Use</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>Prev</li> +<li>Next</li> +</ul> +<ul class="navList"> +<li><a href="../../../../../../index.html?org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.Element.html" target="_top">Frames</a></li> +<li><a href="DefaultCDOMerger.PerFeature.ManyValuedOld.Element.html" target="_top">No Frames</a></li> +</ul> +<ul class="navList" id="allclasses_navbar_top"> +<li><a href="../../../../../../allclasses-noframe.html">All 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> +<a name="skip.navbar.top"> +<!-- --> +</a></div> +<!-- ========= END OF TOP NAVBAR ========= --> +<div class="header"> +<h2 title="Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.Element" class="title">Uses of Class<br>org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.Element</h2> +</div> +<div class="classUseContainer">No usage of org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.Element</div> +<!-- ======= 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><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Element.html" title="class in org.eclipse.emf.spi.cdo">Class</a></li> +<li class="navBarCell1Rev">Use</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>Prev</li> +<li>Next</li> +</ul> +<ul class="navList"> +<li><a href="../../../../../../index.html?org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.Element.html" target="_top">Frames</a></li> +<li><a href="DefaultCDOMerger.PerFeature.ManyValuedOld.Element.html" target="_top">No Frames</a></li> +</ul> +<ul class="navList" id="allclasses_navbar_bottom"> +<li><a href="../../../../../../allclasses-noframe.html">All 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> +<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> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html index 4312153177..9a79938394 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html @@ -3,7 +3,7 @@ <html lang="en"> <head> -<title>Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.PerSide (CDO Model Repository Documentation)</title> +<title>Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide (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> @@ -12,7 +12,7 @@ <script type="text/javascript"><!-- try { if (location.href.indexOf('is-external=true') == -1) { - parent.document.title="Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.PerSide (CDO Model Repository Documentation)"; + parent.document.title="Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide (CDO Model Repository Documentation)"; } } catch(err) { @@ -33,7 +33,7 @@ <ul class="navList" title="Navigation"> <li><a href="../../../../../../overview-summary.html">Overview</a></li> <li><a href="../package-summary.html">Package</a></li> -<li><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html" title="class in org.eclipse.emf.spi.cdo">Class</a></li> +<li><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html" title="class in org.eclipse.emf.spi.cdo">Class</a></li> <li class="navBarCell1Rev">Use</li> <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li> <li><a href="../../../../../../index-all.html">Index</a></li> @@ -46,8 +46,8 @@ <li>Next</li> </ul> <ul class="navList"> -<li><a href="../../../../../../index.html?org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html" target="_top">Frames</a></li> -<li><a href="DefaultCDOMerger.PerFeature.ManyValued.PerSide.html" target="_top">No Frames</a></li> +<li><a href="../../../../../../index.html?org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html" target="_top">Frames</a></li> +<li><a href="DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html" target="_top">No Frames</a></li> </ul> <ul class="navList" id="allclasses_navbar_top"> <li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li> @@ -69,13 +69,13 @@ </a></div> <!-- ========= END OF TOP NAVBAR ========= --> <div class="header"> -<h2 title="Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.PerSide" class="title">Uses of Class<br>org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.PerSide</h2> +<h2 title="Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide" class="title">Uses of Class<br>org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide</h2> </div> <div class="classUseContainer"> <ul class="blockList"> <li class="blockList"> <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation"> -<caption><span>Packages that use <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></span><span class="tabEnd"> </span></caption> +<caption><span>Packages that use <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></span><span class="tabEnd"> </span></caption> <tr> <th class="colFirst" scope="col">Package</th> <th class="colLast" scope="col">Description</th> @@ -95,9 +95,9 @@ <li class="blockList"><a name="org.eclipse.emf.spi.cdo"> <!-- --> </a> -<h3>Uses of <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> in <a href="../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a></h3> +<h3>Uses of <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> in <a href="../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a></h3> <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing subclasses, and an explanation"> -<caption><span>Subclasses of <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> in <a href="../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a></span><span class="tabEnd"> </span></caption> +<caption><span>Subclasses of <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> in <a href="../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a></span><span class="tabEnd"> </span></caption> <tr> <th class="colFirst" scope="col">Modifier and Type</th> <th class="colLast" scope="col">Class and Description</th> @@ -105,7 +105,7 @@ <tbody> <tr class="altColor"> <td class="colFirst"><code>static class </code></td> -<td class="colLast"><code><span class="memberNameLink"><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></span></code> +<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> @@ -127,7 +127,7 @@ <ul class="navList" title="Navigation"> <li><a href="../../../../../../overview-summary.html">Overview</a></li> <li><a href="../package-summary.html">Package</a></li> -<li><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html" title="class in org.eclipse.emf.spi.cdo">Class</a></li> +<li><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html" title="class in org.eclipse.emf.spi.cdo">Class</a></li> <li class="navBarCell1Rev">Use</li> <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li> <li><a href="../../../../../../index-all.html">Index</a></li> @@ -140,8 +140,8 @@ <li>Next</li> </ul> <ul class="navList"> -<li><a href="../../../../../../index.html?org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html" target="_top">Frames</a></li> -<li><a href="DefaultCDOMerger.PerFeature.ManyValued.PerSide.html" target="_top">No Frames</a></li> +<li><a href="../../../../../../index.html?org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html" target="_top">Frames</a></li> +<li><a href="DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html" target="_top">No Frames</a></li> </ul> <ul class="navList" id="allclasses_navbar_bottom"> <li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.Side.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html index c52c9d6568..a016e39ee3 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.Side.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html @@ -3,7 +3,7 @@ <html lang="en"> <head> -<title>Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Side (CDO Model Repository Documentation)</title> +<title>Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.Side (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> @@ -12,7 +12,7 @@ <script type="text/javascript"><!-- try { if (location.href.indexOf('is-external=true') == -1) { - parent.document.title="Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Side (CDO Model Repository Documentation)"; + parent.document.title="Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.Side (CDO Model Repository Documentation)"; } } catch(err) { @@ -33,7 +33,7 @@ <ul class="navList" title="Navigation"> <li><a href="../../../../../../overview-summary.html">Overview</a></li> <li><a href="../package-summary.html">Package</a></li> -<li><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">Class</a></li> +<li><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html" title="enum in org.eclipse.emf.spi.cdo">Class</a></li> <li class="navBarCell1Rev">Use</li> <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li> <li><a href="../../../../../../index-all.html">Index</a></li> @@ -46,8 +46,8 @@ <li>Next</li> </ul> <ul class="navList"> -<li><a href="../../../../../../index.html?org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.Side.html" target="_top">Frames</a></li> -<li><a href="DefaultCDOMerger.PerFeature.ManyValued.Side.html" target="_top">No Frames</a></li> +<li><a href="../../../../../../index.html?org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html" target="_top">Frames</a></li> +<li><a href="DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html" target="_top">No Frames</a></li> </ul> <ul class="navList" id="allclasses_navbar_top"> <li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li> @@ -69,13 +69,13 @@ </a></div> <!-- ========= END OF TOP NAVBAR ========= --> <div class="header"> -<h2 title="Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Side" class="title">Uses of Class<br>org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Side</h2> +<h2 title="Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.Side" class="title">Uses of Class<br>org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.Side</h2> </div> <div class="classUseContainer"> <ul class="blockList"> <li class="blockList"> <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation"> -<caption><span>Packages that use <a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</a></span><span class="tabEnd"> </span></caption> +<caption><span>Packages that use <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><span class="tabEnd"> </span></caption> <tr> <th class="colFirst" scope="col">Package</th> <th class="colLast" scope="col">Description</th> @@ -95,27 +95,27 @@ <li class="blockList"><a name="org.eclipse.emf.spi.cdo"> <!-- --> </a> -<h3>Uses of <a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</a> in <a href="../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a></h3> +<h3>Uses of <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> in <a href="../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a></h3> <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation"> -<caption><span>Methods in <a href="../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a> that return <a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</a></span><span class="tabEnd"> </span></caption> +<caption><span>Methods in <a href="../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a> that return <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><span class="tabEnd"> </span></caption> <tr> <th class="colFirst" scope="col">Modifier and Type</th> <th class="colLast" scope="col">Method and Description</th> </tr> <tbody> <tr class="altColor"> -<td class="colFirst"><code>protected static <a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</a></code></td> -<td class="colLast"><span class="typeNameLabel">DefaultCDOMerger.PerFeature.ManyValued.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html#other-org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Side-">other</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</a> side)</code> </td> +<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"><span class="typeNameLabel">DefaultCDOMerger.PerFeature.ManyValuedOld.</span><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> side)</code> </td> </tr> <tr class="rowColor"> -<td class="colFirst"><code>static <a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</a></code></td> -<td class="colLast"><span class="typeNameLabel">DefaultCDOMerger.PerFeature.ManyValued.Side.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.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="colFirst"><code>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"><span class="typeNameLabel">DefaultCDOMerger.PerFeature.ManyValuedOld.Side.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.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> <tr class="altColor"> -<td class="colFirst"><code>static <a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</a>[]</code></td> -<td class="colLast"><span class="typeNameLabel">DefaultCDOMerger.PerFeature.ManyValued.Side.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html#values--">values</a></span>()</code> +<td class="colFirst"><code>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"><span class="typeNameLabel">DefaultCDOMerger.PerFeature.ManyValuedOld.Side.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html#values--">values</a></span>()</code> <div class="block">Returns an array containing the constants of this enum type, in the order they are declared.</div> </td> @@ -123,24 +123,24 @@ the order they are declared.</div> </tbody> </table> <table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation"> -<caption><span>Methods in <a href="../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a> with parameters of type <a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</a></span><span class="tabEnd"> </span></caption> +<caption><span>Methods in <a href="../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</a> with parameters of type <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><span class="tabEnd"> </span></caption> <tr> <th class="colFirst" scope="col">Modifier and Type</th> <th class="colLast" scope="col">Method and Description</th> </tr> <tbody> <tr class="altColor"> -<td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html" title="type parameter in DefaultCDOMerger.PerFeature.ManyValued.PerSide">T</a></code></td> -<td class="colLast"><span class="typeNameLabel">DefaultCDOMerger.PerFeature.ManyValued.PerSide.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html#get-org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Side-">get</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</a> side)</code> </td> +<td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html" title="type parameter in DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide">T</a></code></td> +<td class="colLast"><span class="typeNameLabel">DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html#get-org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.Side-">get</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> side)</code> </td> </tr> <tr class="rowColor"> -<td class="colFirst"><code>protected static <a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</a></code></td> -<td class="colLast"><span class="typeNameLabel">DefaultCDOMerger.PerFeature.ManyValued.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.html#other-org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Side-">other</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</a> side)</code> </td> +<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"><span class="typeNameLabel">DefaultCDOMerger.PerFeature.ManyValuedOld.</span><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> side)</code> </td> </tr> <tr class="altColor"> <td class="colFirst"><code>void</code></td> -<td class="colLast"><span class="typeNameLabel">DefaultCDOMerger.PerFeature.ManyValued.PerSide.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html#set-org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Side-T-">set</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</a> side, - <a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html" title="type parameter in DefaultCDOMerger.PerFeature.ManyValued.PerSide">T</a> value)</code> </td> +<td class="colLast"><span class="typeNameLabel">DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html#set-org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld.Side-T-">set</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> side, + <a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html" title="type parameter in DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide">T</a> value)</code> </td> </tr> </tbody> </table> @@ -160,7 +160,7 @@ the order they are declared.</div> <ul class="navList" title="Navigation"> <li><a href="../../../../../../overview-summary.html">Overview</a></li> <li><a href="../package-summary.html">Package</a></li> -<li><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo">Class</a></li> +<li><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html" title="enum in org.eclipse.emf.spi.cdo">Class</a></li> <li class="navBarCell1Rev">Use</li> <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li> <li><a href="../../../../../../index-all.html">Index</a></li> @@ -173,8 +173,8 @@ the order they are declared.</div> <li>Next</li> </ul> <ul class="navList"> -<li><a href="../../../../../../index.html?org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.Side.html" target="_top">Frames</a></li> -<li><a href="DefaultCDOMerger.PerFeature.ManyValued.Side.html" target="_top">No Frames</a></li> +<li><a href="../../../../../../index.html?org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html" target="_top">Frames</a></li> +<li><a href="DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html" target="_top">No Frames</a></li> </ul> <ul class="navList" id="allclasses_navbar_bottom"> <li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.Element.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.html index f67d23e52e..f04f2b2daf 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.Element.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.html @@ -3,7 +3,7 @@ <html lang="en"> <head> -<title>Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Element (CDO Model Repository Documentation)</title> +<title>Uses of Class org.eclipse.emf.spi.cdo.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> @@ -12,7 +12,7 @@ <script type="text/javascript"><!-- try { if (location.href.indexOf('is-external=true') == -1) { - parent.document.title="Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Element (CDO Model Repository Documentation)"; + parent.document.title="Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld (CDO Model Repository Documentation)"; } } catch(err) { @@ -33,7 +33,7 @@ <ul class="navList" title="Navigation"> <li><a href="../../../../../../overview-summary.html">Overview</a></li> <li><a href="../package-summary.html">Package</a></li> -<li><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Element.html" title="class in org.eclipse.emf.spi.cdo">Class</a></li> +<li><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html" title="class in org.eclipse.emf.spi.cdo">Class</a></li> <li class="navBarCell1Rev">Use</li> <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li> <li><a href="../../../../../../index-all.html">Index</a></li> @@ -46,8 +46,8 @@ <li>Next</li> </ul> <ul class="navList"> -<li><a href="../../../../../../index.html?org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.Element.html" target="_top">Frames</a></li> -<li><a href="DefaultCDOMerger.PerFeature.ManyValued.Element.html" target="_top">No Frames</a></li> +<li><a href="../../../../../../index.html?org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.html" target="_top">Frames</a></li> +<li><a href="DefaultCDOMerger.PerFeature.ManyValuedOld.html" target="_top">No Frames</a></li> </ul> <ul class="navList" id="allclasses_navbar_top"> <li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li> @@ -69,9 +69,9 @@ </a></div> <!-- ========= END OF TOP NAVBAR ========= --> <div class="header"> -<h2 title="Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Element" class="title">Uses of Class<br>org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Element</h2> +<h2 title="Uses of Class org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld" class="title">Uses of Class<br>org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld</h2> </div> -<div class="classUseContainer">No usage of org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValued.Element</div> +<div class="classUseContainer">No usage of org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature.ManyValuedOld</div> <!-- ======= START OF BOTTOM NAVBAR ====== --> <div class="bottomNav"><a name="navbar.bottom"> <!-- --> @@ -83,7 +83,7 @@ <ul class="navList" title="Navigation"> <li><a href="../../../../../../overview-summary.html">Overview</a></li> <li><a href="../package-summary.html">Package</a></li> -<li><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Element.html" title="class in org.eclipse.emf.spi.cdo">Class</a></li> +<li><a href="../../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.html" title="class in org.eclipse.emf.spi.cdo">Class</a></li> <li class="navBarCell1Rev">Use</li> <li><a href="../../../../../../deprecated-list.html">Deprecated</a></li> <li><a href="../../../../../../index-all.html">Index</a></li> @@ -96,8 +96,8 @@ <li>Next</li> </ul> <ul class="navList"> -<li><a href="../../../../../../index.html?org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.Element.html" target="_top">Frames</a></li> -<li><a href="DefaultCDOMerger.PerFeature.ManyValued.Element.html" target="_top">No Frames</a></li> +<li><a href="../../../../../../index.html?org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.html" target="_top">Frames</a></li> +<li><a href="DefaultCDOMerger.PerFeature.ManyValuedOld.html" target="_top">No Frames</a></li> </ul> <ul class="navList" id="allclasses_navbar_bottom"> <li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.html index df6c2a223a..1998cb64e6 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.html @@ -109,6 +109,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 </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> </li> 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> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.html index fbd04749e6..937d784316 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.html @@ -115,6 +115,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="altColor"> +<td class="colFirst"><code>static class </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> </li> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOObject.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOObject.html index 9f7086409c..e7cd021fa4 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOObject.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOObject.html @@ -532,7 +532,7 @@ </tr> <tbody> <tr class="altColor"> -<td class="colFirst"><code>protected <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></code></td> +<td class="colFirst"><code>protected java.lang.String</code></td> <td class="colLast"><span class="typeNameLabel">CDOLabelDecorator.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/ui/CDOLabelDecorator.html#getObjectState-org.eclipse.emf.spi.cdo.InternalCDOObject-">getObjectState</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a> object)</code> </td> </tr> <tr class="rowColor"> @@ -582,7 +582,7 @@ <td class="colLast"><span class="typeNameLabel">CDOObjectImpl.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#instanceToRevisionFeature-org.eclipse.emf.spi.cdo.InternalCDOView-org.eclipse.emf.spi.cdo.InternalCDOObject-org.eclipse.emf.ecore.EStructuralFeature-java.lang.Object-">instanceToRevisionFeature</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a> view, <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a> object, <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> feature, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> setting)</code> </td> + java.lang.Object setting)</code> </td> </tr> <tr class="rowColor"> <td class="colFirst"><code>static void</code></td> @@ -606,7 +606,7 @@ <tbody> <tr class="altColor"> <td class="colFirst"><code>static <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a></code></td> -<td class="colLast"><span class="typeNameLabel">FSMUtil.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/FSMUtil.html#adapt-java.lang.Object-org.eclipse.emf.cdo.view.CDOView-">adapt</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> object, +<td class="colLast"><span class="typeNameLabel">FSMUtil.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/FSMUtil.html#adapt-java.lang.Object-org.eclipse.emf.cdo.view.CDOView-">adapt</a></span>(java.lang.Object object, <a href="../../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</a> view)</code> </td> </tr> <tr class="rowColor"> @@ -623,27 +623,27 @@ </tr> <tbody> <tr class="altColor"> -<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>,<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>></code></td> +<td class="colFirst"><code>java.util.Map<<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>,<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>></code></td> <td class="colLast"><span class="typeNameLabel">InternalCDOTransaction.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html#getCleanRevisions--">getCleanRevisions</a></span>()</code> </td> </tr> <tr class="rowColor"> -<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>></code></td> +<td class="colFirst"><code>java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>></code></td> <td class="colLast"><span class="typeNameLabel">InternalCDOView.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getObjects--">getObjects</a></span>()</code> <div class="block">Returns an unmodifiable map of the objects managed by this view.</div> </td> </tr> <tr class="altColor"> -<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>></code></td> +<td class="colFirst"><code>java.util.List<<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>></code></td> <td class="colLast"><span class="typeNameLabel">InternalCDOView.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getObjectsList--">getObjectsList</a></span>()</code> </td> </tr> <tr class="rowColor"> -<td class="colFirst"><code>static <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a><<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>></code></td> -<td class="colLast"><span class="typeNameLabel">FSMUtil.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/FSMUtil.html#iterator-java.util.Collection-org.eclipse.emf.spi.cdo.InternalCDOView-">iterator</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><?> instances, +<td class="colFirst"><code>static java.util.Iterator<<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>></code></td> +<td class="colLast"><span class="typeNameLabel">FSMUtil.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/FSMUtil.html#iterator-java.util.Collection-org.eclipse.emf.spi.cdo.InternalCDOView-">iterator</a></span>(java.util.Collection<?> instances, <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a> view)</code> </td> </tr> <tr class="altColor"> -<td class="colFirst"><code>static <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a><<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>></code></td> -<td class="colLast"><span class="typeNameLabel">FSMUtil.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/FSMUtil.html#iterator-java.util.Iterator-org.eclipse.emf.spi.cdo.InternalCDOView-">iterator</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a><?> delegate, +<td class="colFirst"><code>static java.util.Iterator<<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>></code></td> +<td class="colLast"><span class="typeNameLabel">FSMUtil.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/FSMUtil.html#iterator-java.util.Iterator-org.eclipse.emf.spi.cdo.InternalCDOView-">iterator</a></span>(java.util.Iterator<?> delegate, <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a> view)</code> </td> </tr> </tbody> @@ -656,10 +656,10 @@ </tr> <tbody> <tr class="altColor"> -<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td> +<td class="colFirst"><code>java.lang.Object</code></td> <td class="colLast"><span class="typeNameLabel">CDOStore.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOStore.html#convertToCDO-org.eclipse.emf.spi.cdo.InternalCDOObject-org.eclipse.emf.ecore.EStructuralFeature-java.lang.Object-">convertToCDO</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a> object, <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> feature, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> value)</code> </td> + java.lang.Object value)</code> </td> </tr> <tr class="rowColor"> <td class="colFirst"><code>void</code></td> @@ -737,9 +737,9 @@ <td class="colFirst"><code>void</code></td> <td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#switchTarget-int-org.eclipse.emf.cdo.common.branch.CDOBranchPoint-java.util.List-java.util.List-java.util.List-org.eclipse.net4j.util.om.monitor.OMMonitor-">switchTarget</a></span>(int viewID, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</a> branchPoint, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>> invalidObjects, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionKey.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionKey</a>> allChangedObjects, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDOIDAndVersion.html" title="interface in org.eclipse.emf.cdo.common.revision">CDOIDAndVersion</a>> allDetachedObjects, + java.util.List<<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>> invalidObjects, + java.util.List<<a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionKey.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionKey</a>> allChangedObjects, + java.util.List<<a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDOIDAndVersion.html" title="interface in org.eclipse.emf.cdo.common.revision">CDOIDAndVersion</a>> allDetachedObjects, <a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/OMMonitor.html?is-external=true" title="class or interface in org.eclipse.net4j.util.om.monitor">OMMonitor</a> monitor)</code> </td> </tr> </tbody> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDORemoteSession.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDORemoteSession.html index 05c7a8dae2..f2a600e7b0 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDORemoteSession.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDORemoteSession.html @@ -106,7 +106,7 @@ <tr class="altColor"> <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDORemoteSession.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDORemoteSession</a></code></td> <td class="colLast"><span class="typeNameLabel">InternalCDORemoteSessionManager.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDORemoteSessionManager.html#createRemoteSession-int-java.lang.String-boolean-">createRemoteSession</a></span>(int sessionID, - <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> userID, + java.lang.String userID, boolean subscribed)</code> </td> </tr> </tbody> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDORemoteSessionManager.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDORemoteSessionManager.html index 72ab97dd83..c7ed42d9a8 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDORemoteSessionManager.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDORemoteSessionManager.html @@ -121,7 +121,7 @@ </tr> <tbody> <tr class="altColor"> -<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSession.html" title="interface in org.eclipse.emf.cdo.session.remote">CDORemoteSession</a>></code></td> +<td class="colFirst"><code>java.util.List<<a href="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSession.html" title="interface in org.eclipse.emf.cdo.session.remote">CDORemoteSession</a>></code></td> <td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.html#getRemoteSessions-org.eclipse.emf.spi.cdo.InternalCDORemoteSessionManager-boolean-">getRemoteSessions</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDORemoteSessionManager.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDORemoteSessionManager</a> manager, boolean subscribe)</code> </td> </tr> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOSession.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOSession.html index 3fab6ad5c8..7dd1fcf2ad 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOSession.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOSession.html @@ -158,11 +158,11 @@ </tr> <tbody> <tr class="altColor"> -<td class="colFirst"><code>protected <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td> +<td class="colFirst"><code>protected java.lang.Object</code></td> <td class="colLast"><span class="typeNameLabel">CDOInteractiveExceptionHandler.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.html#processSession-org.eclipse.net4j.util.container.IManagedContainer-java.lang.String-java.lang.String-java.lang.String-org.eclipse.emf.spi.cdo.InternalCDOSession-">processSession</a></span>(<a href="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IManagedContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.container">IManagedContainer</a> container, - <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> productGroup, - <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> factoryType, - <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> description, + java.lang.String productGroup, + java.lang.String factoryType, + java.lang.String description, <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOSession</a> session)</code> </td> </tr> </tbody> @@ -213,9 +213,9 @@ <td class="colLast"><span class="typeNameLabel">InternalCDOView.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#setSession-org.eclipse.emf.spi.cdo.InternalCDOSession-">setSession</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOSession</a> session)</code> </td> </tr> <tr class="altColor"> -<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevision</a>,<a href="../../../../../../org/eclipse/emf/cdo/common/security/CDOPermission.html" title="enum in org.eclipse.emf.cdo.common.security">CDOPermission</a>></code></td> +<td class="colFirst"><code>java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevision</a>,<a href="../../../../../../org/eclipse/emf/cdo/common/security/CDOPermission.html" title="enum in org.eclipse.emf.cdo.common.security">CDOPermission</a>></code></td> <td class="colLast"><span class="typeNameLabel">CDOPermissionUpdater.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOPermissionUpdater.html#updatePermissions-org.eclipse.emf.spi.cdo.InternalCDOSession-java.util.Set-">updatePermissions</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOSession</a> session, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a><<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>> revisions)</code> </td> + java.util.Set<<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>> revisions)</code> </td> </tr> </tbody> </table> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOTransaction.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOTransaction.html index e9aa3c3319..2208e50a01 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOTransaction.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOTransaction.html @@ -129,7 +129,7 @@ </tr> <tbody> <tr class="altColor"> -<td class="colFirst"><code><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><org.eclipse.emf.cdo.internal.common.id.CDOIDTempObjectExternalImpl,<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</a>></code></td> +<td class="colFirst"><code>java.util.Map<org.eclipse.emf.cdo.internal.common.id.CDOIDTempObjectExternalImpl,<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</a>></code></td> <td class="colLast"><span class="typeNameLabel">InternalCDOXATransaction.InternalCDOXACommitContext.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOXATransaction.InternalCDOXACommitContext.html#getRequestedIDs--">getRequestedIDs</a></span>()</code> </td> </tr> </tbody> @@ -182,7 +182,7 @@ <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</a> sender, boolean clearResourcePathCache, byte securityImpact, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/cdo/common/security/CDOPermission.html" title="enum in org.eclipse.emf.cdo.common.security">CDOPermission</a>> newPermissions)</code> + java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/cdo/common/security/CDOPermission.html" title="enum in org.eclipse.emf.cdo.common.security">CDOPermission</a>> newPermissions)</code> <div class="block"><span class="deprecatedLabel">Deprecated.</span> <div class="block"><span class="deprecationComment">As of 4.6 use <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#invalidate-org.eclipse.emf.spi.cdo.InternalCDOSession.InvalidationData-"><code>InternalCDOSession.invalidate(InvalidationData)</code></a>.</span></div> </div> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOView.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOView.html index 36c2df540c..382f0c0e1e 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOView.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOView.html @@ -151,7 +151,7 @@ <td class="colLast"><span class="typeNameLabel">CDOObjectImpl.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html#instanceToRevisionFeature-org.eclipse.emf.spi.cdo.InternalCDOView-org.eclipse.emf.spi.cdo.InternalCDOObject-org.eclipse.emf.ecore.EStructuralFeature-java.lang.Object-">instanceToRevisionFeature</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a> view, <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a> object, <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> feature, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> setting)</code> </td> + java.lang.Object setting)</code> </td> </tr> </tbody> </table> @@ -205,7 +205,7 @@ </tr> <tr class="altColor"> <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a></code></td> -<td class="colLast"><span class="typeNameLabel">InternalCDOViewSet.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOViewSet.html#resolveView-java.lang.String-">resolveView</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> repositoryUUID)</code> +<td class="colLast"><span class="typeNameLabel">InternalCDOViewSet.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOViewSet.html#resolveView-java.lang.String-">resolveView</a></span>(java.lang.String repositoryUUID)</code> <div class="block"><span class="deprecatedLabel">Deprecated.</span> </div> </td> </tr> @@ -241,13 +241,13 @@ <a href="../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockChangeInfo</a> lockChangeInfo)</code> </td> </tr> <tr class="altColor"> -<td class="colFirst"><code>static <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a><<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>></code></td> -<td class="colLast"><span class="typeNameLabel">FSMUtil.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/FSMUtil.html#iterator-java.util.Collection-org.eclipse.emf.spi.cdo.InternalCDOView-">iterator</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a><?> instances, +<td class="colFirst"><code>static java.util.Iterator<<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>></code></td> +<td class="colLast"><span class="typeNameLabel">FSMUtil.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/FSMUtil.html#iterator-java.util.Collection-org.eclipse.emf.spi.cdo.InternalCDOView-">iterator</a></span>(java.util.Collection<?> instances, <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a> view)</code> </td> </tr> <tr class="rowColor"> -<td class="colFirst"><code>static <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a><<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>></code></td> -<td class="colLast"><span class="typeNameLabel">FSMUtil.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/FSMUtil.html#iterator-java.util.Iterator-org.eclipse.emf.spi.cdo.InternalCDOView-">iterator</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Iterator.html?is-external=true" title="class or interface in java.util">Iterator</a><?> delegate, +<td class="colFirst"><code>static java.util.Iterator<<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOObject</a>></code></td> +<td class="colLast"><span class="typeNameLabel">FSMUtil.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/FSMUtil.html#iterator-java.util.Iterator-org.eclipse.emf.spi.cdo.InternalCDOView-">iterator</a></span>(java.util.Iterator<?> delegate, <a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a> view)</code> </td> </tr> <tr class="altColor"> @@ -273,15 +273,15 @@ <tbody> <tr class="altColor"> <td class="colFirst"><code><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.RefreshSessionResult</a></code></td> -<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.RefreshSessionResult.Provider.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.Provider.html#getRefreshSessionResult-java.util.Map-java.util.Map-">getRefreshSessionResult</a></span>(<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a>>> views, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>>> viewedRevisions)</code> </td> +<td class="colLast"><span class="typeNameLabel">CDOSessionProtocol.RefreshSessionResult.Provider.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.Provider.html#getRefreshSessionResult-java.util.Map-java.util.Map-">getRefreshSessionResult</a></span>(java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,java.util.List<<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a>>> views, + java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>>> viewedRevisions)</code> </td> </tr> <tr class="rowColor"> <td class="colFirst"><code>void</code></td> <td class="colLast"><span class="typeNameLabel">InternalCDOSession.</span><code><span class="memberNameLink"><a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#processRefreshSessionResult-org.eclipse.emf.spi.cdo.CDOSessionProtocol.RefreshSessionResult-org.eclipse.emf.cdo.common.branch.CDOBranch-java.util.List-java.util.Map-">processRefreshSessionResult</a></span>(<a href="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.RefreshSessionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.RefreshSessionResult</a> result, <a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a> branch, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a>> branchViews, - <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,<a href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>>> viewedRevisions)</code> </td> + java.util.List<<a href="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</a>> branchViews, + java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</a>,java.util.Map<<a href="../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</a>,<a href="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</a>>> viewedRevisions)</code> </td> </tr> </tbody> </table> |