diff options
author | Miles Parker | 2013-07-03 17:03:30 +0000 |
---|---|---|
committer | Miles Parker | 2013-07-03 17:03:30 +0000 |
commit | d2aa74f30377f976f2c694c9e71f150af69f50ba (patch) | |
tree | 66d7cdf6c08cdfd455ec4bd3f3c845e2f37f6d92 /org.eclipse.mylyn.reviews.ui/src | |
parent | 6da5ab1916cb5fcf3d0879bbb9cc976625e411b6 (diff) | |
download | org.eclipse.mylyn.reviews-d2aa74f30377f976f2c694c9e71f150af69f50ba.tar.gz org.eclipse.mylyn.reviews-d2aa74f30377f976f2c694c9e71f150af69f50ba.tar.xz org.eclipse.mylyn.reviews-d2aa74f30377f976f2c694c9e71f150af69f50ba.zip |
410534: [regression] compare editor structure view shows additions as
deletions and vice versa
•Remove dead code
Change-Id: I914c2e18be8346b236890ee965149c2f816b8660
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=410534
Diffstat (limited to 'org.eclipse.mylyn.reviews.ui/src')
2 files changed, 0 insertions, 74 deletions
diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/CompareUtil.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/CompareUtil.java index 8063ba840..a3e3f621e 100644 --- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/CompareUtil.java +++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/CompareUtil.java @@ -13,22 +13,10 @@ package org.eclipse.mylyn.internal.reviews.ui.compare; -import java.lang.reflect.Field; import java.lang.reflect.Method; -import org.eclipse.compare.CompareConfiguration; -import org.eclipse.compare.contentmergeviewer.ContentMergeViewer; -import org.eclipse.compare.contentmergeviewer.IMergeViewerContentProvider; -import org.eclipse.compare.contentmergeviewer.TextMergeViewer; import org.eclipse.compare.internal.MergeSourceViewer; -import org.eclipse.compare.structuremergeviewer.DiffNode; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; import org.eclipse.jface.text.source.SourceViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.mylyn.commons.core.StatusHandler; -import org.eclipse.mylyn.internal.reviews.ui.ReviewsUiPlugin; -import org.eclipse.mylyn.reviews.core.model.IFileItem; import org.eclipse.mylyn.reviews.core.model.IFileVersion; /** @@ -36,20 +24,6 @@ import org.eclipse.mylyn.reviews.core.model.IFileVersion; */ public class CompareUtil { - public static DiffNode createDiffNode(IFileItem file) { - byte[] targetContent = getContent(file.getTarget()); - byte[] baseContent = getContent(file.getBase()); - String targetPath = file.getTarget().getPath(); - if (targetPath == null) { - targetPath = file.getBase().getPath(); - } - String basePath = file.getBase().getPath(); - if (basePath == null) { - basePath = targetPath; - } - return new DiffNode(new ByteArrayInput(targetContent, targetPath), new ByteArrayInput(baseContent, basePath)); - } - public static byte[] getContent(IFileVersion version) { String content = version.getContent(); return (content != null) ? content.getBytes() : new byte[0]; @@ -74,46 +48,4 @@ public class CompareUtil { return null; } - static void setActiveViewer(TextMergeViewer mergeViewer, MergeSourceViewer focusViewer) { - try { - Method setActiveViewer = TextMergeViewer.class.getDeclaredMethod("setActiveViewer", - MergeSourceViewer.class, boolean.class); - setActiveViewer.setAccessible(true); - setActiveViewer.invoke(mergeViewer, focusViewer, true); - } catch (Exception e) { - StatusHandler.log(new Status(IStatus.WARNING, ReviewsUiPlugin.PLUGIN_ID, "Failed to activate viewer", e)); - } - } - - static void configureSourceViewers(Viewer contentViewer, TextMergeViewer textMergeViewer, - final MergeSourceViewer fLeft, final MergeSourceViewer fRight) { - // hack for Eclipse 3.5 - try { - Method getCompareConfiguration = ContentMergeViewer.class.getDeclaredMethod("getCompareConfiguration"); - getCompareConfiguration.setAccessible(true); - CompareConfiguration cc = (CompareConfiguration) getCompareConfiguration.invoke(textMergeViewer); - - Method getMergeContentProvider = ContentMergeViewer.class.getDeclaredMethod("getMergeContentProvider"); - getMergeContentProvider.setAccessible(true); - IMergeViewerContentProvider cp = (IMergeViewerContentProvider) getMergeContentProvider.invoke(textMergeViewer); - - Method getSourceViewer = MergeSourceViewer.class.getDeclaredMethod("getSourceViewer"); - - Method configureSourceViewer = TextMergeViewer.class.getDeclaredMethod("configureSourceViewer", - SourceViewer.class, boolean.class); - configureSourceViewer.setAccessible(true); - configureSourceViewer.invoke(contentViewer, getSourceViewer.invoke(fLeft), - cc.isLeftEditable() && cp.isLeftEditable(textMergeViewer.getInput())); - configureSourceViewer.invoke(contentViewer, getSourceViewer.invoke(fRight), - cc.isRightEditable() && cp.isRightEditable(textMergeViewer.getInput())); - - Field isConfiguredField = TextMergeViewer.class.getDeclaredField("isConfigured"); - isConfiguredField.setAccessible(true); - isConfiguredField.set(contentViewer, true); - } catch (Throwable t) { - t.printStackTrace(); - // ignore as it may not exist in other versions - } - } - } diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/FileItemCompareEditorInput.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/FileItemCompareEditorInput.java index 5298f6f0e..6e5817fba 100644 --- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/FileItemCompareEditorInput.java +++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/compare/FileItemCompareEditorInput.java @@ -64,10 +64,4 @@ public class FileItemCompareEditorInput extends CompareEditorInput { public IFileItem getFile() { return file; } - - @Override - protected void contentsCreated() { - super.contentsCreated(); - //getAnnotationModelToAttach().focusOnComment(); - } }
\ No newline at end of file |