Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-10-06 17:47:09 +0000
committerEike Stepper2012-10-06 17:47:09 +0000
commitf727f0af55dcef8951ea7c5b49de03e6de9da271 (patch)
tree514dfba9d9fd44c2fc4a34acaef51c1c5ce3888c /plugins/org.eclipse.emf.cdo.ui.team
parentbaafd5e3ffe4efaa8274b5cdcc9065eca683b493 (diff)
downloadcdo-f727f0af55dcef8951ea7c5b49de03e6de9da271.tar.gz
cdo-f727f0af55dcef8951ea7c5b49de03e6de9da271.tar.xz
cdo-f727f0af55dcef8951ea7c5b49de03e6de9da271.zip
[256624] [UI] Create a Commit History ViewPart
https://bugs.eclipse.org/bugs/show_bug.cgi?id=256624
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui.team')
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryPage.java21
2 files changed, 21 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui.team/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.team/META-INF/MANIFEST.MF
index ae731948bc..94c53eb5c2 100644
--- a/plugins/org.eclipse.emf.cdo.ui.team/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.team/META-INF/MANIFEST.MF
@@ -12,6 +12,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.team.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.cdo.ui;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.ui.compare;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.ui.shared;bundle-version="[4.0.0,5.0.0)"
Export-Package: org.eclipse.emf.cdo.ui.internal.team.actions;version="4.2.0";x-internal:=true,
org.eclipse.emf.cdo.ui.internal.team.bundle;version="4.2.0";x-internal:=true,
diff --git a/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryPage.java b/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryPage.java
index b458203d3b..061fe085af 100644
--- a/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryPage.java
+++ b/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryPage.java
@@ -10,6 +10,11 @@
*/
package org.eclipse.emf.cdo.ui.internal.team.history;
+import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
+import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
+import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil;
+import org.eclipse.emf.cdo.ui.compare.CDOCompareEditorInput;
import org.eclipse.emf.cdo.ui.widgets.CommitHistoryComposite;
import org.eclipse.emf.cdo.ui.widgets.CommitHistoryComposite.Input;
@@ -50,7 +55,21 @@ public class CDOHistoryPage extends HistoryPage
@Override
public void createControl(Composite parent)
{
- commitHistoryComposite = new CommitHistoryComposite(parent, SWT.NONE);
+ commitHistoryComposite = new CommitHistoryComposite(parent, SWT.NONE)
+ {
+ @Override
+ protected void doubleClicked(CDOCommitInfo commitInfo)
+ {
+ long previousTimeStamp = commitInfo.getPreviousTimeStamp();
+ if (previousTimeStamp != CDOBranchPoint.UNSPECIFIED_DATE)
+ {
+ CDOSession session = input.getSession();
+ CDOBranchPoint previous = CDOBranchUtil.normalizeBranchPoint(commitInfo.getBranch(), previousTimeStamp);
+ CDOCompareEditorInput.openCompareDialog(session, commitInfo, previous);
+ }
+ }
+ };
+ getSite().setSelectionProvider(commitHistoryComposite.getTableViewer());
}
@Override

Back to the top