diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDORevisionDelta.html')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDORevisionDelta.html | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDORevisionDelta.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDORevisionDelta.html index b75303c7b0..fc5170859a 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDORevisionDelta.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/delta/class-use/CDORevisionDelta.html @@ -476,7 +476,7 @@ Uses of <A HREF="../../../../../../../../org/eclipse/emf/cdo/common/revision/del <TD><CODE><B>CDOSavepoint.</B><B><A HREF="../../../../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getRevisionDeltas()">getRevisionDeltas</A></B>()</CODE> <BR> - </TD> + <B>Deprecated.</B> <I>As of 4.2 use <A HREF="../../../../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getRevisionDeltas2()"><CODE>CDOSavepoint.getRevisionDeltas2()</CODE></A> instead.</I></TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> @@ -486,6 +486,14 @@ Uses of <A HREF="../../../../../../../../org/eclipse/emf/cdo/common/revision/del <BR> </TD> </TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<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/cdo/common/revision/delta/CDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDORevisionDelta</A>></CODE></FONT></TD> +<TD><CODE><B>CDOSavepoint.</B><B><A HREF="../../../../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getRevisionDeltas2()">getRevisionDeltas2</A></B>()</CODE> + +<BR> + </TD> +</TR> </TABLE> <P> @@ -671,6 +679,14 @@ Uses of <A HREF="../../../../../../../../org/eclipse/emf/cdo/common/revision/del </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> void</CODE></FONT></TD> +<TD><CODE><B>InternalCDOView.</B><B><A HREF="../../../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#clearResourcePathCacheIfNecessary(org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta)">clearResourcePathCacheIfNecessary</A></B>(<A HREF="../../../../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDORevisionDelta</A> delta)</CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected boolean</CODE></FONT></TD> <TD><CODE><B>AbstractObjectConflictResolver.MergeLocalChangesPerFeature.</B><B><A HREF="../../../../../../../../org/eclipse/emf/spi/cdo/AbstractObjectConflictResolver.MergeLocalChangesPerFeature.html#hasFeatureConflicts(org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta, java.util.List)">hasFeatureConflicts</A></B>(<A HREF="../../../../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDORevisionDelta</A> localDelta, <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>> remoteDeltas)</CODE> |