diff options
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java')
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java | 37 |
1 files changed, 3 insertions, 34 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java index 58ae50ac2..81cd5603b 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -9,7 +9,6 @@ * IBM Corporation - initial API and implementation * Alex Blewitt <alex.blewitt@gmail.com> - replace new Boolean with Boolean.valueOf - https://bugs.eclipse.org/470344 * Stefan Xenos <sxenos@gmail.com> (Google) - bug 448968 - Add diagnostic logging - * Conrad Groth - Bug 213780 - Compare With direction should be configurable *******************************************************************************/ package org.eclipse.compare.contentmergeviewer; @@ -27,13 +26,11 @@ import org.eclipse.compare.internal.ChangePropertyAction; import org.eclipse.compare.internal.CompareEditor; import org.eclipse.compare.internal.CompareHandlerService; import org.eclipse.compare.internal.CompareMessages; -import org.eclipse.compare.internal.ComparePreferencePage; import org.eclipse.compare.internal.CompareUIPlugin; import org.eclipse.compare.internal.ICompareUIConstants; import org.eclipse.compare.internal.IFlushable2; import org.eclipse.compare.internal.ISavingSaveable; import org.eclipse.compare.internal.MergeViewerContentProvider; -import org.eclipse.compare.internal.MirroredMergeViewerContentProvider; import org.eclipse.compare.internal.Policy; import org.eclipse.compare.internal.Utilities; import org.eclipse.compare.internal.ViewerSwitchingCancelled; @@ -357,8 +354,6 @@ public abstract class ContentMergeViewer extends ContentViewer } } }; - private final MergeViewerContentProvider defaultContentProvider; - private boolean leftToRight; //---- end @@ -383,10 +378,7 @@ public abstract class ContentMergeViewer extends ContentViewer fAncestorVisible= Utilities.getBoolean(cc, ICompareUIConstants.PROP_ANCESTOR_VISIBLE, fAncestorVisible); fConfirmSave= Utilities.getBoolean(cc, CompareEditor.CONFIRM_SAVE_PROPERTY, fConfirmSave); - defaultContentProvider = new MergeViewerContentProvider(cc); - leftToRight = ICompareUIConstants.PREF_VALUE_LEFT_TO_RIGHT - .equals(cc.getProperty(ComparePreferencePage.LAYOUT)); - updateContentProvider(); + setContentProvider(new MergeViewerContentProvider(cc)); fCompareInputChangeListener= new ICompareInputChangeListener() { public void compareInputChanged(ICompareInput input) { @@ -543,12 +535,6 @@ public abstract class ContentMergeViewer extends ContentViewer super.setContentProvider(contentProvider); } - private void updateContentProvider() { - setContentProvider(leftToRight - ? new MirroredMergeViewerContentProvider(defaultContentProvider) - : defaultContentProvider); - } - /* package */ IMergeViewerContentProvider getMergeContentProvider() { return (IMergeViewerContentProvider) getContentProvider(); } @@ -600,13 +586,6 @@ public abstract class ContentMergeViewer extends ContentViewer setAncestorVisibility(false, !Utilities.getBoolean(getCompareConfiguration(), ICompareUIConstants.PROP_IGNORE_ANCESTOR, false)); return; } - - if (key.equals(ComparePreferencePage.LAYOUT)) { - leftToRight = ICompareUIConstants.PREF_VALUE_LEFT_TO_RIGHT - .equals(event.getNewValue()); - updateContentProvider(); - return; - } } void updateCursor(Control c, int dir) { @@ -941,16 +920,6 @@ public abstract class ContentMergeViewer extends ContentViewer tbm.appendToGroup("merge", fCopyRightToLeftAction); //$NON-NLS-1$ fHandlerService.registerAction(fCopyRightToLeftAction, "org.eclipse.compare.copyAllRightToLeft"); //$NON-NLS-1$ } - - Action switchLeftAndRight = new Action() { - @Override - public void run() { - leftToRight = !leftToRight; - updateContentProvider(); - } - }; - Utilities.initAction(switchLeftAndRight, getResourceBundle(), "action.SwitchLeftAndRight."); //$NON-NLS-1$ - tbm.appendToGroup("modes", switchLeftAndRight); //$NON-NLS-1$ final ChangePropertyAction a= new ChangePropertyAction(fBundle, getCompareConfiguration(), "action.EnableAncestor.", ICompareUIConstants.PROP_ANCESTOR_VISIBLE); //$NON-NLS-1$ a.setChecked(fAncestorVisible); @@ -958,7 +927,7 @@ public abstract class ContentMergeViewer extends ContentViewer fAncestorItem.setVisible(false); tbm.appendToGroup("modes", fAncestorItem); //$NON-NLS-1$ tbm.getControl().addDisposeListener(a); - + createToolItems(tbm); updateToolItems(); |