Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErich Gamma2002-06-12 14:17:40 -0400
committerErich Gamma2002-06-12 14:17:40 -0400
commitb18bad0be4773eaf0708c49618d420056288edc7 (patch)
treeff66a0d173f77044d0fade594b29a3731c470b1b
parentd41901ffe8a4da8bc1c14981715dc430153a09f7 (diff)
downloadeclipse.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
-rw-r--r--bundles/org.eclipse.compare/buildnotes_compare.html13
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java25
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html13
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java25
4 files changed, 68 insertions, 8 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 28405b0d4..25bd193a6 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -11,6 +11,19 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input June 12th 2002
+
+<h2>
+What's new in this drop</h2>
+
+There were several complains that clicking on a zip file in the left pane (structure input pane) feeds all other
+compare panes (see bug 13730). There are cases where this is expensive (for example a large zip file that has
+to be read from a repository). To avoid those situations the left pane now honors single or double click mode as
+set in Preferences->Workbench. So if this preference is set to double click the user has to double click on a file
+in the left pane to actually feed all other compare panes.
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse Build Input June 8th 2002
<h2>
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) {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index 28405b0d4..25bd193a6 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -11,6 +11,19 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input June 12th 2002
+
+<h2>
+What's new in this drop</h2>
+
+There were several complains that clicking on a zip file in the left pane (structure input pane) feeds all other
+compare panes (see bug 13730). There are cases where this is expensive (for example a large zip file that has
+to be read from a repository). To avoid those situations the left pane now honors single or double click mode as
+set in Preferences->Workbench. So if this preference is set to double click the user has to double click on a file
+in the left pane to actually feed all other compare panes.
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse Build Input June 8th 2002
<h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
index fdbe766f7..372742589 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
+++ b/bundles/org.eclipse.compare/plugins/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) {

Back to the top