Search in sources :

Example 1 with DiffViewer

use of org.eclipse.egit.ui.internal.commit.DiffViewer in project egit by eclipse.

the class BlameInformationControl method createDiffLinkAndText.

private void createDiffLinkAndText(final RevCommit parent, final Diff diff) throws IOException {
    String parentId = parent.toObjectId().abbreviate(7).name();
    String parentMessage = parent.getShortMessage();
    EditList interestingDiff = getInterestingDiff(diff.getEditList());
    final Integer parentLine;
    if (!interestingDiff.isEmpty())
        parentLine = Integer.valueOf(interestingDiff.get(0).getBeginA());
    else
        parentLine = null;
    Composite header = new Composite(diffComposite, SWT.NONE);
    header.setLayout(GridLayoutFactory.fillDefaults().numColumns(2).create());
    Label diffHeaderLabel = new Label(header, SWT.NONE);
    diffHeaderLabel.setText(NLS.bind(UIText.BlameInformationControl_DiffHeaderLabel, parentId, parentMessage));
    showAnnotationsLink = new Link(header, SWT.NONE);
    showAnnotationsLink.setText(UIText.BlameInformationControl_ShowAnnotationsLink);
    showAnnotationsLinkSelectionAdapter = new SelectionAdapter() {

        @Override
        public void widgetSelected(SelectionEvent e) {
            blameParent(parent, diff, parentLine);
        }
    };
    showAnnotationsLink.addSelectionListener(showAnnotationsLinkSelectionAdapter);
    DiffViewer diffText = new DiffViewer(diffComposite, null, SWT.NONE);
    diffText.configure(new DiffViewer.Configuration(EditorsUI.getPreferenceStore()));
    diffText.getControl().setLayoutData(GridDataFactory.fillDefaults().grab(true, true).create());
    DiffDocument document = new DiffDocument();
    try (DiffRegionFormatter diffFormatter = new DiffRegionFormatter(document)) {
        diffFormatter.setContext(1);
        diffFormatter.setRepository(revision.getRepository());
        diffFormatter.format(interestingDiff, diff.getOldText(), diff.getNewText());
        try (ObjectReader reader = revision.getRepository().newObjectReader()) {
            DiffEntry diffEntry = CompareCoreUtils.getChangeDiffEntry(revision.getRepository(), revision.getSourcePath(), revision.getCommit(), parent, reader);
            if (diffEntry != null) {
                FileDiff fileDiff = new FileDiff(revision.getCommit(), diffEntry);
                document.setDefault(revision.getRepository(), fileDiff);
            }
        }
        document.connect(diffFormatter);
    }
    diffText.setDocument(document);
}
Also used : Composite(org.eclipse.swt.widgets.Composite) ScrolledComposite(org.eclipse.swt.custom.ScrolledComposite) SelectionAdapter(org.eclipse.swt.events.SelectionAdapter) Label(org.eclipse.swt.widgets.Label) DiffViewer(org.eclipse.egit.ui.internal.commit.DiffViewer) DiffRegionFormatter(org.eclipse.egit.ui.internal.commit.DiffRegionFormatter) SelectionEvent(org.eclipse.swt.events.SelectionEvent) ObjectReader(org.eclipse.jgit.lib.ObjectReader) FileDiff(org.eclipse.egit.ui.internal.history.FileDiff) EditList(org.eclipse.jgit.diff.EditList) DiffDocument(org.eclipse.egit.ui.internal.commit.DiffDocument) Link(org.eclipse.swt.widgets.Link) DiffEntry(org.eclipse.jgit.diff.DiffEntry)

Example 2 with DiffViewer

use of org.eclipse.egit.ui.internal.commit.DiffViewer in project egit by eclipse.

the class GitHistoryPage method createControl.

