From f0d27bf78e55f581b1129b3404d8a5951ad38b08 Mon Sep 17 00:00:00 2001 From: Eike Stepper Date: Tue, 18 Oct 2016 18:45:48 +0200 Subject: [Releng] Regenerate documentation --- .../CDOCommitHistory.TriggerLoadElement.html | 4 +- .../emf/cdo/common/commit/CDOCommitHistory.html | 12 +++- .../emf/cdo/common/commit/CDOCommitInfo.html | 61 +++++++++++++++++-- .../cdo/common/commit/CDOCommitInfoManager.html | 69 +++++++++++++++++++--- .../cdo/common/commit/class-use/CDOChangeSet.html | 27 +++++++-- .../common/commit/class-use/CDOChangeSetData.html | 46 +++++++++++++-- .../cdo/common/commit/class-use/CDOCommitData.html | 10 ++++ .../class-use/CDOCommitHistory.Provider.html | 2 +- .../cdo/common/commit/class-use/CDOCommitInfo.html | 31 ++++++++-- .../commit/class-use/CDOCommitInfoProvider.html | 2 +- .../emf/cdo/common/commit/package-summary.html | 2 +- .../eclipse/emf/cdo/common/commit/package-use.html | 12 ++-- 12 files changed, 240 insertions(+), 38 deletions(-) (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit') diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.TriggerLoadElement.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.TriggerLoadElement.html index 3fa60facc2..f3e7f56c48 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.TriggerLoadElement.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitHistory.TriggerLoadElement.html @@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
getComment, getCommitInfoManager, getPreviousTimeStamp, getUserID, isCommitDataLoaded, isInitialCommit
getComment, getCommitInfoManager, getMergedCommitInfo, getMergeSource, getPreviousCommitInfo, getPreviousTimeStamp, getUserID, isCommitDataLoaded, isInitialCommit
public interface CDOCommitHistory -extends IContainer<CDOCommitInfo>, CDOCommitInfoHandler+extends IContainer<CDOCommitInfo>, CDOBranchProvider, CDOCommitInfoHandler
commit infos
of a branch or of an entire repository.CDOBranch getBranch()+
getBranch
in interface CDOBranchProvider
getCommitInfoManager()
CDOCommitInfo
getMergedCommitInfo()
CDOBranchPoint
getMergeSource()
CDOCommitInfo
getPreviousCommitInfo()
long
getPreviousTimeStamp()
String
getUserID()
boolean
isCommitDataLoaded()
boolean
isInitialCommit()
true
if this commit info describes the first initializing commit in the repository
, false
otherwise.CDOCommitInfo getPreviousCommitInfo()+
CDOBranchPoint getMergeSource()+
CDOCommitInfo getMergedCommitInfo()+
public interface CDOCommitInfoManager extends CDOCommitInfoProvider, CDOCommitHistory.Provider<CDOBranch,CDOCommitHistory>-
commit info
objects.commit info
objects.getCommitInfo(long timeStamp)
CDOCommitInfo
getCommitInfo(long timeStamp,
+ boolean loadOnDemand)
void
getCommitInfos(CDOBranch branch,
long startTime,
long endTime,
CDOCommitInfoHandler handler)
void
getCommitInfos(CDOBranch branch,
long startTime,
@@ -172,15 +177,24 @@ extends CDOCommitInfoHandler handler)
CDOCommitInfo
getFirstOfBranch(CDOBranch branch)
long
getLastCommit()
long
getLastCommitOfBranch(CDOBranch branch,
+ boolean loadOnDemand)
CDOCommitInfo
getLastOfBranch(CDOBranch branch)
CDOCommonRepository
getRepository()
CDOCommitInfo getCommitInfo(long timeStamp, + boolean loadOnDemand)+
CDOCommitInfo getLastOfBranch(CDOBranch branch)@@ -323,6 +351,33 @@ extends + + +
long getLastCommitOfBranch(CDOBranch branch, + boolean loadOnDemand)+
long getLastCommit()+
MergeData(CDOBranchPoint target,
CDOBranchPoint source,
CDOBranchPoint sourceBase,
- CDOBranchPoint ancestor,
+ CDOBranchPoint targetBase,
CDORevisionAvailabilityInfo targetInfo,
CDORevisionAvailabilityInfo sourceInfo,
- CDORevisionAvailabilityInfo baseInfo,
- CDORevisionAvailabilityInfo ancestorInfo,
+ CDORevisionAvailabilityInfo sourceBaseInfo,
+ CDORevisionAvailabilityInfo targetBaseInfo,
Set<CDOID> ids,
CDOChangeSet targetChanges,
- CDOChangeSet sourceChanges)
#MergeData(CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set, CDOChangeSet, CDOBranchPoint, CDORevisionAvailabilityInfo, CDOBranchPoint, CDORevisionAvailabilityInfo, Set, CDOChangeSet, CDOBranchPoint)
.MergeData(CDOBranchPoint target,
+ CDORevisionAvailabilityInfo targetInfo,
+ CDOBranchPoint targetBase,
+ CDORevisionAvailabilityInfo targetBaseInfo,
+ Set<CDOID> targetIDs,
+ CDOChangeSet targetChanges,
+ CDOBranchPoint source,
+ CDORevisionAvailabilityInfo sourceInfo,
+ CDOBranchPoint sourceBase,
+ CDORevisionAvailabilityInfo sourceBaseInfo,
+ Set<CDOID> sourceIDs,
+ CDOChangeSet sourceChanges,
+ CDOBranchPoint resultBase)
CDOChangeSetData
merge(CDOBranch source,
+ CDOMerger merger)
CDOChangeSetData
merge(CDOBranch source,
+ CDOMerger merger)
+merge source
+ information of the commit history
.CDOChangeSetData
merge(CDOBranchPoint source,
+ CDOBranchPoint sourceBase,
+ CDOBranchPoint targetBase,
+ CDOMerger merger)
CDOChangeSetData
merge(CDOBranchPoint source,
+ CDOBranchPoint sourceBase,
+ CDOBranchPoint targetBase,
+ CDOMerger merger)
+CDOChangeSetData
merge(CDOBranchPoint source,
CDOBranchPoint sourceBase,
CDOMerger merger)
CDOChangeSetData
merge(CDOBranchPoint source,
CDOBranchPoint sourceBase,
- CDOMerger merger)
CDOChangeSetData
CDOChangeSetData
merge(CDOBranchPoint source,
- CDOMerger merger)
branch
by inspecting the merge source
+ information of the commit history
.CDOChangeSetData
Pair<CDOChangeSetData,Pair<Map<CDOID,CDOID>,List<CDOID>>>
applyChangeSetData(CDOChangeSetData changeSetData,
- CDORevisionProvider ancestorProvider,
+ CDORevisionProvider targetBaseProvider,
CDORevisionProvider targetProvider,
CDOBranchPoint source)
InternalCDOTransaction.ApplyChangeSetResult
applyChangeSet(CDOChangeSetData changeSetData,
- CDORevisionProvider ancestorProvider,
+ CDORevisionProvider targetBaseProvider,
CDORevisionProvider targetProvider,
CDOBranchPoint source,
boolean keepVersions)
Pair<CDOChangeSetData,Pair<Map<CDOID,CDOID>,List<CDOID>>>
applyChangeSetData(CDOChangeSetData changeSetData,
- CDORevisionProvider ancestorProvider,
+ CDORevisionProvider targetBaseProvider,
CDORevisionProvider targetProvider,
CDOBranchPoint source)
CDOCommitInfo
createCommitInfo(CDOBranch branch,
+ long timeStamp,
+ long previousTimeStamp,
+ String userID,
+ String comment,
+ CDOBranchPoint mergeSource,
+ CDOCommitData commitData)
CDOCommitInfo
createCommitInfo(CDOBranch branch,
long timeStamp,
long previousTimeStamp,
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitHistory.Provider.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitHistory.Provider.html
index b55cddd835..ee8426c639 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitHistory.Provider.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitHistory.Provider.html
@@ -130,7 +130,7 @@
interface
CDOCommitInfoManager
-Loads, provides and possible manages commit info
objects.
+Provides access to commit info
objects.
CDOCommitInfo
getElement(int index)
getCommitInfo(long timeStamp,
+ boolean loadOnDemand)
CDOCommitInfo
getFirstElement()
getElement(int index)
CDOCommitInfo
getFirstOfBranch(CDOBranch branch)
getFirstElement()
CDOCommitInfo
getLastElement()
getFirstOfBranch(CDOBranch branch)
CDOCommitInfo
getLastElement()
CDOCommitInfo
getLastOfBranch(CDOBranch branch)
CDOCommitInfo
getMergedCommitInfo()
CDOCommitInfo
getPreviousCommitInfo()
CDOCommitInfo |
+InternalCDOCommitInfoManager.createCommitInfo(CDOBranch branch,
+ long timeStamp,
+ long previousTimeStamp,
+ String userID,
+ String comment,
+ CDOBranchPoint mergeSource,
+ CDOCommitData commitData) |
+||
CDOCommitInfo |
InternalCDOCommitInfoManager.createCommitInfo(CDOBranch branch,
long timeStamp,
long previousTimeStamp,
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitInfoProvider.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitInfoProvider.html
index 067d835cc9..c28a874a33 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitInfoProvider.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOCommitInfoProvider.html
@@ -112,7 +112,7 @@
| ||
CDOCommitInfoManager |
- Loads, provides and possible manages
+commit info objects.Provides access to
commit info objects. |
||
CDOCommitInfoManager
- Loads, provides and possible manages
+commit info objects.Provides access to
commit info objects. |
|||
CDOCommitInfoManager
- Loads, provides and possible manages
+commit info objects.Provides access to
commit info objects. |
|||
CDOCommitInfoManager
- Loads, provides and possible manages
+commit info objects.Provides access to
commit info objects. |
|||
CDOCommitInfoManager
- Loads, provides and possible manages
+commit info objects.Provides access to
commit info objects. |
|||
CDOCommitInfoManager
- Loads, provides and possible manages
+commit info objects.Provides access to
commit info objects. |
|||
CDOCommitInfoManager
- Loads, provides and possible manages
+commit info objects.Provides access to
commit info objects. |