diff options
| author | cvs | 2001-05-31 19:48:03 +0000 |
|---|---|---|
| committer | cvs | 2001-05-31 19:48:03 +0000 |
| commit | 8acb9c5ff9e47b28bcbf251f4af75b3f523bc14e (patch) | |
| tree | fb6900c0ca9e89b10d0bb6ff9ecbf6798901c7ae /bundles/org.eclipse.compare | |
| parent | 3bbb337d33ea89c684108f9a6a62fd845b372777 (diff) | |
| download | eclipse.platform.team-8acb9c5ff9e47b28bcbf251f4af75b3f523bc14e.tar.gz eclipse.platform.team-8acb9c5ff9e47b28bcbf251f4af75b3f523bc14e.tar.xz eclipse.platform.team-8acb9c5ff9e47b28bcbf251f4af75b3f523bc14e.zip | |
aw
Diffstat (limited to 'bundles/org.eclipse.compare')
6 files changed, 44 insertions, 38 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index 5d8a2a1d3..84c40aa57 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/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/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java index c4d014c36..e1e8047bf 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java +++ b/bundles/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() {
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() {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/readme_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/readme_compare.html index 61c7c566f..0b2ea9950 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/readme_compare.html +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/readme_compare.html @@ -34,9 +34,12 @@ Problem reports fixed</h2> 1GEL43H: ITPUI:WINNT - Icon for conflicting addtion missing<br>
1GEJAJ1: ITPJUI:WIN2000 - Can't compare large files like Parser.java<br>
1GEHYZZ: ITPJUI:WIN2000 - Smoke 114: strange behaviour in "Replace from Local Histroy"<br>
+1GELRZV: ITPUI:WINNT - Remove Copy actions from structure compare viewers<br>
<h2>
Problem reports closed</h2>
+1GDU8LA: ITPVCM:WIN - error dialog while comparing resources in history view<br>
+1GEJKV2: ITPJUI:Linux - Comparison browser - lines in text too low<br>
<h1>
<hr WIDTH="100%"></h1>
diff --git a/bundles/org.eclipse.compare/readme_compare.html b/bundles/org.eclipse.compare/readme_compare.html index 61c7c566f..0b2ea9950 100644 --- a/bundles/org.eclipse.compare/readme_compare.html +++ b/bundles/org.eclipse.compare/readme_compare.html @@ -34,9 +34,12 @@ Problem reports fixed</h2> 1GEL43H: ITPUI:WINNT - Icon for conflicting addtion missing<br>
1GEJAJ1: ITPJUI:WIN2000 - Can't compare large files like Parser.java<br>
1GEHYZZ: ITPJUI:WIN2000 - Smoke 114: strange behaviour in "Replace from Local Histroy"<br>
+1GELRZV: ITPUI:WINNT - Remove Copy actions from structure compare viewers<br>
<h2>
Problem reports closed</h2>
+1GDU8LA: ITPVCM:WIN - error dialog while comparing resources in history view<br>
+1GEJKV2: ITPJUI:Linux - Comparison browser - lines in text too low<br>
<h1>
<hr WIDTH="100%"></h1>
|