@Override
public void createControl(final Composite parent) {
    trace = GitTraceLocation.HISTORYVIEW.isActive();
    if (trace)
        GitTraceLocation.getTrace().traceEntry(GitTraceLocation.HISTORYVIEW.getLocation());
    attachSelectionTracker();
    historyControl = createMainPanel(parent);
    warningComposite = new Composite(historyControl, SWT.NONE);
    warningComposite.setLayout(new GridLayout(2, false));
    warningComposite.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
    warningLabel = new CLabel(warningComposite, SWT.NONE);
    warningLabel.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK));
    warningLabel.setToolTipText(UIText.GitHistoryPage_IncompleteListTooltip);
    Link preferencesLink = new Link(warningComposite, SWT.NONE);
    preferencesLink.setText(UIText.GitHistoryPage_PreferencesLink);
    preferencesLink.addSelectionListener(new SelectionAdapter() {

        @Override
        public void widgetSelected(SelectionEvent e) {
            // $NON-NLS-1$
            String preferencePageId = "org.eclipse.egit.ui.internal.preferences.HistoryPreferencePage";
            PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(getSite().getShell(), preferencePageId, new String[] { preferencePageId }, null);
            dialog.open();
        }
    });
    GridDataFactory.fillDefaults().grab(true, true).applyTo(historyControl);
    graphDetailSplit = new SashForm(historyControl, SWT.VERTICAL);
    GridDataFactory.fillDefaults().grab(true, true).applyTo(graphDetailSplit);
    graph = new CommitGraphTable(graphDetailSplit, getSite(), popupMgr, this, resources);
    Activator.getDefault().getPreferenceStore().addPropertyChangeListener(listener);
    revInfoSplit = new SashForm(graphDetailSplit, SWT.HORIZONTAL);
    commentAndDiffScrolledComposite = new ScrolledComposite(revInfoSplit, SWT.H_SCROLL | SWT.V_SCROLL);
    commentAndDiffScrolledComposite.setExpandHorizontal(true);
    commentAndDiffScrolledComposite.setExpandVertical(true);
    commentAndDiffComposite = new Composite(commentAndDiffScrolledComposite, SWT.NONE);
    commentAndDiffScrolledComposite.setContent(commentAndDiffComposite);
    commentAndDiffComposite.setLayout(GridLayoutFactory.fillDefaults().create());
    commentViewer = new CommitMessageViewer(commentAndDiffComposite, getPartSite());
    commentViewer.getControl().setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create());
    commentViewer.addTextListener(new ITextListener() {

        @Override
        public void textChanged(TextEvent event) {
            resizeCommentAndDiffScrolledComposite();
        }
    });
    commentAndDiffComposite.setBackground(commentViewer.getControl().getBackground());
    HyperlinkSourceViewer.Configuration configuration = new HyperlinkSourceViewer.Configuration(EditorsUI.getPreferenceStore()) {

        @Override
        public int getHyperlinkStateMask(ISourceViewer sourceViewer) {
            return SWT.NONE;
        }

        @Override
        protected IHyperlinkDetector[] internalGetHyperlinkDetectors(ISourceViewer sourceViewer) {
            IHyperlinkDetector[] registered = super.internalGetHyperlinkDetectors(sourceViewer);
            // want those to show always.
            if (registered == null) {
                return new IHyperlinkDetector[] { new CommitMessageViewer.KnownHyperlinksDetector() };
            } else {
                IHyperlinkDetector[] result = new IHyperlinkDetector[registered.length + 1];
                System.arraycopy(registered, 0, result, 0, registered.length);
                result[registered.length] = new CommitMessageViewer.KnownHyperlinksDetector();
                return result;
            }
        }

        @Override
        public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
            return new String[] { IDocument.DEFAULT_CONTENT_TYPE, CommitMessageViewer.HEADER_CONTENT_TYPE, CommitMessageViewer.FOOTER_CONTENT_TYPE };
        }

        @Override
        public IPresentationReconciler getPresentationReconciler(ISourceViewer viewer) {
            PresentationReconciler reconciler = new PresentationReconciler();
            reconciler.setDocumentPartitioning(getConfiguredDocumentPartitioning(viewer));
            DefaultDamagerRepairer hyperlinkDamagerRepairer = new DefaultDamagerRepairer(new HyperlinkTokenScanner(this, viewer));
            reconciler.setDamager(hyperlinkDamagerRepairer, IDocument.DEFAULT_CONTENT_TYPE);
            reconciler.setRepairer(hyperlinkDamagerRepairer, IDocument.DEFAULT_CONTENT_TYPE);
            TextAttribute headerDefault = new TextAttribute(PlatformUI.getWorkbench().getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
            DefaultDamagerRepairer headerDamagerRepairer = new DefaultDamagerRepairer(new HyperlinkTokenScanner(this, viewer, headerDefault));
            reconciler.setDamager(headerDamagerRepairer, CommitMessageViewer.HEADER_CONTENT_TYPE);
            reconciler.setRepairer(headerDamagerRepairer, CommitMessageViewer.HEADER_CONTENT_TYPE);
            DefaultDamagerRepairer footerDamagerRepairer = new DefaultDamagerRepairer(new FooterTokenScanner(this, viewer));
            reconciler.setDamager(footerDamagerRepairer, CommitMessageViewer.FOOTER_CONTENT_TYPE);
            reconciler.setRepairer(footerDamagerRepairer, CommitMessageViewer.FOOTER_CONTENT_TYPE);
            return reconciler;
        }
    };
    commentViewer.configure(configuration);
    diffViewer = new DiffViewer(commentAndDiffComposite, null, SWT.NONE);
    diffViewer.configure(new DiffViewer.Configuration(EditorsUI.getPreferenceStore()));
    diffViewer.getControl().setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create());
    setWrap(store.getBoolean(UIPreferences.RESOURCEHISTORY_SHOW_COMMENT_WRAP));
    commentAndDiffScrolledComposite.addControlListener(new ControlAdapter() {

        @Override
        public void controlResized(ControlEvent e) {
            if (!resizing && commentViewer.getTextWidget().getWordWrap()) {
                resizeCommentAndDiffScrolledComposite();
            }
        }
    });
    fileViewer = new CommitFileDiffViewer(revInfoSplit, getSite());
    fileViewer.addSelectionChangedListener(new ISelectionChangedListener() {

        @Override
        public void selectionChanged(SelectionChangedEvent event) {
            ISelection selection = event.getSelection();
            List<FileDiff> diffs = new ArrayList<>();
            if (selection instanceof IStructuredSelection) {
                IStructuredSelection sel = (IStructuredSelection) selection;
                for (Object obj : sel.toList()) if (obj instanceof FileDiff)
                    diffs.add((FileDiff) obj);
            }
            formatDiffs(diffs);
        }
    });
    layoutSashForm(graphDetailSplit, UIPreferences.RESOURCEHISTORY_GRAPH_SPLIT);
    layoutSashForm(revInfoSplit, UIPreferences.RESOURCEHISTORY_REV_SPLIT);
    attachCommitSelectionChanged();
    initActions();
    getSite().setSelectionProvider(new RepositorySelectionProvider(graph.getTableView(), () -> {
        HistoryPageInput myInput = getInputInternal();
        return myInput != null ? myInput.getRepository() : null;
    }));
    getSite().registerContextMenu(POPUP_ID, popupMgr, graph.getTableView());
    // Track which of our controls has the focus, so that we can focus the
    // last focused one in setFocus().
    focusTracker = new FocusTracker();
    trackFocus(graph.getControl());
    trackFocus(diffViewer.getControl());
    trackFocus(commentViewer.getControl());
    trackFocus(fileViewer.getControl());
    layout();
    myRefsChangedHandle = Repository.getGlobalListenerList().addRefsChangedListener(this);
    IToolBarManager manager = getSite().getActionBars().getToolBarManager();
    searchBar = new // $NON-NLS-1$
    SearchBar(// $NON-NLS-1$
    GitHistoryPage.class.getName() + ".searchBar", graph, actions.findAction, getSite().getActionBars());
    // $NON-NLS-1$
    manager.prependToGroup("org.eclipse.team.ui.historyView", searchBar);
    getSite().getActionBars().updateActionBars();
    if (trace)
        GitTraceLocation.getTrace().traceExit(GitTraceLocation.HISTORYVIEW.getLocation());
}
Also used : CLabel(org.eclipse.swt.custom.CLabel) ITextListener(org.eclipse.jface.text.ITextListener) SourceViewerConfiguration(org.eclipse.jface.text.source.SourceViewerConfiguration) ControlAdapter(org.eclipse.swt.events.ControlAdapter) TextAttribute(org.eclipse.jface.text.TextAttribute) RepositorySelectionProvider(org.eclipse.egit.ui.internal.selection.RepositorySelectionProvider) DefaultDamagerRepairer(org.eclipse.jface.text.rules.DefaultDamagerRepairer) SelectionChangedEvent(org.eclipse.jface.viewers.SelectionChangedEvent) FocusTracker(org.eclipse.egit.ui.internal.commit.FocusTracker) HyperlinkTokenScanner(org.eclipse.egit.ui.internal.dialogs.HyperlinkTokenScanner) IStructuredSelection(org.eclipse.jface.viewers.IStructuredSelection) GridLayout(org.eclipse.swt.layout.GridLayout) PreferenceDialog(org.eclipse.jface.preference.PreferenceDialog) SelectionEvent(org.eclipse.swt.events.SelectionEvent) ISelection(org.eclipse.jface.viewers.ISelection) ScrolledComposite(org.eclipse.swt.custom.ScrolledComposite) IShowInTargetList(org.eclipse.ui.part.IShowInTargetList) ArrayList(java.util.ArrayList) List(java.util.List) PresentationReconciler(org.eclipse.jface.text.presentation.PresentationReconciler) IPresentationReconciler(org.eclipse.jface.text.presentation.IPresentationReconciler) TextEvent(org.eclipse.jface.text.TextEvent) Composite(org.eclipse.swt.widgets.Composite) ScrolledComposite(org.eclipse.swt.custom.ScrolledComposite) IHyperlinkDetector(org.eclipse.jface.text.hyperlink.IHyperlinkDetector) SelectionAdapter(org.eclipse.swt.events.SelectionAdapter) ISelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener) DiffViewer(org.eclipse.egit.ui.internal.commit.DiffViewer) SashForm(org.eclipse.swt.custom.SashForm) HyperlinkSourceViewer(org.eclipse.egit.ui.internal.dialogs.HyperlinkSourceViewer) IToolBarManager(org.eclipse.jface.action.IToolBarManager) GridData(org.eclipse.swt.layout.GridData) RevObject(org.eclipse.jgit.revwalk.RevObject) ISourceViewer(org.eclipse.jface.text.source.ISourceViewer) ControlEvent(org.eclipse.swt.events.ControlEvent) Link(org.eclipse.swt.widgets.Link)

