Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2020-08-25 05:50:57 +0000
committerEike Stepper2020-08-25 05:50:57 +0000
commit8fd8e883f7ef5285ce6786275bdc7d0114b9d69c (patch)
tree60f6429442d68b43c14dd55648590413481ac099
parente249791012cf12b830c43e2b2df0a73fbbfc9715 (diff)
downloadcdo-8fd8e883f7ef5285ce6786275bdc7d0114b9d69c.tar.gz
cdo-8fd8e883f7ef5285ce6786275bdc7d0114b9d69c.tar.xz
cdo-8fd8e883f7ef5285ce6786275bdc7d0114b9d69c.zip
[564032] Provide CDOBranchRef and CDOBranchPointRef
https://bugs.eclipse.org/bugs/show_bug.cgi?id=564032
-rw-r--r--plugins/org.eclipse.emf.cdo.common/.settings/.api_filters13
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchRef.java2
2 files changed, 14 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters
index ae9e0a6bb5..a8c12c6eab 100644
--- a/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters
@@ -54,6 +54,19 @@
</message_arguments>
</filter>
</resource>
+ <resource path="src/org/eclipse/emf/cdo/common/branch/CDOBranchRef.java" type="org.eclipse.emf.cdo.common.branch.CDOBranchRef">
+ <filter id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.cdo.common.branch.CDOBranchRef"/>
+ <message_argument value="resolve(CDOBranchManager)"/>
+ </message_arguments>
+ </filter>
+ <filter id="1143996420">
+ <message_arguments>
+ <message_argument value="resolve(CDOBranchManager)"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.java" type="org.eclipse.emf.cdo.common.commit.CDOCommitHistory$TriggerLoadElement">
<filter id="576778288">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchRef.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchRef.java
index a39a9fef5c..1470774d0c 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchRef.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchRef.java
@@ -64,7 +64,7 @@ public final class CDOBranchRef implements Serializable
return CDOBranch.MAIN_BRANCH_NAME.equals(branchPath);
}
- public CDOBranchPoint resolve(CDOBranchManager branchManager)
+ public CDOBranch resolve(CDOBranchManager branchManager)
{
return branchManager.getBranch(branchPath);
}

Back to the top