Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-09-02 17:40:40 +0000
committerEike Stepper2011-09-02 17:40:40 +0000
commit39e55d340b79a835ec815ea688d8f3011506a935 (patch)
tree561a25786c263a84b30fd6023ac90096a568f243 /plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html
parent43e934e2b6d9df9b72eb229da769ee8954079c61 (diff)
downloadcdo-39e55d340b79a835ec815ea688d8f3011506a935.tar.gz
cdo-39e55d340b79a835ec815ea688d8f3011506a935.tar.xz
cdo-39e55d340b79a835ec815ea688d8f3011506a935.zip
update javadoc to juno
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html18
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html
index 3374ea642e..edde58cc20 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html
@@ -103,7 +103,7 @@ Interface CDORevisionDelta</H2>
</PRE>
<P>
-Represents the change delta between two <A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revisions</CODE></A> of a CDO object. The detailed
+Represents the change delta between two <A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revisions</CODE></A> of a CDO object. The detailed
<A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><CODE>feature deltas</CODE></A> are returned by the <A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html#getFeatureDeltas()"><CODE>getFeatureDeltas()</CODE></A> method.
<P>
@@ -135,7 +135,7 @@ Represents the change delta between two <A HREF="../../../../../../../org/eclips
<TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html#DETACHED">DETACHED</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This constant is only passed into conflict resolvers to indicate that a conflict was caused by remote detachment of
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This constant is only passed into conflict resolvers to indicate that a conflict was caused by remote detachment of
an object.</TD>
</TR>
</TABLE>
@@ -171,7 +171,7 @@ Represents the change delta between two <A HREF="../../../../../../../org/eclips
<TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html#apply(org.eclipse.emf.cdo.common.revision.CDORevision)">apply</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevision</A>&nbsp;revision)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Applies the <A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html#getFeatureDeltas()"><CODE>feature deltas</CODE></A> in this revision delta to the <A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionData.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>data</CODE></A>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Applies the <A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html#getFeatureDeltas()"><CODE>feature deltas</CODE></A> in this revision delta to the <A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionData.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>data</CODE></A>
of the given revision.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
@@ -259,8 +259,8 @@ DETACHED</H3>
<PRE>
static final <A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDORevisionDelta</A> <B>DETACHED</B></PRE>
<DL>
-<DD>This constant is only passed into conflict resolvers to indicate that a conflict was caused by remote detachment of
- an object. Calling any method on this marker instance will result in an <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/UnsupportedOperationException.html?is-external=true" title="class or interface in java.lang"><CODE>UnsupportedOperationException</CODE></A> being
+<DD>This constant is only passed into conflict resolvers to indicate that a conflict was caused by remote detachment of
+ an object. Calling any method on this marker instance will result in an <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/UnsupportedOperationException.html?is-external=true" title="class or interface in java.lang"><CODE>UnsupportedOperationException</CODE></A> being
thrown.
<P>
<DL>
@@ -378,10 +378,10 @@ apply</H3>
<PRE>
void <B>apply</B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevision</A>&nbsp;revision)</PRE>
<DL>
-<DD>Applies the <A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html#getFeatureDeltas()"><CODE>feature deltas</CODE></A> in this revision delta to the <A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionData.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>data</CODE></A>
- of the given revision.
- <p>
- The system data of the given revision, e.g. <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch"><CODE>branch point</CODE></A> or <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html" title="interface in org.eclipse.emf.cdo.common.branch"><CODE>branch
+<DD>Applies the <A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html#getFeatureDeltas()"><CODE>feature deltas</CODE></A> in this revision delta to the <A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionData.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>data</CODE></A>
+ of the given revision.
+ <p>
+ The system data of the given revision, e.g. <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch"><CODE>branch point</CODE></A> or <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchVersion.html" title="interface in org.eclipse.emf.cdo.common.branch"><CODE>branch
version</CODE></A> of the given revision are <b>not</b> modified.
<P>
<DD><DL>

Back to the top