Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/lock/InternalCDOLockState.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/lock/InternalCDOLockState.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/lock/InternalCDOLockState.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/lock/InternalCDOLockState.html
index dc7fd85f9b..f9c92bcdc5 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/lock/InternalCDOLockState.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/spi/common/lock/InternalCDOLockState.html
@@ -193,7 +193,7 @@ extends <a href="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockSta
</tr>
<tr id="i7" class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/lock/InternalCDOLockState.html#updateFrom-java.lang.Object-org.eclipse.emf.cdo.common.lock.CDOLockState-">updateFrom</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>&nbsp;object,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../org/eclipse/emf/cdo/spi/common/lock/InternalCDOLockState.html#updateFrom-java.lang.Object-org.eclipse.emf.cdo.common.lock.CDOLockState-">updateFrom</a></span>(java.lang.Object&nbsp;object,
<a href="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</a>&nbsp;source)</code>
<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
<div class="block"><span class="deprecationComment">As of 4.5 use <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/lock/InternalCDOLockState.html#updateFrom-org.eclipse.emf.cdo.common.lock.CDOLockState-"><code>updateFrom(CDOLockState)</code></a> instead.
@@ -300,8 +300,8 @@ extends <a href="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockSta
<ul class="blockList">
<li class="blockList">
<h4>updateFrom</h4>
-<pre><a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-void&nbsp;updateFrom(<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>&nbsp;object,
+<pre>@Deprecated
+void&nbsp;updateFrom(java.lang.Object&nbsp;object,
<a href="../../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</a>&nbsp;source)</pre>
<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">As of 4.5 use <a href="../../../../../../../org/eclipse/emf/cdo/spi/common/lock/InternalCDOLockState.html#updateFrom-org.eclipse.emf.cdo.common.lock.CDOLockState-"><code>updateFrom(CDOLockState)</code></a> instead.
The lockedObject field cannot be changed because it is used to compute the hash code.

Back to the top