Aggregations

DiffViewer (org.eclipse.egit.ui.internal.commit.DiffViewer)2 ScrolledComposite (org.eclipse.swt.custom.ScrolledComposite)2 SelectionAdapter (org.eclipse.swt.events.SelectionAdapter)2 SelectionEvent (org.eclipse.swt.events.SelectionEvent)2 Composite (org.eclipse.swt.widgets.Composite)2 Link (org.eclipse.swt.widgets.Link)2 ArrayList (java.util.ArrayList)1 List (java.util.List)1 DiffDocument (org.eclipse.egit.ui.internal.commit.DiffDocument)1 DiffRegionFormatter (org.eclipse.egit.ui.internal.commit.DiffRegionFormatter)1 FocusTracker (org.eclipse.egit.ui.internal.commit.FocusTracker)1 HyperlinkSourceViewer (org.eclipse.egit.ui.internal.dialogs.HyperlinkSourceViewer)1 HyperlinkTokenScanner (org.eclipse.egit.ui.internal.dialogs.HyperlinkTokenScanner)1 FileDiff (org.eclipse.egit.ui.internal.history.FileDiff)1 RepositorySelectionProvider (org.eclipse.egit.ui.internal.selection.RepositorySelectionProvider)1 IToolBarManager (org.eclipse.jface.action.IToolBarManager)1 PreferenceDialog (org.eclipse.jface.preference.PreferenceDialog)1 ITextListener (org.eclipse.jface.text.ITextListener)1 TextAttribute (org.eclipse.jface.text.TextAttribute)1 TextEvent (org.eclipse.jface.text.TextEvent)1