diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.common/.settings/.api_filters | 13 | ||||
-rw-r--r-- | plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchRef.java | 2 |
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); } |