diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html index ab3ce9422e..3fafab6be0 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.ThreeWayMerge.html @@ -206,7 +206,7 @@ Class AbstractObjectConflictResolver.ThreeWayMerge</H2> <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify">Adapter</A> adapter)</CODE>
<BR>
- Returns <code>true</code> if the given adapter on the given object should trigger a certain operation or behaviour, + Returns <code>true</code> if the given adapter on the given object should trigger a certain operation or behaviour,
<code>false</code> otherwise.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
@@ -321,7 +321,7 @@ public boolean <B>isValid</B>(<A HREF="http://download.eclipse.org/modeling/emf/ <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.7.0/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify">Adapter</A> adapter)</PRE>
<DL>
<DD><B>Description copied from interface: <CODE><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html#isValid(org.eclipse.emf.ecore.EObject, org.eclipse.emf.common.notify.Adapter)">CDOAdapterPolicy</A></CODE></B></DD>
-<DD>Returns <code>true</code> if the given adapter on the given object should trigger a certain operation or behaviour, +<DD>Returns <code>true</code> if the given adapter on the given object should trigger a certain operation or behaviour,
<code>false</code> otherwise.
<P>
<DD><DL>
@@ -389,8 +389,8 @@ protected void <B>resolveConflict</B>(<A HREF="../../../../../org/eclipse/emf/cd <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/delta/CDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDORevisionDelta</A>> allRemoteDeltas)</PRE>
<DL>
<DD><B>Description copied from class: <CODE><A HREF="../../../../../org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.html#resolveConflict(org.eclipse.emf.cdo.CDOObject, org.eclipse.emf.cdo.common.revision.CDORevision, org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta, org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta, java.util.List)">AbstractObjectConflictResolver</A></CODE></B></DD>
-<DD>Resolves the conflict of a single object in the current transaction. Depending on the decision taken to resolve the - conflict, it may be necessary to adjust the notification that will be sent to the adapters in the current +<DD>Resolves the conflict of a single object in the current transaction. Depending on the decision taken to resolve the
+ conflict, it may be necessary to adjust the notification that will be sent to the adapters in the current
transaction. This can be achieved by adjusting the <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><CODE>CDORevisionDelta</CODE></A> in <code>deltas</code>.
<P>
<DD><DL>
|