Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html16
1 files changed, 9 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html
index 9f5206dbd7..d6a2be0e78 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html
@@ -100,12 +100,14 @@ Interface CDOBranch</H2>
<DL>
<DT><PRE>public interface <B>CDOBranch</B><DT>extends <A HREF="../../../../../../../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/container/IContainer.html?is-external=true" title="class or interface in org.eclipse.net4j.util.container">IContainer</A>&lt;<A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A>&gt;, <A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</A>&lt;<A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="interface in org.eclipse.emf.cdo.common.branch">CDOBranch</A>&gt;</DL>
</PRE><map id="APIVIZ" name="APIVIZ">
-<area shape="rect" id="node1" href="../../spi/common/branch/InternalCDOBranch.html" title="&#171;interface&#187; InternalCDOBranch (org.eclipse.emf.cdo.spi.common.branch)" alt="" coords="5,201,267,255"/>
-<area shape="rect" id="node2" title="&#171;interface&#187; IContainer (org.eclipse.net4j.util.container)" alt="" coords="175,6,377,61"/>
-<area shape="rect" id="node3" title="&#171;interface&#187; Comparable (java.lang)" alt="" coords="407,6,497,61"/>
-<area shape="rect" id="node4" href="CDOBranchVersion.html" title="&#171;interface&#187; CDOBranchVersion" alt="" coords="297,208,431,248"/>
-<area shape="rect" id="node5" href="CDOBranchPoint.html" title="&#171;interface&#187; CDOBranchPoint" alt="" coords="461,208,581,248"/>
-<area shape="rect" id="node6" href="CDOBranch.html" title="&#171;interface&#187; CDOBranch" alt="" coords="319,104,409,144"/>
+<area shape="rect" id="node1" href="../../spi/common/branch/InternalCDOBranch.html" title="&#171;interface&#187; InternalCDOBranch (org.eclipse.emf.cdo.spi.common.branch)" alt="" coords="275,214,536,269"/>
+<area shape="rect" id="node2" title="&#171;interface&#187; IContainer (org.eclipse.net4j.util.container)" alt="" coords="5,6,208,61"/>
+<area shape="rect" id="node3" title="&#171;interface&#187; Comparable (java.lang)" alt="" coords="237,6,328,61"/>
+<area shape="rect" id="node4" href="CDOBranchVersion.html" title="&#171;interface&#187; CDOBranchVersion" alt="" coords="358,13,492,53"/>
+<area shape="rect" id="node5" href="CDOBranchPoint.html" title="&#171;interface&#187; CDOBranchPoint" alt="" coords="123,221,244,261"/>
+<area shape="rect" id="node6" href="CDOBranchManager.html" title="&#171;interface&#187; CDOBranchManager" alt="" coords="523,13,664,53"/>
+<area shape="rect" id="node7" href="CDOBranchHandler.html" title="&#171;interface&#187; CDOBranchHandler" alt="" coords="566,221,700,261"/>
+<area shape="rect" id="node8" href="CDOBranch.html" title="&#171;interface&#187; CDOBranch" alt="" coords="308,117,399,157"/>
</map>
<CENTER><IMG SRC="CDOBranch.png" USEMAP="#APIVIZ" BORDER="0"></CENTER>
@@ -113,7 +115,7 @@ Interface CDOBranch</H2>
<P>
-Represents a <i>stream of change</i> that is isolated from other streams of changes.
+Represents a <i>stream of changes</i> that is isolated from other streams of changes.
<p>
A branch starts at a fixed <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getBase()"><CODE>base</CODE></A> point and ends at a floating <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranch.html#getHead()"><CODE>head</CODE></A> point.
Between these two points there can be a number of other <A HREF="../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch"><CODE>branch points</CODE></A>:

Back to the top