diff options
Diffstat (limited to 'bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse')
2 files changed, 19 insertions, 19 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index 5d8a2a1d3..84c40aa57 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -370,8 +370,6 @@ public class TextMergeViewer extends ContentMergeViewer { public TextMergeViewer(Composite parent, int style, CompareConfiguration configuration) {
super(style, ResourceBundle.getBundle(BUNDLE_NAME), configuration);
- fLeftIsLocal= Utilities.getBoolean(configuration, "LEFT_IS_LOCAL", false);
-
IPreferenceStore ps= CompareUIPlugin.getDefault().getPreferenceStore();
if (ps != null) {
fPreferenceChangeListener= new IPropertyChangeListener() {
@@ -382,6 +380,8 @@ public class TextMergeViewer extends ContentMergeViewer { ps.addPropertyChangeListener(fPreferenceChangeListener);
updateFont(ps, parent);
+ fLeftIsLocal= Utilities.getBoolean(configuration, "LEFT_IS_LOCAL", false);
+ fSynchronizedScrolling= ps.getBoolean(ComparePreferencePage.SYNCHRONIZE_SCROLLING);
}
fDocumentListener= new IDocumentListener() {
@@ -533,11 +533,11 @@ public class TextMergeViewer extends ContentMergeViewer { };
fLeft= createPart(composite);
- fLeft.getTextWidget().getVerticalBar().setVisible(false);
+ fLeft.getTextWidget().getVerticalBar().setVisible(!fSynchronizedScrolling);
fLeft.addAction(MergeSourceViewer.SAVE_ID, fLeftSaveAction);
fRight= createPart(composite);
- fRight.getTextWidget().getVerticalBar().setVisible(false);
+ fRight.getTextWidget().getVerticalBar().setVisible(!fSynchronizedScrolling);
fRight.addAction(MergeSourceViewer.SAVE_ID, fRightSaveAction);
fRightCanvas= new BufferedCanvas(composite, SWT.V_SCROLL) {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java index c4d014c36..e1e8047bf 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java @@ -340,21 +340,21 @@ public class DiffTreeViewer extends TreeViewer { */
protected void createToolItems(ToolBarManager toolbarManager) {
- fCopyLeftToRightAction= new Action() {
- public void run() {
- copySelected(true);
- }
- };
- Utilities.initAction(fCopyLeftToRightAction, fBundle, "action.TakeLeft.");
- toolbarManager.appendToGroup("merge", fCopyLeftToRightAction);
-
- fCopyRightToLeftAction= new Action() {
- public void run() {
- copySelected(false);
- }
- };
- Utilities.initAction(fCopyRightToLeftAction, fBundle, "action.TakeRight.");
- toolbarManager.appendToGroup("merge", fCopyRightToLeftAction);
+// fCopyLeftToRightAction= new Action() {
+// public void run() {
+// copySelected(true);
+// }
+// };
+// Utilities.initAction(fCopyLeftToRightAction, fBundle, "action.TakeLeft.");
+// toolbarManager.appendToGroup("merge", fCopyLeftToRightAction);
+//
+// fCopyRightToLeftAction= new Action() {
+// public void run() {
+// copySelected(false);
+// }
+// };
+// Utilities.initAction(fCopyRightToLeftAction, fBundle, "action.TakeRight.");
+// toolbarManager.appendToGroup("merge", fCopyRightToLeftAction);
fNextAction= new Action() {
public void run() {
|