Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html59
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html481
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.pngbin0 -> 737 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.html126
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSessionConfiguration.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOTransaction.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOView.html67
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOSession.MergeData.html182
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOTransaction.html10
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html6
13 files changed, 926 insertions, 21 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html
index 55ace3694c..60fa862676 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html
@@ -189,6 +189,17 @@ If the meaning of this type isn't clear, there really should be more of a descri
<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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/CDOObjectReference.html" title="interface in org.eclipse.emf.cdo">CDOObjectReference</A>&gt;&nbsp;xRefs)</CODE>
<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;<I>As of 4.2</I></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html#CDOSessionProtocol.CommitTransactionResult(org.eclipse.emf.cdo.common.id.CDOIDProvider, java.lang.String, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, long, java.util.List, boolean)">CDOSessionProtocol.CommitTransactionResult</A></B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/id/CDOIDProvider.html" title="interface in org.eclipse.emf.cdo.common.id">CDOIDProvider</A>&nbsp;idProvider,
+ <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>&nbsp;rollbackMessage,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;branchPoint,
+ long&nbsp;previousTimeStamp,
+ <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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/CDOObjectReference.html" title="interface in org.eclipse.emf.cdo">CDOObjectReference</A>&gt;&nbsp;xRefs,
+ boolean&nbsp;clearResourcePathCache)</CODE>
+
+<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
</TABLE>
@@ -286,6 +297,14 @@ If the meaning of this type isn't clear, there really should be more of a descri
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html#isClearResourcePathCache()">isClearResourcePathCache</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;void</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html#setNewLockStates(org.eclipse.emf.cdo.common.lock.CDOLockState[])">setNewLockStates</A></B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/lock/CDOLockState.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockState</A>[]&nbsp;newLockStates)</CODE>
@@ -326,15 +345,35 @@ If the meaning of this type isn't clear, there really should be more of a descri
<A NAME="CDOSessionProtocol.CommitTransactionResult(org.eclipse.emf.cdo.common.id.CDOIDProvider, java.lang.String, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, long, java.util.List)"><!-- --></A><H3>
CDOSessionProtocol.CommitTransactionResult</H3>
<PRE>
+<FONT SIZE="-1"><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>
+</FONT>public <B>CDOSessionProtocol.CommitTransactionResult</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/id/CDOIDProvider.html" title="interface in org.eclipse.emf.cdo.common.id">CDOIDProvider</A>&nbsp;idProvider,
+ <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>&nbsp;rollbackMessage,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;branchPoint,
+ long&nbsp;previousTimeStamp,
+ <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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/CDOObjectReference.html" title="interface in org.eclipse.emf.cdo">CDOObjectReference</A>&gt;&nbsp;xRefs)</PRE>
+<DL>
+<DD><B>Deprecated.</B>&nbsp;<I>As of 4.2</I>
+<P>
+<DL>
+<DT><B>Since:</B></DT>
+ <DD>4.0</DD>
+</DL>
+</DL>
+<HR>
+
+<A NAME="CDOSessionProtocol.CommitTransactionResult(org.eclipse.emf.cdo.common.id.CDOIDProvider, java.lang.String, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, long, java.util.List, boolean)"><!-- --></A><H3>
+CDOSessionProtocol.CommitTransactionResult</H3>
+<PRE>
public <B>CDOSessionProtocol.CommitTransactionResult</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/id/CDOIDProvider.html" title="interface in org.eclipse.emf.cdo.common.id">CDOIDProvider</A>&nbsp;idProvider,
<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>&nbsp;rollbackMessage,
<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;branchPoint,
long&nbsp;previousTimeStamp,
- <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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/CDOObjectReference.html" title="interface in org.eclipse.emf.cdo">CDOObjectReference</A>&gt;&nbsp;xRefs)</PRE>
+ <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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/CDOObjectReference.html" title="interface in org.eclipse.emf.cdo">CDOObjectReference</A>&gt;&nbsp;xRefs,
+ boolean&nbsp;clearResourcePathCache)</PRE>
<DL>
<DL>
<DT><B>Since:</B></DT>
- <DD>4.0</DD>
+ <DD>4.2</DD>
</DL>
</DL>
<HR>
@@ -478,6 +517,22 @@ public <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.
</DL>
<HR>
+<A NAME="isClearResourcePathCache()"><!-- --></A><H3>
+isClearResourcePathCache</H3>
+<PRE>
+public boolean <B>isClearResourcePathCache</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.2</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="getIDMappings()"><!-- --></A><H3>
getIDMappings</H3>
<PRE>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html
index 5b9d435817..81f8bee88e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html
@@ -206,7 +206,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
<TH ALIGN="left"><B>Methods inherited from interface org.eclipse.emf.cdo.transaction.<A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html" title="interface in org.eclipse.emf.cdo.transaction">CDOSavepoint</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getAllBaseNewObjects()">getAllBaseNewObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getAllChangeSetData()">getAllChangeSetData</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getAllDetachedObjects()">getAllDetachedObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getAllDirtyObjects()">getAllDirtyObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getAllNewObjects()">getAllNewObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getAllRevisionDeltas()">getAllRevisionDeltas</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getBaseNewObjects()">getBaseNewObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getDetachedObjects()">getDetachedObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getDirtyObjects()">getDirtyObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getNewObjects()">getNewObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getReattachedObjects()">getReattachedObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getRevisionDeltas()">getRevisionDeltas</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#wasDirty()">wasDirty</A></CODE></TD>
+<TD><CODE><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getAllBaseNewObjects()">getAllBaseNewObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getAllChangeSetData()">getAllChangeSetData</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getAllDetachedObjects()">getAllDetachedObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getAllDirtyObjects()">getAllDirtyObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getAllNewObjects()">getAllNewObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getAllRevisionDeltas()">getAllRevisionDeltas</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getBaseNewObjects()">getBaseNewObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getDetachedObjects()">getDetachedObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getDirtyObjects()">getDirtyObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getNewObjects()">getNewObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getReattachedObjects()">getReattachedObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getRevisionDeltas()">getRevisionDeltas</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#getRevisionDeltas2()">getRevisionDeltas2</A>, <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html#wasDirty()">wasDirty</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_org.eclipse.emf.cdo.common.commit.CDOChangeSetDataProvider"><!-- --></A>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html
new file mode 100644
index 0000000000..440f66b07f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html
@@ -0,0 +1,481 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+
+<TITLE>
+InternalCDOSession.MergeData (CDO Model Repository Documentation)
+</TITLE>
+
+<META NAME="date" CONTENT="">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../html/book.css" TITLE="Style">
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="InternalCDOSession.MergeData (CDO Model Repository Documentation)";
+ }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+ <TR ALIGN="center" VALIGN="top">
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/InternalCDOSession.MergeData.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+ </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html" title="interface in org.eclipse.emf.spi.cdo"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSessionConfiguration.html" title="interface in org.eclipse.emf.spi.cdo"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+ <A HREF="../../../../../index.html?org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" target="_top"><B>FRAMES</B></A> &nbsp;
+&nbsp;<A HREF="InternalCDOSession.MergeData.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+ <!--
+ if(window==top) {
+ document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+ }
+ //-->
+</SCRIPT>
+<NOSCRIPT>
+ <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+ SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+org.eclipse.emf.spi.cdo</FONT>
+<BR>
+Class InternalCDOSession.MergeData</H2>
+<PRE>
+<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">java.lang.Object</A>
+ <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by "><B>org.eclipse.emf.spi.cdo.InternalCDOSession.MergeData</B>
+</PRE>
+<DL>
+<DT><B>Enclosing interface:</B><DD><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOSession</A></DD>
+</DL>
+<HR>
+<DL>
+ <DT>public static final class <B>InternalCDOSession.MergeData</B>
+ <DD>extends <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>
+</DL>
+
+<map id="APIVIZ" name="APIVIZ">
+<area shape="rect" id="node1" href="InternalCDOSession.MergeData.html" title="InternalCDOSession.MergeData" alt="" coords="5,6,211,31"/>
+</map>
+
+<CENTER><IMG SRC="InternalCDOSession.MergeData.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
+
+
+
+<P>
+A data structure that holds all input and output values of <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#getMergeData(org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, boolean)"><CODE>InternalCDOSession.getMergeData()</CODE></A>.
+<P>
+
+<P>
+<DL>
+<DT><B>Since:</B></DT>
+ <DD>4.2</DD>
+</DL>
+<HR>
+
+<P>
+
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+
+<A NAME="constructor_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Constructor Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#InternalCDOSession.MergeData(org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo, org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo, org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo, org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo, java.util.Set, org.eclipse.emf.cdo.common.commit.CDOChangeSet, org.eclipse.emf.cdo.common.commit.CDOChangeSet)">InternalCDOSession.MergeData</A></B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;target,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;source,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;sourceBase,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;ancestor,
+ <A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A>&nbsp;targetInfo,
+ <A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A>&nbsp;sourceInfo,
+ <A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A>&nbsp;baseInfo,
+ <A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A>&nbsp;ancestorInfo,
+ <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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</A>&gt;&nbsp;ids,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A>&nbsp;targetChanges,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A>&nbsp;sourceChanges)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ========== METHOD SUMMARY =========== -->
+
+<A NAME="method_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Method Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getAncestor()">getAncestor</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getAncestorInfo()">getAncestorInfo</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getBaseInfo()">getBaseInfo</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getIDs()">getIDs</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getSource()">getSource</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getSourceBase()">getSourceBase</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getSourceChanges()">getSourceChanges</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getSourceInfo()">getSourceInfo</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTarget()">getTarget</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTargetChanges()">getTargetChanges</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html#getTargetInfo()">getTargetInfo</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.<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></B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#clone()" title="class or interface in java.lang">clone</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#equals(java.lang.Object)" title="class or interface in java.lang">equals</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#finalize()" title="class or interface in java.lang">finalize</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#getClass()" title="class or interface in java.lang">getClass</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#hashCode()" title="class or interface in java.lang">hashCode</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#notify()" title="class or interface in java.lang">notify</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#notifyAll()" title="class or interface in java.lang">notifyAll</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#toString()" title="class or interface in java.lang">toString</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#wait()" title="class or interface in java.lang">wait</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#wait(long)" title="class or interface in java.lang">wait</A>, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true#wait(long, int)" title="class or interface in java.lang">wait</A></CODE></TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+
+<A NAME="constructor_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Constructor Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="InternalCDOSession.MergeData(org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo, org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo, org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo, org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo, java.util.Set, org.eclipse.emf.cdo.common.commit.CDOChangeSet, org.eclipse.emf.cdo.common.commit.CDOChangeSet)"><!-- --></A><H3>
+InternalCDOSession.MergeData</H3>
+<PRE>
+public <B>InternalCDOSession.MergeData</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;target,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;source,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;sourceBase,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;ancestor,
+ <A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A>&nbsp;targetInfo,
+ <A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A>&nbsp;sourceInfo,
+ <A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A>&nbsp;baseInfo,
+ <A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A>&nbsp;ancestorInfo,
+ <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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</A>&gt;&nbsp;ids,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A>&nbsp;targetChanges,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A>&nbsp;sourceChanges)</PRE>
+<DL>
+</DL>
+
+<!-- ============ METHOD DETAIL ========== -->
+
+<A NAME="method_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Method Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="getTarget()"><!-- --></A><H3>
+getTarget</H3>
+<PRE>
+public <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A> <B>getTarget</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getSource()"><!-- --></A><H3>
+getSource</H3>
+<PRE>
+public <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A> <B>getSource</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getSourceBase()"><!-- --></A><H3>
+getSourceBase</H3>
+<PRE>
+public <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A> <B>getSourceBase</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getAncestor()"><!-- --></A><H3>
+getAncestor</H3>
+<PRE>
+public <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A> <B>getAncestor</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getTargetInfo()"><!-- --></A><H3>
+getTargetInfo</H3>
+<PRE>
+public <A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A> <B>getTargetInfo</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getSourceInfo()"><!-- --></A><H3>
+getSourceInfo</H3>
+<PRE>
+public <A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A> <B>getSourceInfo</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getBaseInfo()"><!-- --></A><H3>
+getBaseInfo</H3>
+<PRE>
+public <A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A> <B>getBaseInfo</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getAncestorInfo()"><!-- --></A><H3>
+getAncestorInfo</H3>
+<PRE>
+public <A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A> <B>getAncestorInfo</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getIDs()"><!-- --></A><H3>
+getIDs</H3>
+<PRE>
+public <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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</A>&gt; <B>getIDs</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getTargetChanges()"><!-- --></A><H3>
+getTargetChanges</H3>
+<PRE>
+public <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A> <B>getTargetChanges</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="getSourceChanges()"><!-- --></A><H3>
+getSourceChanges</H3>
+<PRE>
+public <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A> <B>getSourceChanges</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+ <TR ALIGN="center" VALIGN="top">
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="class-use/InternalCDOSession.MergeData.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+ </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html" title="interface in org.eclipse.emf.spi.cdo"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSessionConfiguration.html" title="interface in org.eclipse.emf.spi.cdo"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+ <A HREF="../../../../../index.html?org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" target="_top"><B>FRAMES</B></A> &nbsp;
+&nbsp;<A HREF="InternalCDOSession.MergeData.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+ <!--
+ if(window==top) {
+ document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+ }
+ //-->
+</SCRIPT>
+<NOSCRIPT>
+ <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+ SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+<i>Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.</i>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.png
new file mode 100644
index 0000000000..33ca4545fc
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.html
index 54fa2d1271..e19c2f1742 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSession.html
@@ -56,7 +56,7 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html" title="interface in org.eclipse.emf.spi.cdo"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSessionConfiguration.html" title="interface in org.eclipse.emf.spi.cdo"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../../../../index.html?org/eclipse/emf/spi/cdo/InternalCDOSession.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="InternalCDOSession.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -76,7 +76,7 @@ function windowTitle()
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
@@ -137,6 +137,14 @@ If the meaning of this type isn't clear, there really should be more of a descri
<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
<B>Nested Class Summary</B></FONT></TH>
</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;class</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A data structure that holds all input and output values of <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#getMergeData(org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, boolean)"><CODE>InternalCDOSession.getMergeData()</CODE></A>.</TD>
+</TR>
</TABLE>
&nbsp;<A NAME="nested_classes_inherited_from_class_org.eclipse.emf.cdo.session.CDOSession"><!-- --></A>
<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
@@ -201,7 +209,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#cacheRevisions(org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo)">cacheRevisions</A></B>(<A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A>&nbsp;info)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;<I>As of 4.2 not used anymore.</I></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -217,7 +225,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#createRevisionAvailabilityInfo(org.eclipse.emf.cdo.common.branch.CDOBranchPoint)">createRevisionAvailabilityInfo</A></B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;branchPoint)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;<I>As of 4.2 not used anymore.</I></TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -262,6 +270,17 @@ If the meaning of this type isn't clear, there really should be more of a descri
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#getMergeData(org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, boolean)">getMergeData</A></B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;target,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;source,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;sourceBase,
+ boolean&nbsp;computeChangeSets)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;<A HREF="../../../../../org/eclipse/emf/cdo/spi/common/model/InternalCDOPackageRegistry.html" title="interface in org.eclipse.emf.cdo.spi.common.model">InternalCDOPackageRegistry</A></CODE></FONT></TD>
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#getPackageRegistry()">getPackageRegistry</A></B>()</CODE>
@@ -309,6 +328,15 @@ If the meaning of this type isn't clear, there really should be more of a descri
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#handleCommitNotification(org.eclipse.emf.cdo.common.commit.CDOCommitInfo)">handleCommitNotification</A></B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A>&nbsp;commitInfo)</CODE>
<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;<I>As of 4.2 use <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#handleCommitNotification(org.eclipse.emf.cdo.common.commit.CDOCommitInfo, boolean)"><CODE>handleCommitNotification(CDOCommitInfo, boolean)</CODE></A></I></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#handleCommitNotification(org.eclipse.emf.cdo.common.commit.CDOCommitInfo, boolean)">handleCommitNotification</A></B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A>&nbsp;commitInfo,
+ boolean&nbsp;clearResourcePathCache)</CODE>
+
+<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
@@ -345,6 +373,16 @@ If the meaning of this type isn't clear, there really should be more of a descri
<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</A>&nbsp;sender)</CODE>
<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;<I>As of 4.2 use <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#invalidate(org.eclipse.emf.cdo.common.commit.CDOCommitInfo, org.eclipse.emf.spi.cdo.InternalCDOTransaction, boolean)"><CODE>invalidate(CDOCommitInfo, InternalCDOTransaction, boolean)</CODE></A></I></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#invalidate(org.eclipse.emf.cdo.common.commit.CDOCommitInfo, org.eclipse.emf.spi.cdo.InternalCDOTransaction, boolean)">invalidate</A></B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A>&nbsp;commitInfo,
+ <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</A>&nbsp;sender,
+ boolean&nbsp;clearResourcePathCache)</CODE>
+
+<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
@@ -1122,8 +1160,11 @@ void <B>handleBranchNotification</B>(<A HREF="../../../../../org/eclipse/emf/cdo
<A NAME="handleCommitNotification(org.eclipse.emf.cdo.common.commit.CDOCommitInfo)"><!-- --></A><H3>
handleCommitNotification</H3>
<PRE>
-void <B>handleCommitNotification</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A>&nbsp;commitInfo)</PRE>
+<FONT SIZE="-1"><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>
+</FONT>void <B>handleCommitNotification</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A>&nbsp;commitInfo)</PRE>
<DL>
+<DD><B>Deprecated.</B>&nbsp;<I>As of 4.2 use <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#handleCommitNotification(org.eclipse.emf.cdo.common.commit.CDOCommitInfo, boolean)"><CODE>handleCommitNotification(CDOCommitInfo, boolean)</CODE></A></I>
+<P>
<DD><DL>
</DL>
</DD>
@@ -1135,6 +1176,23 @@ void <B>handleCommitNotification</B>(<A HREF="../../../../../org/eclipse/emf/cdo
</DL>
<HR>
+<A NAME="handleCommitNotification(org.eclipse.emf.cdo.common.commit.CDOCommitInfo, boolean)"><!-- --></A><H3>
+handleCommitNotification</H3>
+<PRE>
+void <B>handleCommitNotification</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A>&nbsp;commitInfo,
+ boolean&nbsp;clearResourcePathCache)</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.2</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="handleLockNotification(org.eclipse.emf.cdo.common.lock.CDOLockChangeInfo, org.eclipse.emf.spi.cdo.InternalCDOView)"><!-- --></A><H3>
handleLockNotification</H3>
<PRE>
@@ -1155,9 +1213,12 @@ void <B>handleLockNotification</B>(<A HREF="../../../../../org/eclipse/emf/cdo/c
<A NAME="invalidate(org.eclipse.emf.cdo.common.commit.CDOCommitInfo, org.eclipse.emf.spi.cdo.InternalCDOTransaction)"><!-- --></A><H3>
invalidate</H3>
<PRE>
-void <B>invalidate</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A>&nbsp;commitInfo,
- <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</A>&nbsp;sender)</PRE>
+<FONT SIZE="-1"><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>
+</FONT>void <B>invalidate</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A>&nbsp;commitInfo,
+ <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</A>&nbsp;sender)</PRE>
<DL>
+<DD><B>Deprecated.</B>&nbsp;<I>As of 4.2 use <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#invalidate(org.eclipse.emf.cdo.common.commit.CDOCommitInfo, org.eclipse.emf.spi.cdo.InternalCDOTransaction, boolean)"><CODE>invalidate(CDOCommitInfo, InternalCDOTransaction, boolean)</CODE></A></I>
+<P>
<DD><DL>
</DL>
</DD>
@@ -1169,6 +1230,24 @@ void <B>invalidate</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/commit
</DL>
<HR>
+<A NAME="invalidate(org.eclipse.emf.cdo.common.commit.CDOCommitInfo, org.eclipse.emf.spi.cdo.InternalCDOTransaction, boolean)"><!-- --></A><H3>
+invalidate</H3>
+<PRE>
+void <B>invalidate</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A>&nbsp;commitInfo,
+ <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</A>&nbsp;sender,
+ boolean&nbsp;clearResourcePathCache)</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.2</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="processRefreshSessionResult(org.eclipse.emf.spi.cdo.CDOSessionProtocol.RefreshSessionResult, org.eclipse.emf.cdo.common.branch.CDOBranch, java.util.List, java.util.Map)"><!-- --></A><H3>
processRefreshSessionResult</H3>
<PRE>
@@ -1272,8 +1351,11 @@ void <B>setMainBranchLocal</B>(boolean&nbsp;mainBranchLocal)</PRE>
<A NAME="createRevisionAvailabilityInfo(org.eclipse.emf.cdo.common.branch.CDOBranchPoint)"><!-- --></A><H3>
createRevisionAvailabilityInfo</H3>
<PRE>
-<A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A> <B>createRevisionAvailabilityInfo</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;branchPoint)</PRE>
+<FONT SIZE="-1"><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>
+</FONT><A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A> <B>createRevisionAvailabilityInfo</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;branchPoint)</PRE>
<DL>
+<DD><B>Deprecated.</B>&nbsp;<I>As of 4.2 not used anymore.</I>
+<P>
<DD><DL>
</DL>
</DD>
@@ -1288,8 +1370,11 @@ createRevisionAvailabilityInfo</H3>
<A NAME="cacheRevisions(org.eclipse.emf.cdo.spi.common.commit.CDORevisionAvailabilityInfo)"><!-- --></A><H3>
cacheRevisions</H3>
<PRE>
-void <B>cacheRevisions</B>(<A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A>&nbsp;info)</PRE>
+<FONT SIZE="-1"><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>
+</FONT>void <B>cacheRevisions</B>(<A HREF="../../../../../org/eclipse/emf/cdo/spi/common/commit/CDORevisionAvailabilityInfo.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDORevisionAvailabilityInfo</A>&nbsp;info)</PRE>
<DL>
+<DD><B>Deprecated.</B>&nbsp;<I>As of 4.2 not used anymore.</I>
+<P>
<DD><DL>
</DL>
</DD>
@@ -1299,6 +1384,25 @@ void <B>cacheRevisions</B>(<A HREF="../../../../../org/eclipse/emf/cdo/spi/commo
</DL>
</DD>
</DL>
+<HR>
+
+<A NAME="getMergeData(org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, boolean)"><!-- --></A><H3>
+getMergeData</H3>
+<PRE>
+<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</A> <B>getMergeData</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;target,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;source,
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;sourceBase,
+ boolean&nbsp;computeChangeSets)</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.2</DD>
+</DL>
+</DD>
+</DL>
<!-- ========= END OF CLASS DATA ========= -->
<HR>
@@ -1330,7 +1434,7 @@ void <B>cacheRevisions</B>(<A HREF="../../../../../org/eclipse/emf/cdo/spi/commo
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSavepoint.html" title="interface in org.eclipse.emf.spi.cdo"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSessionConfiguration.html" title="interface in org.eclipse.emf.spi.cdo"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../../../../index.html?org/eclipse/emf/spi/cdo/InternalCDOSession.html" target="_top"><B>FRAMES</B></A> &nbsp;
&nbsp;<A HREF="InternalCDOSession.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
@@ -1350,7 +1454,7 @@ void <B>cacheRevisions</B>(<A HREF="../../../../../org/eclipse/emf/cdo/spi/commo
</TR>
<TR>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
- SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+ SUMMARY:&nbsp;<A HREF="#nested_class_summary">NESTED</A>&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
</TR>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSessionConfiguration.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSessionConfiguration.html
index 552d5bd9d2..f1776927ce 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSessionConfiguration.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOSessionConfiguration.html
@@ -55,7 +55,7 @@ function windowTitle()
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html" title="interface in org.eclipse.emf.spi.cdo"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo"><B>PREV CLASS</B></A>&nbsp;
&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../../../../index.html?org/eclipse/emf/spi/cdo/InternalCDOSessionConfiguration.html" target="_top"><B>FRAMES</B></A> &nbsp;
@@ -305,7 +305,7 @@ void <B>setMainBranchLocal</B>(boolean&nbsp;local)</PRE>
<TR>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html" title="interface in org.eclipse.emf.spi.cdo"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo"><B>PREV CLASS</B></A>&nbsp;
&nbsp;<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo"><B>NEXT CLASS</B></A></FONT></TD>
<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
<A HREF="../../../../../index.html?org/eclipse/emf/spi/cdo/InternalCDOSessionConfiguration.html" target="_top"><B>FRAMES</B></A> &nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOTransaction.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOTransaction.html
index eb4a30b18c..d64d036311 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOTransaction.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOTransaction.html
@@ -440,7 +440,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
<TH ALIGN="left"><B>Methods inherited from interface org.eclipse.emf.spi.cdo.<A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#attachResource(org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl)">attachResource</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#collectViewedRevisions(java.util.Map)">collectViewedRevisions</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#convertIDToObject(java.lang.Object)">convertIDToObject</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#convertObjectToID(java.lang.Object)">convertObjectToID</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#convertObjectToID(java.lang.Object, boolean)">convertObjectToID</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#deregisterObject(org.eclipse.emf.spi.cdo.InternalCDOObject)">deregisterObject</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getFeatureAnalyzer()">getFeatureAnalyzer</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getLockStates(java.util.Collection)">getLockStates</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getObjects()">getObjects</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getResourceNodeID(java.lang.String)">getResourceNodeID</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getRevision(org.eclipse.emf.cdo.common.id.CDOID, boolean)">getRevision</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getSession()">getSession</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getStore()">getStore</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getViewSet()">getViewSet</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#handleAddAdapter(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.common.notify.Adapter)">handleAddAdapter</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#handleLockNotification(org.eclipse.emf.spi.cdo.InternalCDOView, org.eclipse.emf.cdo.common.lock.CDOLockChangeInfo)">handleLockNotification</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#handleObjectStateChanged(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.cdo.CDOState, org.eclipse.emf.cdo.CDOState)">handleObjectStateChanged</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#handleRemoveAdapter(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.common.notify.Adapter)">handleRemoveAdapter</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#hasSubscription(org.eclipse.emf.cdo.common.id.CDOID)">hasSubscription</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#invalidate(org.eclipse.emf.cdo.common.branch.CDOBranch, long, java.util.List, java.util.List, java.util.Map, boolean)">invalidate</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#isObjectLocked(org.eclipse.emf.cdo.CDOObject, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, boolean)">isObjectLocked</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#isObjectNew(org.eclipse.emf.cdo.common.id.CDOID)">isObjectNew</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#prefetchRevisions(org.eclipse.emf.cdo.common.id.CDOID, int)">prefetchRevisions</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#registerObject(org.eclipse.emf.spi.cdo.InternalCDOObject)">registerObject</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#registerProxyResource(org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl)">registerProxyResource</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#remapObject(org.eclipse.emf.cdo.common.id.CDOID)">remapObject</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#setFeatureAnalyzer(org.eclipse.emf.cdo.view.CDOFeatureAnalyzer)">setFeatureAnalyzer</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#setLastUpdateTime(long)">setLastUpdateTime</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#setSession(org.eclipse.emf.spi.cdo.InternalCDOSession)">setSession</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#setViewID(int)">setViewID</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#setViewSet(org.eclipse.emf.spi.cdo.InternalCDOViewSet)">setViewSet</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#subscribe(org.eclipse.emf.ecore.EObject, org.eclipse.emf.common.notify.Adapter)">subscribe</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#toTransaction()">toTransaction</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#unsubscribe(org.eclipse.emf.ecore.EObject, org.eclipse.emf.common.notify.Adapter)">unsubscribe</A></CODE></TD>
+<TD><CODE><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#attachResource(org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl)">attachResource</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#clearResourcePathCacheIfNecessary(org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta)">clearResourcePathCacheIfNecessary</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#collectViewedRevisions(java.util.Map)">collectViewedRevisions</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#convertIDToObject(java.lang.Object)">convertIDToObject</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#convertObjectToID(java.lang.Object)">convertObjectToID</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#convertObjectToID(java.lang.Object, boolean)">convertObjectToID</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#deregisterObject(org.eclipse.emf.spi.cdo.InternalCDOObject)">deregisterObject</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getFeatureAnalyzer()">getFeatureAnalyzer</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getLockStates(java.util.Collection)">getLockStates</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getObjects()">getObjects</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getResourceNodeID(java.lang.String)">getResourceNodeID</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getRevision(org.eclipse.emf.cdo.common.id.CDOID, boolean)">getRevision</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getSession()">getSession</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getStore()">getStore</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#getViewSet()">getViewSet</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#handleAddAdapter(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.common.notify.Adapter)">handleAddAdapter</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#handleLockNotification(org.eclipse.emf.spi.cdo.InternalCDOView, org.eclipse.emf.cdo.common.lock.CDOLockChangeInfo)">handleLockNotification</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#handleObjectStateChanged(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.cdo.CDOState, org.eclipse.emf.cdo.CDOState)">handleObjectStateChanged</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#handleRemoveAdapter(org.eclipse.emf.spi.cdo.InternalCDOObject, org.eclipse.emf.common.notify.Adapter)">handleRemoveAdapter</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#hasSubscription(org.eclipse.emf.cdo.common.id.CDOID)">hasSubscription</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#invalidate(org.eclipse.emf.cdo.common.branch.CDOBranch, long, java.util.List, java.util.List, java.util.Map, boolean)">invalidate</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#invalidate(org.eclipse.emf.cdo.common.branch.CDOBranch, long, java.util.List, java.util.List, java.util.Map, boolean, boolean)">invalidate</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#isObjectLocked(org.eclipse.emf.cdo.CDOObject, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, boolean)">isObjectLocked</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#isObjectNew(org.eclipse.emf.cdo.common.id.CDOID)">isObjectNew</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#prefetchRevisions(org.eclipse.emf.cdo.common.id.CDOID, int)">prefetchRevisions</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#registerObject(org.eclipse.emf.spi.cdo.InternalCDOObject)">registerObject</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#registerProxyResource(org.eclipse.emf.cdo.eresource.impl.CDOResourceImpl)">registerProxyResource</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#remapObject(org.eclipse.emf.cdo.common.id.CDOID)">remapObject</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#setFeatureAnalyzer(org.eclipse.emf.cdo.view.CDOFeatureAnalyzer)">setFeatureAnalyzer</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#setLastUpdateTime(long)">setLastUpdateTime</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#setSession(org.eclipse.emf.spi.cdo.InternalCDOSession)">setSession</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#setViewID(int)">setViewID</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#setViewSet(org.eclipse.emf.spi.cdo.InternalCDOViewSet)">setViewSet</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#subscribe(org.eclipse.emf.ecore.EObject, org.eclipse.emf.common.notify.Adapter)">subscribe</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#toTransaction()">toTransaction</A>, <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#unsubscribe(org.eclipse.emf.ecore.EObject, org.eclipse.emf.common.notify.Adapter)">unsubscribe</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_org.eclipse.emf.cdo.view.CDOView"><!-- --></A>
@@ -449,7 +449,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
<TH ALIGN="left"><B>Methods inherited from interface org.eclipse.emf.cdo.view.<A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#addObjectHandler(org.eclipse.emf.cdo.view.CDOObjectHandler)">addObjectHandler</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#compareRevisions(org.eclipse.emf.cdo.common.branch.CDOBranchPoint)">compareRevisions</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#createQuery(java.lang.String, java.lang.String)">createQuery</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#createQuery(java.lang.String, java.lang.String, java.lang.Object)">createQuery</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#disableDurableLocking(boolean)">disableDurableLocking</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#enableDurableLocking()">enableDurableLocking</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#enableDurableLocking(boolean)">enableDurableLocking</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getBinaryResource(java.lang.String)">getBinaryResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject(org.eclipse.emf.cdo.common.id.CDOID)">getObject</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject(org.eclipse.emf.cdo.common.id.CDOID, boolean)">getObject</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject(T)">getObject</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObjectHandlers()">getObjectHandlers</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResource(java.lang.String)">getResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResource(java.lang.String, boolean)">getResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceNode(java.lang.String)">getResourceNode</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceSet()">getResourceSet</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getRootResource()">getRootResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getTextResource(java.lang.String)">getTextResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getURIHandler()">getURIHandler</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#hasResource(java.lang.String)">hasResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isInvalidationRunnerActive()">isInvalidationRunnerActive</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isLegacyModeEnabled()">isLegacyModeEnabled</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isObjectRegistered(org.eclipse.emf.cdo.common.id.CDOID)">isObjectRegistered</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#lockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, long)">lockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#lockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, long, boolean)">lockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryResources(org.eclipse.emf.cdo.eresource.CDOResourceFolder, java.lang.String, boolean)">queryResources</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryResourcesAsync(org.eclipse.emf.cdo.eresource.CDOResourceFolder, java.lang.String, boolean)">queryResourcesAsync</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefs(org.eclipse.emf.cdo.CDOObject, org.eclipse.emf.ecore.EReference...)">queryXRefs</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefs(java.util.Set, org.eclipse.emf.ecore.EReference...)">queryXRefs</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefsAsync(java.util.Set, org.eclipse.emf.ecore.EReference...)">queryXRefsAsync</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#reload(org.eclipse.emf.cdo.CDOObject...)">reload</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#removeObjectHandler(org.eclipse.emf.cdo.view.CDOObjectHandler)">removeObjectHandler</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranch(org.eclipse.emf.cdo.common.branch.CDOBranch)">setBranch</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint(org.eclipse.emf.cdo.common.branch.CDOBranch, long)">setBranchPoint</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint(org.eclipse.emf.cdo.common.branch.CDOBranchPoint)">setBranchPoint</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setTimeStamp(long)">setTimeStamp</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects()">unlockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType)">unlockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, boolean)">unlockObjects</A></CODE></TD>
+<TD><CODE><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#addObjectHandler(org.eclipse.emf.cdo.view.CDOObjectHandler)">addObjectHandler</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#compareRevisions(org.eclipse.emf.cdo.common.branch.CDOBranchPoint)">compareRevisions</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#createQuery(java.lang.String, java.lang.String)">createQuery</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#createQuery(java.lang.String, java.lang.String, java.lang.Object)">createQuery</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#disableDurableLocking(boolean)">disableDurableLocking</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#enableDurableLocking()">enableDurableLocking</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#enableDurableLocking(boolean)">enableDurableLocking</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getBinaryResource(java.lang.String)">getBinaryResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject(org.eclipse.emf.cdo.common.id.CDOID)">getObject</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject(org.eclipse.emf.cdo.common.id.CDOID, boolean)">getObject</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject(T)">getObject</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObjectHandlers()">getObjectHandlers</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResource(java.lang.String)">getResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResource(java.lang.String, boolean)">getResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceFolder(java.lang.String)">getResourceFolder</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceNode(java.lang.String)">getResourceNode</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceSet()">getResourceSet</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getRootResource()">getRootResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getTextResource(java.lang.String)">getTextResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getURIHandler()">getURIHandler</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#hasResource(java.lang.String)">hasResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isInvalidationRunnerActive()">isInvalidationRunnerActive</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isLegacyModeEnabled()">isLegacyModeEnabled</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isObjectRegistered(org.eclipse.emf.cdo.common.id.CDOID)">isObjectRegistered</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#lockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, long)">lockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#lockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, long, boolean)">lockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryResources(org.eclipse.emf.cdo.eresource.CDOResourceFolder, java.lang.String, boolean)">queryResources</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryResourcesAsync(org.eclipse.emf.cdo.eresource.CDOResourceFolder, java.lang.String, boolean)">queryResourcesAsync</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefs(org.eclipse.emf.cdo.CDOObject, org.eclipse.emf.ecore.EReference...)">queryXRefs</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefs(java.util.Set, org.eclipse.emf.ecore.EReference...)">queryXRefs</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefsAsync(java.util.Set, org.eclipse.emf.ecore.EReference...)">queryXRefsAsync</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#reload(org.eclipse.emf.cdo.CDOObject...)">reload</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#removeObjectHandler(org.eclipse.emf.cdo.view.CDOObjectHandler)">removeObjectHandler</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranch(org.eclipse.emf.cdo.common.branch.CDOBranch)">setBranch</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint(org.eclipse.emf.cdo.common.branch.CDOBranch, long)">setBranchPoint</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint(org.eclipse.emf.cdo.common.branch.CDOBranchPoint)">setBranchPoint</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setResourcePathCache(java.util.Map)">setResourcePathCache</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setTimeStamp(long)">setTimeStamp</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects()">unlockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType)">unlockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, boolean)">unlockObjects</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_org.eclipse.emf.cdo.common.CDOCommonView"><!-- --></A>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOView.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOView.html
index 62395a3342..7dd82babed 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOView.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/InternalCDOView.html
@@ -216,6 +216,14 @@ If the meaning of this type isn't clear, there really should be more of a descri
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><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>&nbsp;delta)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#collectViewedRevisions(java.util.Map)">collectViewedRevisions</A></B>(<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>&lt;<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>&gt;&nbsp;revisions)</CODE>
<BR>
@@ -375,6 +383,20 @@ If the meaning of this type isn't clear, there really should be more of a descri
boolean&nbsp;async)</CODE>
<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;<I>As of 4.2. use <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#invalidate(org.eclipse.emf.cdo.common.branch.CDOBranch, long, java.util.List, java.util.List, java.util.Map, boolean, boolean)"><CODE>invalidate(CDOBranch, long, List, List, Map, boolean, boolean)</CODE></A></I></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#invalidate(org.eclipse.emf.cdo.common.branch.CDOBranch, long, java.util.List, java.util.List, java.util.Map, boolean, boolean)">invalidate</A></B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A>&nbsp;branch,
+ long&nbsp;lastUpdateTime,
+ <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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionKey.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionKey</A>&gt;&nbsp;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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDOIDAndVersion.html" title="interface in org.eclipse.emf.cdo.common.revision">CDOIDAndVersion</A>&gt;&nbsp;allDetachedObjects,
+ <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>&lt;<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>&gt;&nbsp;oldRevisions,
+ boolean&nbsp;async,
+ boolean&nbsp;clearResourcePathCache)</CODE>
+
+<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
@@ -501,7 +523,7 @@ If the meaning of this type isn't clear, there really should be more of a descri
<TH ALIGN="left"><B>Methods inherited from interface org.eclipse.emf.cdo.view.<A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</A></B></TH>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#addObjectHandler(org.eclipse.emf.cdo.view.CDOObjectHandler)">addObjectHandler</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#compareRevisions(org.eclipse.emf.cdo.common.branch.CDOBranchPoint)">compareRevisions</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#createQuery(java.lang.String, java.lang.String)">createQuery</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#createQuery(java.lang.String, java.lang.String, java.lang.Object)">createQuery</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#disableDurableLocking(boolean)">disableDurableLocking</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#enableDurableLocking()">enableDurableLocking</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#enableDurableLocking(boolean)">enableDurableLocking</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getBinaryResource(java.lang.String)">getBinaryResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject(org.eclipse.emf.cdo.common.id.CDOID)">getObject</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject(org.eclipse.emf.cdo.common.id.CDOID, boolean)">getObject</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject(T)">getObject</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObjectHandlers()">getObjectHandlers</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResource(java.lang.String)">getResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResource(java.lang.String, boolean)">getResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceNode(java.lang.String)">getResourceNode</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceSet()">getResourceSet</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getRootResource()">getRootResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getTextResource(java.lang.String)">getTextResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getURIHandler()">getURIHandler</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#hasConflict()">hasConflict</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#hasResource(java.lang.String)">hasResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isDirty()">isDirty</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isInvalidationRunnerActive()">isInvalidationRunnerActive</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isLegacyModeEnabled()">isLegacyModeEnabled</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isObjectRegistered(org.eclipse.emf.cdo.common.id.CDOID)">isObjectRegistered</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#lockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, long)">lockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#lockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, long, boolean)">lockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#options()">options</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryResources(org.eclipse.emf.cdo.eresource.CDOResourceFolder, java.lang.String, boolean)">queryResources</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryResourcesAsync(org.eclipse.emf.cdo.eresource.CDOResourceFolder, java.lang.String, boolean)">queryResourcesAsync</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefs(org.eclipse.emf.cdo.CDOObject, org.eclipse.emf.ecore.EReference...)">queryXRefs</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefs(java.util.Set, org.eclipse.emf.ecore.EReference...)">queryXRefs</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefsAsync(java.util.Set, org.eclipse.emf.ecore.EReference...)">queryXRefsAsync</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#reload(org.eclipse.emf.cdo.CDOObject...)">reload</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#removeObjectHandler(org.eclipse.emf.cdo.view.CDOObjectHandler)">removeObjectHandler</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranch(org.eclipse.emf.cdo.common.branch.CDOBranch)">setBranch</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint(org.eclipse.emf.cdo.common.branch.CDOBranch, long)">setBranchPoint</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint(org.eclipse.emf.cdo.common.branch.CDOBranchPoint)">setBranchPoint</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setTimeStamp(long)">setTimeStamp</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects()">unlockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType)">unlockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, boolean)">unlockObjects</A></CODE></TD>
+<TD><CODE><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#addObjectHandler(org.eclipse.emf.cdo.view.CDOObjectHandler)">addObjectHandler</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#compareRevisions(org.eclipse.emf.cdo.common.branch.CDOBranchPoint)">compareRevisions</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#createQuery(java.lang.String, java.lang.String)">createQuery</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#createQuery(java.lang.String, java.lang.String, java.lang.Object)">createQuery</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#disableDurableLocking(boolean)">disableDurableLocking</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#enableDurableLocking()">enableDurableLocking</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#enableDurableLocking(boolean)">enableDurableLocking</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getBinaryResource(java.lang.String)">getBinaryResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject(org.eclipse.emf.cdo.common.id.CDOID)">getObject</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject(org.eclipse.emf.cdo.common.id.CDOID, boolean)">getObject</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObject(T)">getObject</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getObjectHandlers()">getObjectHandlers</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResource(java.lang.String)">getResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResource(java.lang.String, boolean)">getResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceFolder(java.lang.String)">getResourceFolder</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceNode(java.lang.String)">getResourceNode</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getResourceSet()">getResourceSet</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getRootResource()">getRootResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getTextResource(java.lang.String)">getTextResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#getURIHandler()">getURIHandler</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#hasConflict()">hasConflict</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#hasResource(java.lang.String)">hasResource</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isDirty()">isDirty</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isInvalidationRunnerActive()">isInvalidationRunnerActive</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isLegacyModeEnabled()">isLegacyModeEnabled</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#isObjectRegistered(org.eclipse.emf.cdo.common.id.CDOID)">isObjectRegistered</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#lockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, long)">lockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#lockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, long, boolean)">lockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#options()">options</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryResources(org.eclipse.emf.cdo.eresource.CDOResourceFolder, java.lang.String, boolean)">queryResources</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryResourcesAsync(org.eclipse.emf.cdo.eresource.CDOResourceFolder, java.lang.String, boolean)">queryResourcesAsync</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefs(org.eclipse.emf.cdo.CDOObject, org.eclipse.emf.ecore.EReference...)">queryXRefs</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefs(java.util.Set, org.eclipse.emf.ecore.EReference...)">queryXRefs</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#queryXRefsAsync(java.util.Set, org.eclipse.emf.ecore.EReference...)">queryXRefsAsync</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#reload(org.eclipse.emf.cdo.CDOObject...)">reload</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#removeObjectHandler(org.eclipse.emf.cdo.view.CDOObjectHandler)">removeObjectHandler</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranch(org.eclipse.emf.cdo.common.branch.CDOBranch)">setBranch</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint(org.eclipse.emf.cdo.common.branch.CDOBranch, long)">setBranchPoint</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setBranchPoint(org.eclipse.emf.cdo.common.branch.CDOBranchPoint)">setBranchPoint</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setResourcePathCache(java.util.Map)">setResourcePathCache</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#setTimeStamp(long)">setTimeStamp</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects()">unlockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType)">unlockObjects</A>, <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html#unlockObjects(java.util.Collection, org.eclipse.net4j.util.concurrent.IRWLockManager.LockType, boolean)">unlockObjects</A></CODE></TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_org.eclipse.emf.cdo.common.CDOCommonView"><!-- --></A>
@@ -796,19 +818,42 @@ void <B>handleObjectStateChanged</B>(<A HREF="../../../../../org/eclipse/emf/spi
<A NAME="invalidate(org.eclipse.emf.cdo.common.branch.CDOBranch, long, java.util.List, java.util.List, java.util.Map, boolean)"><!-- --></A><H3>
invalidate</H3>
<PRE>
+<FONT SIZE="-1"><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>
+</FONT>void <B>invalidate</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A>&nbsp;branch,
+ long&nbsp;lastUpdateTime,
+ <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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionKey.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionKey</A>&gt;&nbsp;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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDOIDAndVersion.html" title="interface in org.eclipse.emf.cdo.common.revision">CDOIDAndVersion</A>&gt;&nbsp;allDetachedObjects,
+ <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>&lt;<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>&gt;&nbsp;oldRevisions,
+ boolean&nbsp;async)</PRE>
+<DL>
+<DD><B>Deprecated.</B>&nbsp;<I>As of 4.2. use <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html#invalidate(org.eclipse.emf.cdo.common.branch.CDOBranch, long, java.util.List, java.util.List, java.util.Map, boolean, boolean)"><CODE>invalidate(CDOBranch, long, List, List, Map, boolean, boolean)</CODE></A></I>
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="invalidate(org.eclipse.emf.cdo.common.branch.CDOBranch, long, java.util.List, java.util.List, java.util.Map, boolean, boolean)"><!-- --></A><H3>
+invalidate</H3>
+<PRE>
void <B>invalidate</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A>&nbsp;branch,
long&nbsp;lastUpdateTime,
<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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionKey.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisionKey</A>&gt;&nbsp;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>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDOIDAndVersion.html" title="interface in org.eclipse.emf.cdo.common.revision">CDOIDAndVersion</A>&gt;&nbsp;allDetachedObjects,
<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>&lt;<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>&gt;&nbsp;oldRevisions,
- boolean&nbsp;async)</PRE>
+ boolean&nbsp;async,
+ boolean&nbsp;clearResourcePathCache)</PRE>
<DL>
<DD><DL>
</DL>
</DD>
<DD><DL>
<DT><B>Since:</B></DT>
- <DD>4.0</DD>
+ <DD>4.2</DD>
</DL>
</DD>
</DL>
@@ -860,6 +905,22 @@ void <B>remapObject</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/id/CD
</DL>
<HR>
+<A NAME="clearResourcePathCacheIfNecessary(org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta)"><!-- --></A><H3>
+clearResourcePathCacheIfNecessary</H3>
+<PRE>
+void <B>clearResourcePathCacheIfNecessary</B>(<A HREF="../../../../../org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta">CDORevisionDelta</A>&nbsp;delta)</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+<DT><B>Since:</B></DT>
+ <DD>4.2</DD>
+</DL>
+</DD>
+</DL>
+<HR>
+
<A NAME="getResourceNodeID(java.lang.String)"><!-- --></A><H3>
getResourceNodeID</H3>
<PRE>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOSession.MergeData.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOSession.MergeData.html
new file mode 100644
index 0000000000..e10ba7a07b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOSession.MergeData.html
@@ -0,0 +1,182 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+
+<TITLE>
+Uses of Class org.eclipse.emf.spi.cdo.InternalCDOSession.MergeData (CDO Model Repository Documentation)
+</TITLE>
+
+<META NAME="date" CONTENT="">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../html/book.css" TITLE="Style">
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Uses of Class org.eclipse.emf.spi.cdo.InternalCDOSession.MergeData (CDO Model Repository Documentation)";
+ }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+ <TR ALIGN="center" VALIGN="top">
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+ </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+ <A HREF="../../../../../../index.html?org/eclipse/emf/spi/cdo/\class-useInternalCDOSession.MergeData.html" target="_top"><B>FRAMES</B></A> &nbsp;
+&nbsp;<A HREF="InternalCDOSession.MergeData.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+ <!--
+ if(window==top) {
+ document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+ }
+ //-->
+</SCRIPT>
+<NOSCRIPT>
+ <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+<B>Uses of Class<br>org.eclipse.emf.spi.cdo.InternalCDOSession.MergeData</B></H2>
+</CENTER>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Packages that use <A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><A HREF="#org.eclipse.emf.spi.cdo"><B>org.eclipse.emf.spi.cdo</B></A></TD>
+<TD>Client service provider interfaces and useful base implementations.&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="org.eclipse.emf.spi.cdo"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+Uses of <A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</A> in <A HREF="../../../../../../org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</A></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="2">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/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</A></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</A></CODE></FONT></TD>
+<TD><CODE><B>InternalCDOSession.</B><B><A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#getMergeData(org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, boolean)">getMergeData</A></B>(<A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;target,
+ <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;source,
+ <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>&nbsp;sourceBase,
+ boolean&nbsp;computeChangeSets)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+ <TR ALIGN="center" VALIGN="top">
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+ <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1"> <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+ </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+ <A HREF="../../../../../../index.html?org/eclipse/emf/spi/cdo/\class-useInternalCDOSession.MergeData.html" target="_top"><B>FRAMES</B></A> &nbsp;
+&nbsp;<A HREF="InternalCDOSession.MergeData.html" target="_top"><B>NO FRAMES</B></A> &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+ <!--
+ if(window==top) {
+ document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+ }
+ //-->
+</SCRIPT>
+<NOSCRIPT>
+ <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+<i>Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.</i>
+</BODY>
+</HTML>
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 3e6a92eb50..a8547c3d6e 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
@@ -191,6 +191,16 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransactio
<A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</A>&nbsp;sender)</CODE>
<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<B>Deprecated.</B>&nbsp;<I>As of 4.2 use <A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#invalidate(org.eclipse.emf.cdo.common.commit.CDOCommitInfo, org.eclipse.emf.spi.cdo.InternalCDOTransaction, boolean)"><CODE>InternalCDOSession.invalidate(CDOCommitInfo, InternalCDOTransaction, boolean)</CODE></A></I></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B>InternalCDOSession.</B><B><A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#invalidate(org.eclipse.emf.cdo.common.commit.CDOCommitInfo, org.eclipse.emf.spi.cdo.InternalCDOTransaction, boolean)">invalidate</A></B>(<A HREF="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A>&nbsp;commitInfo,
+ <A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</A>&nbsp;sender,
+ boolean&nbsp;clearResourcePathCache)</CODE>
+
+<BR>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html
index a97b8cd1c4..c9d283671d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html
@@ -123,6 +123,8 @@ Classes</FONT>&nbsp;
<BR>
<A HREF="FSMUtil.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">FSMUtil</A>
<BR>
+<A HREF="InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">InternalCDOSession.MergeData</A>
+<BR>
<A HREF="InternalCDOTransaction.ApplyChangeSetResult.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">InternalCDOTransaction.ApplyChangeSetResult</A>
<BR>
<A HREF="InternalCDOXATransaction.InternalCDOXACommitContext.CDOXAState.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">InternalCDOXATransaction.InternalCDOXACommitContext.CDOXAState</A></FONT></TD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html
index c8691d53ee..e430aa2a7c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html
@@ -288,6 +288,10 @@ Client service provider interfaces and useful base implementations.
<TD>If the meaning of this type isn't clear, there really should be more of a description here...</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</A></B></TD>
+<TD>A data structure that holds all input and output values of <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#getMergeData(org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, boolean)"><CODE>InternalCDOSession.getMergeData()</CODE></A>.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.ApplyChangeSetResult.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOTransaction.ApplyChangeSetResult</A></B></TD>
<TD>If the meaning of this type isn't clear, there really should be more of a description here...</TD>
</TR>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html
index dc158fc12d..20b4ef200c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html
@@ -422,6 +422,12 @@ Classes in <A HREF="../../../../../org/eclipse/emf/spi/cdo/package-summary.html"
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;If the meaning of this type isn't clear, there really should be more of a description here...</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/class-use/InternalCDOSession.MergeData.html#org.eclipse.emf.spi.cdo"><B>InternalCDOSession.MergeData</B></A></B>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A data structure that holds all input and output values of <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#getMergeData(org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, boolean)"><CODE>InternalCDOSession.getMergeData()</CODE></A>.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/class-use/InternalCDOTransaction.html#org.eclipse.emf.spi.cdo"><B>InternalCDOTransaction</B></A></B>
<BR>

Back to the top