diff options
| author | Eike Stepper | 2012-10-13 09:56:45 +0000 |
|---|---|---|
| committer | Eike Stepper | 2012-10-13 09:56:45 +0000 |
| commit | fd2e0b58ed8c9b644104bbb79e9354018376ed10 (patch) | |
| tree | 99879cb0ec940d19c57470b7e85b533c654b6316 /plugins/org.eclipse.emf.cdo.ui | |
| parent | 79eef823d5eb3357c5b01c06355c7ee9a03b138e (diff) | |
| download | cdo-fd2e0b58ed8c9b644104bbb79e9354018376ed10.tar.gz cdo-fd2e0b58ed8c9b644104bbb79e9354018376ed10.tar.xz cdo-fd2e0b58ed8c9b644104bbb79e9354018376ed10.zip | |
[391503] [UI] Render a CDOCommitInfo graph into the history page
https://bugs.eclipse.org/bugs/show_bug.cgi?id=391503
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Branch.java | 2 | ||||
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Segment.java | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Branch.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Branch.java index 0909d6474d..4cc5c7614d 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Branch.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Branch.java @@ -175,7 +175,7 @@ public class Branch extends SegmentList private void determineBaseCommitIfNeeded() { - if (cdoBranch.isMainBranch()) + if (baseCommitTime != 0 || cdoBranch.isMainBranch()) { return; } diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Segment.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Segment.java index 08e49a0ebc..22a0b2f8bb 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Segment.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Segment.java @@ -124,9 +124,13 @@ public class Segment void adjustCommitTimes(long time) { - if (firstCommitTime == 0) + if (firstVisualTime == 0) { firstVisualTime = time; + } + + if (firstCommitTime == 0) + { firstCommitTime = time; lastCommitTime = time; } |