Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Rosenberg2013-03-17 13:31:49 +0000
committerRobin Rosenberg2013-03-17 13:31:49 +0000
commit8de078338ad9921ed38b497c493d35ee6971a868 (patch)
tree61d13c7f4c5aed74e1d7327fd7df306286b0ad6b
parente666dec9b15da950021499908bf61b58b397361a (diff)
downloadegit-8de078338ad9921ed38b497c493d35ee6971a868.tar.gz
egit-8de078338ad9921ed38b497c493d35ee6971a868.tar.xz
egit-8de078338ad9921ed38b497c493d35ee6971a868.zip
Remove away-commented code in RebaseResultDialog
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java109
1 files changed, 0 insertions, 109 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java
index 38d7396079..eaf6bc96e3 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java
@@ -236,115 +236,6 @@ public class RebaseResultDialog extends MessageDialog {
pathsText.setText(paths.toString());
}
- // if (result.getStatus() != Status.FAILED) {
- // // new head
- // Label newHeadLabel = new Label(composite, SWT.NONE);
- // newHeadLabel.setText(UIText.MergeResultDialog_newHead);
- // newHeadLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER,
- // false, false));
- // Text newHeadText = new Text(composite, SWT.READ_ONLY);
- // ObjectId newHead = result.getNewHead();
- // if (newHead != null)
- // newHeadText.setText(getCommitMessage(newHead) + SPACE
- // + abbreviate(mergeResult.getNewHead(), true));
- // newHeadText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,
- // false));
- // }
- //
- // // Merge Input
- // Label mergeInputLabel = new Label(composite, SWT.NONE);
- // mergeInputLabel.setText(UIText.MergeResultDialog_mergeInput);
- // GridDataFactory.fillDefaults().align(SWT.LEAD, SWT.CENTER).span(2, 1)
- // .applyTo(mergeInputLabel);
- // TableViewer viewer = new TableViewer(composite);
- // viewer.setContentProvider(new IStructuredContentProvider() {
- //
- // public void dispose() {
- // // empty
- // }
- //
- // public void inputChanged(Viewer theViewer, Object oldInput,
- // Object newInput) {
- // // empty
- // }
- //
- // public Object[] getElements(Object inputElement) {
- // return getCommits(mergeResult.getMergedCommits());
- // }
- // });
- // Table table = viewer.getTable();
- // table.setLinesVisible(true);
- // final IStyledLabelProvider styleProvider = new IStyledLabelProvider()
- // {
- //
- // private final WorkbenchLabelProvider wrapped = new
- // WorkbenchLabelProvider();
- //
- // public void removeListener(ILabelProviderListener listener) {
- // // Empty
- // }
- //
- // public boolean isLabelProperty(Object element, String property) {
- // return false;
- // }
- //
- // public void dispose() {
- // wrapped.dispose();
- // }
- //
- // public void addListener(ILabelProviderListener listener) {
- // // Empty
- // }
- //
- // public StyledString getStyledText(Object element) {
- // // TODO Replace with use of IWorkbenchAdapter3 when is no longer
- // // supported
- // if (element instanceof RepositoryCommit)
- // return ((RepositoryCommit) element).getStyledText(element);
- //
- // return new StyledString(wrapped.getText(element));
- // }
- //
- // public Image getImage(Object element) {
- // return wrapped.getImage(element);
- // }
- // };
- // viewer.setLabelProvider(new DelegatingStyledCellLabelProvider(
- // styleProvider));
- // applyDialogFont(composite);
- // GridDataFactory.fillDefaults().grab(true, true)
- // .align(SWT.FILL, SWT.FILL).span(2, 1)
- // .applyTo(viewer.getControl());
- // viewer.setInput(mergeResult);
- //
- // new OpenAndLinkWithEditorHelper(viewer) {
- // @Override
- // protected void linkToEditor(ISelection selection) {
- // // Not supported
- //
- // }
- //
- // @Override
- // protected void open(ISelection selection, boolean activate) {
- // handleOpen(selection, OpenStrategy.activateOnOpen());
- // }
- //
- // @Override
- // protected void activate(ISelection selection) {
- // handleOpen(selection, true);
- // }
- //
- // private void handleOpen(ISelection selection, boolean activateOnOpen)
- // {
- // if (selection instanceof IStructuredSelection)
- // for (Object element : ((IStructuredSelection) selection)
- // .toArray())
- // if (element instanceof RepositoryCommit)
- // CommitEditor.openQuiet((RepositoryCommit) element,
- // activateOnOpen);
- // }
- // };
-
return composite;
}

Back to the top