diff options
| author | Erich Gamma | 2002-06-12 18:17:40 +0000 |
|---|---|---|
| committer | Erich Gamma | 2002-06-12 18:17:40 +0000 |
| commit | b18bad0be4773eaf0708c49618d420056288edc7 (patch) | |
| tree | ff66a0d173f77044d0fade594b29a3731c470b1b /bundles/org.eclipse.compare/compare/org/eclipse/compare | |
| parent | d41901ffe8a4da8bc1c14981715dc430153a09f7 (diff) | |
| download | eclipse.platform.team-b18bad0be4773eaf0708c49618d420056288edc7.tar.gz eclipse.platform.team-b18bad0be4773eaf0708c49618d420056288edc7.tar.xz eclipse.platform.team-b18bad0be4773eaf0708c49618d420056288edc7.zip | |
[19972]: fix the problem that compare change global open strategy settingv20020612a
Fixed by Dirk Baeumer and reviewed by Adam Kiezun
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare')
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java index fdbe766f7..372742589 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java @@ -430,7 +430,9 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang }
);
+ // Begin fix for http://bugs.eclipse.org/bugs/show_bug.cgi?id=19972
// setup the wiring for second pane
+ /*
fStructurePane1.addOpenListener(
new IOpenListener() {
public void open(OpenEvent oe) {
@@ -438,17 +440,23 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang }
}
);
+ */
+ // End fix for http://bugs.eclipse.org/bugs/show_bug.cgi?id=19972
fStructurePane1.addSelectionChangedListener(
new ISelectionChangedListener() {
public void selectionChanged(SelectionChangedEvent e) {
ISelection s= e.getSelection();
- if (s == null || s.isEmpty())
- feed2(s);
+ // Begin fix for http://bugs.eclipse.org/bugs/show_bug.cgi?id=19972
+ // if (s == null || s.isEmpty())
+ // End fix for http://bugs.eclipse.org/bugs/show_bug.cgi?id=19972
+ feed2(s);
}
}
);
+ // Begin fix for http://bugs.eclipse.org/bugs/show_bug.cgi?id=19972
// setup the wiring for third pane
+ /*
fStructurePane2.addOpenListener(
new IOpenListener() {
public void open(OpenEvent oe) {
@@ -456,17 +464,24 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang }
}
);
+ */
+ // End fix for http://bugs.eclipse.org/bugs/show_bug.cgi?id=19972
fStructurePane2.addSelectionChangedListener(
new ISelectionChangedListener() {
public void selectionChanged(SelectionChangedEvent e) {
ISelection s= e.getSelection();
- if (s == null || s.isEmpty())
- feed3(s);
+ // Begin fix for http://bugs.eclipse.org/bugs/show_bug.cgi?id=19972
+ // if (s == null || s.isEmpty())
+ // End fix for http://bugs.eclipse.org/bugs/show_bug.cgi?id=19972
+ feed3(s);
}
}
);
+
+ // Begin fix for http://bugs.eclipse.org/bugs/show_bug.cgi?id=19972
// now deal with activation/deactivation
+ /*
Listener activationListener= new Listener() {
int fOldOpenStrategy;
@@ -495,6 +510,8 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang fStructurePane1.addListener(SWT.Deactivate, activationListener);
fStructurePane2.addListener(SWT.Deactivate, activationListener);
fContentInputPane.addListener(SWT.Deactivate, activationListener);
+ */
+ // End fix for http://bugs.eclipse.org/bugs/show_bug.cgi?id=19972
if (fInput instanceof ICompareInput) {
|