diff options
author | Eike Stepper | 2012-11-20 08:23:58 +0000 |
---|---|---|
committer | Eike Stepper | 2012-11-20 08:23:58 +0000 |
commit | ee7c7f08f6c0a0adc3aca3e8f1d4948eed102596 (patch) | |
tree | 60fd73b2b0915eb26c65a35a782bebd0a108a383 /plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch | |
parent | 56a10a8f575b9da36bea27648964ca659b96e60f (diff) | |
download | cdo-ee7c7f08f6c0a0adc3aca3e8f1d4948eed102596.tar.gz cdo-ee7c7f08f6c0a0adc3aca3e8f1d4948eed102596.tar.xz cdo-ee7c7f08f6c0a0adc3aca3e8f1d4948eed102596.zip |
Regenerate docs
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch')
9 files changed, 350 insertions, 35 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchManager.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchManager.html index 356f70776c..a2ee15677d 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchManager.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchManager.html @@ -194,6 +194,14 @@ Manages a tree of <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/C <BR> Returns the main branch of the branch tree managed by this branch manager.</TD> </TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository</A></CODE></FONT></TD> +<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchManager.html#getRepository()">getRepository</A></B>()</CODE> + +<BR> + Returns the repository this branch manager is associated with.</TD> +</TR> </TABLE> <A NAME="methods_inherited_from_class_org.eclipse.net4j.util.event.INotifier"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> @@ -217,6 +225,24 @@ Manages a tree of <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/C </TR> </TABLE> +<A NAME="getRepository()"><!-- --></A><H3> +getRepository</H3> +<PRE> +<A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonRepository</A> <B>getRepository</B>()</PRE> +<DL> +<DD>Returns the repository this branch manager is associated with. +<P> +<DD><DL> +</DL> +</DD> +<DD><DL> +<DT><B>Since:</B></DT> + <DD>4.2</DD> +</DL> +</DD> +</DL> +<HR> + <A NAME="getMainBranch()"><!-- --></A><H3> getMainBranch</H3> <PRE> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html index 0a6ca66a74..56ab68048a 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html @@ -92,7 +92,10 @@ org.eclipse.emf.cdo.common.branch</FONT> <BR> Interface CDOBranchPoint</H2> <DL> -<DT><B>All Known Subinterfaces:</B> <DD><A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchTag.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchTag</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonTransaction.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonTransaction</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonView</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockChangeInfo</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisable.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisable</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevision</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.html" title="interface in org.eclipse.emf.cdo.session">CDOSessionInvalidationEvent</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/session/CDOSessionLocksChangedEvent.html" title="interface in org.eclipse.emf.cdo.session">CDOSessionLocksChangedEvent</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/view/CDOViewLocksChangedEvent.html" title="interface in org.eclipse.emf.cdo.view">CDOViewLocksChangedEvent</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html" title="interface in org.eclipse.emf.cdo.common.lock">IDurableLockingManager.LockArea</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</A>, <A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</A>, <A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/server/InternalTransaction.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalTransaction</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/server/InternalView.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalView</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/server/IQueryContext.html" title="interface in org.eclipse.emf.cdo.server">IQueryContext</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.QueryResourcesContext.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.QueryResourcesContext</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.QueryResourcesContext.ExactMatch.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.QueryResourcesContext.ExactMatch</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.QueryXRefsContext.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.QueryXRefsContext</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/server/ITransaction.html" title="interface in org.eclipse.emf.cdo.server">ITransaction</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/server/IView.html" title="interface in org.eclipse.emf.cdo.server">IView</A></DD> +<DT><B>All Superinterfaces:</B> <DD><A HREF="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</A></DD> +</DL> +<DL> +<DT><B>All Known Subinterfaces:</B> <DD><A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchTag.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchTag</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.TriggerLoadElement.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitHistory.TriggerLoadElement</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonTransaction.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonTransaction</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common">CDOCommonView</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/CDOLockChangeInfo.html" title="interface in org.eclipse.emf.cdo.common.lock">CDOLockChangeInfo</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevisable.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevisable</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision">CDORevision</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.html" title="interface in org.eclipse.emf.cdo.session">CDOSessionInvalidationEvent</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/session/CDOSessionLocksChangedEvent.html" title="interface in org.eclipse.emf.cdo.session">CDOSessionLocksChangedEvent</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/view/CDOViewLocksChangedEvent.html" title="interface in org.eclipse.emf.cdo.view">CDOViewLocksChangedEvent</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/lock/IDurableLockingManager.LockArea.html" title="interface in org.eclipse.emf.cdo.common.lock">IDurableLockingManager.LockArea</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/common/revision/InternalCDORevision.html" title="interface in org.eclipse.emf.cdo.spi.common.revision">InternalCDORevision</A>, <A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOTransaction</A>, <A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOView.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOView</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/server/InternalTransaction.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalTransaction</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/server/InternalView.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalView</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/server/IQueryContext.html" title="interface in org.eclipse.emf.cdo.server">IQueryContext</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.QueryResourcesContext.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.QueryResourcesContext</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.QueryResourcesContext.ExactMatch.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.QueryResourcesContext.ExactMatch</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/server/IStoreAccessor.QueryXRefsContext.html" title="interface in org.eclipse.emf.cdo.server">IStoreAccessor.QueryXRefsContext</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/server/ITransaction.html" title="interface in org.eclipse.emf.cdo.server">ITransaction</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/server/IView.html" title="interface in org.eclipse.emf.cdo.server">IView</A></DD> </DL> <DL> <DT><B>All Known Implementing Classes:</B> <DD><A HREF="../../../../../../org/eclipse/emf/cdo/spi/common/revision/AbstractCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">AbstractCDORevision</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/common/revision/BaseCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">BaseCDORevision</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/common/commit/CDOChangeSetSegment.html" title="class in org.eclipse.emf.cdo.spi.common.commit">CDOChangeSetSegment</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A>, <A HREF="../../../../../../org/eclipse/emf/spi/cdo/CDOSessionProtocol.CommitTransactionResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.CommitTransactionResult</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/common/revision/DelegatingCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">DelegatingCDORevision</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/server/DelegatingQueryResourcesContext.html" title="class in org.eclipse.emf.cdo.spi.server">DelegatingQueryResourcesContext</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/common/revision/DetachedCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">DetachedCDORevision</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/server/DurableLockArea.html" title="class in org.eclipse.emf.cdo.spi.server">DurableLockArea</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/common/revision/PointerCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">PointerCDORevision</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/common/revision/StubCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">StubCDORevision</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/spi/common/revision/SyntheticCDORevision.html" title="class in org.eclipse.emf.cdo.spi.common.revision">SyntheticCDORevision</A></DD> @@ -100,24 +103,26 @@ Interface CDOBranchPoint</H2> <HR> <DL> <DT>public interface <B>CDOBranchPoint</B> + <DD>extends <A HREF="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</A> </DL> <map id="APIVIZ" name="APIVIZ"> -<area shape="rect" id="node1" href="../../spi/common/commit/CDOChangeSetSegment.html" title="CDOChangeSetSegment (org.eclipse.emf.cdo.spi.common.commit)" alt="" coords="587,64,853,104"/> -<area shape="rect" id="node2" href="../../../spi/cdo/CDOSessionProtocol.CommitTransactionResult.html" title="CDOSessionProtocol.CommitTransactionResult (org.eclipse.emf.spi.cdo)" alt="" coords="571,123,869,163"/> -<area shape="rect" id="node3" href="CDOBranch.html" title="«interface» CDOBranch" alt="" coords="675,5,765,45"/> -<area shape="rect" id="node4" href="CDOBranchPoint.html" title="«interface» CDOBranchPoint" alt="" coords="289,305,410,345"/> -<area shape="rect" id="node5" href="CDOBranchPointRange.html" title="«interface» CDOBranchPointRange" alt="" coords="6,305,165,345"/> -<area shape="rect" id="node6" href="CDOBranchTag.html" title="«interface» CDOBranchTag" alt="" coords="664,181,776,221"/> -<area shape="rect" id="node7" href="../commit/CDOCommitInfo.html" title="«interface» CDOCommitInfo (org.eclipse.emf.cdo.common.commit)" alt="" coords="598,241,842,295"/> -<area shape="rect" id="node8" href="../CDOCommonView.html" title="«interface» CDOCommonView (org.eclipse.emf.cdo.common)" alt="" coords="621,314,819,369"/> -<area shape="rect" id="node9" href="../lock/CDOLockChangeInfo.html" title="«interface» CDOLockChangeInfo (org.eclipse.emf.cdo.common.lock)" alt="" coords="607,387,833,442"/> -<area shape="rect" id="node10" href="../revision/CDORevisable.html" title="«interface» CDORevisable (org.eclipse.emf.cdo.common.revision)" alt="" coords="598,461,842,515"/> -<area shape="rect" id="node11" href="../lock/IDurableLockingManager.LockArea.html" title="«interface» IDurableLockingManager.LockArea (org.eclipse.emf.cdo.common.lock)" alt="" coords="607,534,833,589"/> -<area shape="rect" id="node12" href="../../server/IQueryContext.html" title="«interface» IQueryContext (org.eclipse.emf.cdo.server)" alt="" coords="629,607,811,662"/> -<area shape="rect" id="node13" href="../../server/IStoreAccessor.QueryResourcesContext.html" title="«interface» IStoreAccessor.QueryResourcesContext (org.eclipse.emf.cdo.server)" alt="" coords="591,681,849,735"/> -<area shape="rect" id="node14" href="../../server/IStoreAccessor.QueryXRefsContext.html" title="«interface» IStoreAccessor.QueryXRefsContext (org.eclipse.emf.cdo.server)" alt="" coords="606,754,834,809"/> -<area shape="rect" id="node15" href="../../spi/common/branch/CDOBranchUtil.html" title="«static» CDOBranchUtil (org.eclipse.emf.cdo.spi.common.branch)" alt="" coords="589,827,851,882"/> +<area shape="rect" id="node1" href="../../spi/common/commit/CDOChangeSetSegment.html" title="CDOChangeSetSegment (org.eclipse.emf.cdo.spi.common.commit)" alt="" coords="646,64,911,104"/> +<area shape="rect" id="node2" href="../../../spi/cdo/CDOSessionProtocol.CommitTransactionResult.html" title="CDOSessionProtocol.CommitTransactionResult (org.eclipse.emf.spi.cdo)" alt="" coords="629,123,928,163"/> +<area shape="rect" id="node3" href="CDOBranch.html" title="«interface» CDOBranch" alt="" coords="733,5,824,45"/> +<area shape="rect" id="node4" href="CDOBranchPoint.html" title="«interface» CDOBranchPoint" alt="" coords="347,304,469,344"/> +<area shape="rect" id="node5" href="CDOBranchPointRange.html" title="«interface» CDOBranchPointRange" alt="" coords="35,269,194,309"/> +<area shape="rect" id="node6" href="CDOBranchTag.html" title="«interface» CDOBranchTag" alt="" coords="723,181,835,221"/> +<area shape="rect" id="node7" href="../commit/CDOCommitInfo.html" title="«interface» CDOCommitInfo (org.eclipse.emf.cdo.common.commit)" alt="" coords="657,241,901,295"/> +<area shape="rect" id="node8" href="../CDOCommonView.html" title="«interface» CDOCommonView (org.eclipse.emf.cdo.common)" alt="" coords="680,314,877,369"/> +<area shape="rect" id="node9" href="../lock/CDOLockChangeInfo.html" title="«interface» CDOLockChangeInfo (org.eclipse.emf.cdo.common.lock)" alt="" coords="666,387,891,442"/> +<area shape="rect" id="node10" href="../revision/CDORevisable.html" title="«interface» CDORevisable (org.eclipse.emf.cdo.common.revision)" alt="" coords="657,461,901,515"/> +<area shape="rect" id="node11" href="../util/CDOTimeProvider.html" title="«interface» CDOTimeProvider (org.eclipse.emf.cdo.common.util)" alt="" coords="5,333,224,387"/> +<area shape="rect" id="node12" href="../lock/IDurableLockingManager.LockArea.html" title="«interface» IDurableLockingManager.LockArea (org.eclipse.emf.cdo.common.lock)" alt="" coords="666,534,891,589"/> +<area shape="rect" id="node13" href="../../server/IQueryContext.html" title="«interface» IQueryContext (org.eclipse.emf.cdo.server)" alt="" coords="688,607,869,662"/> +<area shape="rect" id="node14" href="../../server/IStoreAccessor.QueryResourcesContext.html" title="«interface» IStoreAccessor.QueryResourcesContext (org.eclipse.emf.cdo.server)" alt="" coords="650,681,907,735"/> +<area shape="rect" id="node15" href="../../server/IStoreAccessor.QueryXRefsContext.html" title="«interface» IStoreAccessor.QueryXRefsContext (org.eclipse.emf.cdo.server)" alt="" coords="665,754,893,809"/> +<area shape="rect" id="node16" href="../../spi/common/branch/CDOBranchUtil.html" title="«static» CDOBranchUtil (org.eclipse.emf.cdo.spi.common.branch)" alt="" coords="648,827,909,882"/> </map> <CENTER><IMG SRC="CDOBranchPoint.png" USEMAP="#APIVIZ" BORDER="0"></CENTER> @@ -258,6 +263,9 @@ getBranch</H3> <DD><DL> </DL> </DD> +<DD><DL> +</DL> +</DD> </DL> <HR> @@ -270,6 +278,9 @@ long <B>getTimeStamp</B>()</PRE> <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#UNSPECIFIED_DATE"><CODE>unspecified</CODE></A></i> if this branch point marks the <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead()"><CODE>head</CODE></A> of a branch. <P> <DD><DL> +<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html#getTimeStamp()">getTimeStamp</A></CODE> in interface <CODE><A HREF="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</A></CODE></DL> +</DD> +<DD><DL> </DL> </DD> </DL> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.png Binary files differindex fc8c850a9c..72532c7bc5 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.png +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.png diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchTag.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchTag.html index ebeea4bea7..a314821f43 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchTag.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchTag.html @@ -92,7 +92,7 @@ org.eclipse.emf.cdo.common.branch</FONT> <BR> Interface CDOBranchTag</H2> <DL> -<DT><B>All Superinterfaces:</B> <DD><A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A></DD> +<DT><B>All Superinterfaces:</B> <DD><A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A>, <A HREF="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</A></DD> </DL> <HR> <DL> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html index f9b698b145..17e7283b42 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html @@ -150,6 +150,10 @@ Packages that use <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branc <TD>Client concepts for dealing with transactions, distributed transactions and their save points. </TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> +<TD><A HREF="#org.eclipse.emf.cdo.ui"><B>org.eclipse.emf.cdo.ui</B></A></TD> +<TD>Reusable UI components specific to the CDO Model Repository. </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> <TD><A HREF="#org.eclipse.emf.cdo.ui.ide"><B>org.eclipse.emf.cdo.ui.ide</B></A></TD> <TD>Reusable UI IDE components specific to the CDO Model Repository. </TD> </TR> @@ -300,10 +304,44 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc <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/cdo/common/commit/package-summary.html">org.eclipse.emf.cdo.common.commit</A> that return <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A></FONT></TH> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A></CODE></FONT></TD> +<TD><CODE><B>CDOCommitHistory.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html#getBranch()">getBranch</A></B>()</CODE> + +<BR> + </TD> +</TR> +</TABLE> + +<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/cdo/common/commit/package-summary.html">org.eclipse.emf.cdo.common.commit</A> with parameters of type <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A></FONT></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A></CODE></FONT></TD> +<TD><CODE><B>CDOCommitInfoManager.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getBaseOfBranch(org.eclipse.emf.cdo.common.branch.CDOBranch)">getBaseOfBranch</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch)</CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A></CODE></FONT></TD> +<TD><CODE><B>CDOCommitInfoManager.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getCommitInfo(org.eclipse.emf.cdo.common.branch.CDOBranch, long, boolean)">getCommitInfo</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch, + long startTime, + boolean up)</CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> void</CODE></FONT></TD> <TD><CODE><B>CDOCommitInfoManager.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getCommitInfos(org.eclipse.emf.cdo.common.branch.CDOBranch, long, long, org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler)">getCommitInfos</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch, long startTime, @@ -318,14 +356,30 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc <CODE> void</CODE></FONT></TD> <TD><CODE><B>CDOCommitInfoManager.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getCommitInfos(org.eclipse.emf.cdo.common.branch.CDOBranch, long, java.lang.String, java.lang.String, int, org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler)">getCommitInfos</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch, long startTime, - <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> userID, - <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> comment, + <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> reserved1, + <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> reserved2, int count, <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoHandler.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfoHandler</A> handler)</CODE> <BR> </TD> </TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A></CODE></FONT></TD> +<TD><CODE><B>CDOCommitInfoManager.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getFirstOfBranch(org.eclipse.emf.cdo.common.branch.CDOBranch)">getFirstOfBranch</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch)</CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A></CODE></FONT></TD> +<TD><CODE><B>CDOCommitInfoManager.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html#getLastOfBranch(org.eclipse.emf.cdo.common.branch.CDOBranch)">getLastOfBranch</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch)</CODE> + +<BR> + </TD> +</TR> </TABLE> <P> @@ -924,6 +978,23 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc </TABLE> <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/cdo/spi/common/branch/package-summary.html">org.eclipse.emf.cdo.spi.common.branch</A> with parameters of type <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A></FONT></TH> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static <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>CDOBranchUtil.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#normalizeBranchPoint(org.eclipse.emf.cdo.common.branch.CDOBranch, long)">normalizeBranchPoint</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch, + long timeStamp)</CODE> + +<BR> + </TD> +</TR> +</TABLE> + +<P> <A NAME="org.eclipse.emf.cdo.spi.common.commit"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> @@ -1364,6 +1435,14 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> <A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</A>[]</CODE></FONT></TD> +<TD><CODE><B>CDOTransactionContainer.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionContainer.html#getTransactions(org.eclipse.emf.cdo.common.branch.CDOBranch)">getTransactions</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch)</CODE> + +<BR> + Returns an array of all <A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transactions</CODE></A> of this session that are open on the given branch.</TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> <A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</A></CODE></FONT></TD> <TD><CODE><B>CDOTransactionContainer.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionContainer.html#openTransaction(org.eclipse.emf.cdo.common.branch.CDOBranch)">openTransaction</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch)</CODE> @@ -1399,6 +1478,48 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc </TABLE> <P> +<A NAME="org.eclipse.emf.cdo.ui"><!-- --></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/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> in <A HREF="../../../../../../../org/eclipse/emf/cdo/ui/package-summary.html">org.eclipse.emf.cdo.ui</A></FONT></TH> +</TR> +</TABLE> + +<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/cdo/ui/package-summary.html">org.eclipse.emf.cdo.ui</A> with parameters of type <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A></FONT></TH> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> void</CODE></FONT></TD> +<TD><CODE><B>CDOItemProvider.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/ui/CDOItemProvider.html#fillBranch(org.eclipse.jface.action.IMenuManager, org.eclipse.emf.cdo.common.branch.CDOBranch)">fillBranch</A></B>(<A HREF="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api/org/eclipse/jface/action/IMenuManager.html?is-external=true" title="class or interface in org.eclipse.jface.action">IMenuManager</A> manager, + <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch)</CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>protected <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>[]</CODE></FONT></TD> +<TD><CODE><B>CDOItemProvider.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/ui/CDOItemProvider.html#getChildren(org.eclipse.emf.cdo.common.branch.CDOBranch)">getChildren</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch)</CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>protected boolean</CODE></FONT></TD> +<TD><CODE><B>CDOItemProvider.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/ui/CDOItemProvider.html#hasChildren(org.eclipse.emf.cdo.common.branch.CDOBranch)">hasChildren</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch)</CODE> + +<BR> + </TD> +</TR> +</TABLE> + +<P> <A NAME="org.eclipse.emf.cdo.ui.ide"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> @@ -1456,6 +1577,14 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A></CODE></FONT></TD> +<TD><CODE><B>CommitHistoryComposite.Input.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.Input.html#getBranch()">getBranch</A></B>()</CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A></CODE></FONT></TD> <TD><CODE><B>SelectBranchComposite.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/ui/widgets/SelectBranchComposite.html#getBranch()">getBranch</A></B>()</CODE> <BR> @@ -1469,6 +1598,14 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc <BR> </TD> </TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A></CODE></FONT></TD> +<TD><CODE><B>CommitHistoryComposite.LabelProvider.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.LabelProvider.html#getInputBranch()">getInputBranch</A></B>()</CODE> + +<BR> + </TD> +</TR> </TABLE> <P> @@ -1487,6 +1624,16 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>protected <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitHistory</A></CODE></FONT></TD> +<TD><CODE><B>CommitHistoryComposite.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.html#createHistory(org.eclipse.emf.cdo.session.CDOSession, org.eclipse.emf.cdo.common.branch.CDOBranch, org.eclipse.emf.cdo.CDOObject)">createHistory</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session">CDOSession</A> session, + <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch, + <A HREF="../../../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</A> object)</CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE>protected <A HREF="../../../../../../../org/eclipse/emf/cdo/ui/widgets/SelectBranchComposite.html" title="class in org.eclipse.emf.cdo.ui.widgets">SelectBranchComposite</A></CODE></FONT></TD> <TD><CODE><B>ComposeBranchPointComposite.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.html#createSelectBranchComposite(org.eclipse.emf.cdo.session.CDOSession, org.eclipse.emf.cdo.common.branch.CDOBranch)">createSelectBranchComposite</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session">CDOSession</A> session, <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch)</CODE> @@ -1511,6 +1658,14 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc <BR> </TD> </TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> void</CODE></FONT></TD> +<TD><CODE><B>CommitHistoryComposite.LabelProvider.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.LabelProvider.html#setInputBranch(org.eclipse.emf.cdo.common.branch.CDOBranch)">setInputBranch</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> inputBranch)</CODE> + +<BR> + </TD> +</TR> </TABLE> <P> @@ -1520,6 +1675,14 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc <TH ALIGN="left" COLSPAN="2">Constructors in <A HREF="../../../../../../../org/eclipse/emf/cdo/ui/widgets/package-summary.html">org.eclipse.emf.cdo.ui.widgets</A> with parameters of type <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A></FONT></TH> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> +<TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.Input.html#CommitHistoryComposite.Input(org.eclipse.emf.cdo.session.CDOSession, org.eclipse.emf.cdo.common.branch.CDOBranch, org.eclipse.emf.cdo.CDOObject)">CommitHistoryComposite.Input</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session">CDOSession</A> session, + <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch, + <A HREF="../../../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</A> object)</CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/cdo/ui/widgets/SelectBranchComposite.html#SelectBranchComposite(org.eclipse.swt.widgets.Composite, int, org.eclipse.emf.cdo.session.CDOSession, org.eclipse.emf.cdo.common.branch.CDOBranch)">SelectBranchComposite</A></B>(<A HREF="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/widgets/Composite.html?is-external=true" title="class or interface in org.eclipse.swt.widgets">Composite</A> parent, int style, <A HREF="../../../../../../../org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session">CDOSession</A> session, @@ -1529,6 +1692,16 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc </TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> +<TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/cdo/ui/widgets/SelectBranchComposite.html#SelectBranchComposite(org.eclipse.swt.widgets.Composite, int, org.eclipse.emf.cdo.session.CDOSession, org.eclipse.emf.cdo.common.branch.CDOBranch, boolean)">SelectBranchComposite</A></B>(<A HREF="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/widgets/Composite.html?is-external=true" title="class or interface in org.eclipse.swt.widgets">Composite</A> parent, + int style, + <A HREF="../../../../../../../org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session">CDOSession</A> session, + <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch, + boolean withHistory)</CODE> + +<BR> + </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> <TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.html#SelectTimeStampComposite(org.eclipse.swt.widgets.Composite, int, org.eclipse.emf.cdo.common.branch.CDOBranch, long)">SelectTimeStampComposite</A></B>(<A HREF="http://help.eclipse.org/topic//org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/widgets/Composite.html?is-external=true" title="class or interface in org.eclipse.swt.widgets">Composite</A> parent, int style, <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch, @@ -1583,6 +1756,14 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> <A HREF="../../../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</A>[]</CODE></FONT></TD> +<TD><CODE><B>CDOViewContainer.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/view/CDOViewContainer.html#getViews(org.eclipse.emf.cdo.common.branch.CDOBranch)">getViews</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch)</CODE> + +<BR> + Returns an array of all <A HREF="../../../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>views</CODE></A> and <A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transactions</CODE></A> of this session that are open on the given branch.</TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> <A HREF="../../../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</A></CODE></FONT></TD> <TD><CODE><B>CDOViewContainer.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/view/CDOViewContainer.html#openView(org.eclipse.emf.cdo.common.branch.CDOBranch)">openView</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch)</CODE> @@ -1670,7 +1851,7 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc <A HREF="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/om/monitor/OMMonitor.html?is-external=true" title="class or interface in org.eclipse.net4j.util.om.monitor">OMMonitor</A> monitor)</CODE> <BR> - <B>Deprecated.</B> <I>Not called anymore. Use <CODE>CDOSessionProtocol#commitDelegation(InternalCDOCommitContext, OMMonitor)</CODE> instead.</I></TD> + <B>Deprecated.</B> <I>Not called anymore. Use <CODE>#commitDelegation(InternalCDOCommitContext, OMMonitor)</CODE> instead.</I></TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> @@ -1751,7 +1932,7 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc long timeout)</CODE> <BR> - <B>Deprecated.</B> <I>Not called anymore. Use <CODE>CDOSessionProtocol#lockObjects2(List, int, CDOBranch, LockType, boolean, long)</CODE> instead.</I></TD> + <B>Deprecated.</B> <I>Not called anymore. Use <CODE>#lockObjects2(List, int, CDOBranch, LockType, boolean, long)</CODE> instead.</I></TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html index 309d700f06..e515ef85b1 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html @@ -166,6 +166,10 @@ Packages that use <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branc <TD>Client concepts for dealing with transactions, distributed transactions and their save points. </TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> +<TD><A HREF="#org.eclipse.emf.cdo.ui.compare"><B>org.eclipse.emf.cdo.ui.compare</B></A></TD> +<TD> </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> <TD><A HREF="#org.eclipse.emf.cdo.ui.widgets"><B>org.eclipse.emf.cdo.ui.widgets</B></A></TD> <TD>A library with reusable widgets. </TD> </TR> @@ -317,6 +321,16 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static interface</CODE></FONT></TD> +<TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.TriggerLoadElement.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitHistory.TriggerLoadElement</A></B></CODE> + +<BR> + A virtual <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>history</CODE></A> element that can be returned from <A HREF="../../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html?is-external=true#getElements()" title="class or interface in org.eclipse.net4j.util.container"><CODE>IContainer.getElements()</CODE></A> + if <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html#isAppendingTriggerLoadElement()"><CODE>CDOCommitHistory.isAppendingTriggerLoadElement()</CODE></A> is <code>true</code> to indicate that + the history is not <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitHistory.html#isFull()"><CODE>fully</CODE></A> loaded, yet.</TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> <CODE> interface</CODE></FONT></TD> <TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A></B></CODE> @@ -628,7 +642,7 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> -<CODE>static <A HREF="../../../../../../../org/eclipse/emf/cdo/compare/CloseableComparison.html" title="interface in org.eclipse.emf.cdo.compare">CloseableComparison</A></CODE></FONT></TD> +<CODE>static <A HREF="../../../../../../../org/eclipse/emf/cdo/compare/CDOComparison.html" title="class in org.eclipse.emf.cdo.compare">CDOComparison</A></CODE></FONT></TD> <TD><CODE><B>CDOCompareUtil.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/compare/CDOCompareUtil.html#compare(org.eclipse.emf.cdo.view.CDOView, org.eclipse.emf.cdo.common.branch.CDOBranchPoint)">compare</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</A> leftView, <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A> right)</CODE> @@ -637,7 +651,7 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> -<CODE>static <A HREF="../../../../../../../org/eclipse/emf/cdo/compare/CloseableComparison.html" title="interface in org.eclipse.emf.cdo.compare">CloseableComparison</A></CODE></FONT></TD> +<CODE>static <A HREF="../../../../../../../org/eclipse/emf/cdo/compare/CDOComparison.html" title="class in org.eclipse.emf.cdo.compare">CDOComparison</A></CODE></FONT></TD> <TD><CODE><B>CDOCompareUtil.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/compare/CDOCompareUtil.html#compare(org.eclipse.emf.cdo.view.CDOView, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, boolean)">compare</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view">CDOView</A> leftView, <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A> right, boolean tryThreeWay)</CODE> @@ -648,7 +662,7 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> -<CODE>static <A HREF="../../../../../../../org/eclipse/emf/cdo/compare/CloseableComparison.html" title="interface in org.eclipse.emf.cdo.compare">CloseableComparison</A></CODE></FONT></TD> +<CODE>static <A HREF="../../../../../../../org/eclipse/emf/cdo/compare/CDOComparison.html" title="class in org.eclipse.emf.cdo.compare">CDOComparison</A></CODE></FONT></TD> <TD><CODE><B>CDOCompareUtil.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/compare/CDOCompareUtil.html#compare(org.eclipse.emf.ecore.EObject, org.eclipse.emf.cdo.common.branch.CDOBranchPoint)">compare</A></B>(<A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.8.0/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EObject</A> leftRoot, <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A> right)</CODE> @@ -657,7 +671,7 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> -<CODE>static <A HREF="../../../../../../../org/eclipse/emf/cdo/compare/CloseableComparison.html" title="interface in org.eclipse.emf.cdo.compare">CloseableComparison</A></CODE></FONT></TD> +<CODE>static <A HREF="../../../../../../../org/eclipse/emf/cdo/compare/CDOComparison.html" title="class in org.eclipse.emf.cdo.compare">CDOComparison</A></CODE></FONT></TD> <TD><CODE><B>CDOCompareUtil.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/compare/CDOCompareUtil.html#compare(org.eclipse.emf.ecore.EObject, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, boolean)">compare</A></B>(<A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.8.0/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EObject</A> leftRoot, <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A> right, boolean tryThreeWay)</CODE> @@ -1036,6 +1050,15 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc <BR> </TD> </TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static <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>CDOBranchUtil.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/spi/common/branch/CDOBranchUtil.html#normalizeBranchPoint(org.eclipse.emf.cdo.common.branch.CDOBranch, long)">normalizeBranchPoint</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A> branch, + long timeStamp)</CODE> + +<BR> + </TD> +</TR> </TABLE> <P> @@ -1964,6 +1987,33 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc </TABLE> <P> +<A NAME="org.eclipse.emf.cdo.ui.compare"><!-- --></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/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A> in <A HREF="../../../../../../../org/eclipse/emf/cdo/ui/compare/package-summary.html">org.eclipse.emf.cdo.ui.compare</A></FONT></TH> +</TR> +</TABLE> + +<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/cdo/ui/compare/package-summary.html">org.eclipse.emf.cdo.ui.compare</A> with parameters of type <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A></FONT></TH> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE>static void</CODE></FONT></TD> +<TD><CODE><B>CDOCompareEditorInput.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/ui/compare/CDOCompareEditorInput.html#openCompareDialog(org.eclipse.emf.cdo.session.CDOSession, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint)">openCompareDialog</A></B>(<A HREF="../../../../../../../org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session">CDOSession</A> session, + <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A> left, + <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranchPoint</A> right)</CODE> + +<BR> + </TD> +</TR> +</TABLE> + +<P> <A NAME="org.eclipse.emf.cdo.ui.widgets"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> @@ -2118,6 +2168,14 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc <BR> </TD> </TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1"> +<CODE> <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>CDOViewTargetChangedEvent.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/view/CDOViewTargetChangedEvent.html#getOldBranchPoint()">getOldBranchPoint</A></B>()</CODE> + +<BR> + </TD> +</TR> </TABLE> <P> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html index 561beb2642..3d0935601c 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.html @@ -88,16 +88,17 @@ Common concepts for dealing with branches. <P> <map id="APIVIZ" name="APIVIZ"> -<area shape="rect" id="node1" href="CDOBranch.html" title="«interface» CDOBranch" alt="" coords="504,124,595,164"/> -<area shape="rect" id="node2" href="CDOBranchHandler.html" title="«interface» CDOBranchHandler" alt="" coords="721,159,855,199"/> -<area shape="rect" id="node3" href="CDOBranchManager.html" title="«interface» CDOBranchManager" alt="" coords="229,60,371,100"/> -<area shape="rect" id="node4" href="CDOBranchPoint.html" title="«interface» CDOBranchPoint" alt="" coords="727,57,849,97"/> -<area shape="rect" id="node5" href="CDOBranchPointRange.html" title="«interface» CDOBranchPointRange" alt="" coords="470,5,629,45"/> -<area shape="rect" id="node6" href="CDOBranchTag.html" title="«interface» CDOBranchTag" alt="" coords="888,57,1000,97"/> -<area shape="rect" id="node7" href="CDOBranchVersion.html" title="«interface» CDOBranchVersion" alt="" coords="233,124,367,164"/> -<area shape="rect" id="node8" href="../../session/CDOSession.html" title="«interface» CDOSession (org.eclipse.emf.cdo.session)" alt="" coords="5,13,197,67"/> -<area shape="rect" id="node9" title="«interface» Comparable (java.lang)" alt="" coords="255,189,345,243"/> -<area shape="rect" id="node10" href="../../server/IRepository.html" title="«interface» IRepository (org.eclipse.emf.cdo.server)" alt="" coords="11,91,192,146"/> +<area shape="rect" id="node1" href="CDOBranch.html" title="«interface» CDOBranch" alt="" coords="533,196,624,236"/> +<area shape="rect" id="node2" href="CDOBranchHandler.html" title="«interface» CDOBranchHandler" alt="" coords="779,199,914,239"/> +<area shape="rect" id="node3" href="CDOBranchManager.html" title="«interface» CDOBranchManager" alt="" coords="229,132,371,172"/> +<area shape="rect" id="node4" href="CDOBranchPoint.html" title="«interface» CDOBranchPoint" alt="" coords="786,85,907,125"/> +<area shape="rect" id="node5" href="CDOBranchPointRange.html" title="«interface» CDOBranchPointRange" alt="" coords="499,5,658,45"/> +<area shape="rect" id="node6" href="CDOBranchTag.html" title="«interface» CDOBranchTag" alt="" coords="947,85,1059,125"/> +<area shape="rect" id="node7" href="CDOBranchVersion.html" title="«interface» CDOBranchVersion" alt="" coords="233,196,367,236"/> +<area shape="rect" id="node8" href="../../session/CDOSession.html" title="«interface» CDOSession (org.eclipse.emf.cdo.session)" alt="" coords="5,85,197,139"/> +<area shape="rect" id="node9" href="../util/CDOTimeProvider.html" title="«interface» CDOTimeProvider (org.eclipse.emf.cdo.common.util)" alt="" coords="469,78,688,133"/> +<area shape="rect" id="node10" title="«interface» Comparable (java.lang)" alt="" coords="255,261,345,315"/> +<area shape="rect" id="node11" href="../../server/IRepository.html" title="«interface» IRepository (org.eclipse.emf.cdo.server)" alt="" coords="11,163,192,218"/> </map> <CENTER><IMG SRC="package-summary.png" USEMAP="#APIVIZ" BORDER="0"></CENTER> diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.png b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.png Binary files differindex 1da811645b..edcf5a3284 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.png +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-summary.png diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-use.html index 91936845d5..57d3a6bc0d 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-use.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/package-use.html @@ -190,6 +190,14 @@ Packages that use <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/p <TD>Client concepts for dealing with transactions, distributed transactions and their save points. </TD> </TR> <TR BGCOLOR="white" CLASS="TableRowColor"> +<TD><A HREF="#org.eclipse.emf.cdo.ui"><B>org.eclipse.emf.cdo.ui</B></A></TD> +<TD>Reusable UI components specific to the CDO Model Repository. </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD><A HREF="#org.eclipse.emf.cdo.ui.compare"><B>org.eclipse.emf.cdo.ui.compare</B></A></TD> +<TD> </TD> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> <TD><A HREF="#org.eclipse.emf.cdo.ui.ide"><B>org.eclipse.emf.cdo.ui.ide</B></A></TD> <TD>Reusable UI IDE components specific to the CDO Model Repository. </TD> </TR> @@ -783,6 +791,36 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/package- </TABLE> <P> +<A NAME="org.eclipse.emf.cdo.ui"><!-- --></A> +<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> +<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> +<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2"> +Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/package-summary.html">org.eclipse.emf.cdo.common.branch</A> used by <A HREF="../../../../../../org/eclipse/emf/cdo/ui/package-summary.html">org.eclipse.emf.cdo.ui</A></FONT></TH> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranch.html#org.eclipse.emf.cdo.ui"><B>CDOBranch</B></A></B> + +<BR> + Represents a <i>stream of changes</i> that is isolated from other streams of changes.</TD> +</TR> +</TABLE> + +<P> +<A NAME="org.eclipse.emf.cdo.ui.compare"><!-- --></A> +<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> +<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> +<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2"> +Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/package-summary.html">org.eclipse.emf.cdo.common.branch</A> used by <A HREF="../../../../../../org/eclipse/emf/cdo/ui/compare/package-summary.html">org.eclipse.emf.cdo.ui.compare</A></FONT></TH> +</TR> +<TR BGCOLOR="white" CLASS="TableRowColor"> +<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html#org.eclipse.emf.cdo.ui.compare"><B>CDOBranchPoint</B></A></B> + +<BR> + A <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getTimeStamp()"><CODE>point in time</CODE></A> in a particular <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html#getBranch()"><CODE>branch</CODE></A>.</TD> +</TR> +</TABLE> + +<P> <A NAME="org.eclipse.emf.cdo.ui.ide"><!-- --></A> <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY=""> <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor"> |