Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2005-06-07 17:15:03 -0400
committerAndre Weinand2005-06-07 17:15:03 -0400
commit417102359362b06d07b39da2fa63ed1b3cc14c5a (patch)
treef34c16792def18362b284b21ba2134bbe7c54510
parenta44e5917be7ff121817f43ee1e3c92d46d18bb5c (diff)
downloadeclipse.platform.team-417102359362b06d07b39da2fa63ed1b3cc14c5a.tar.gz
eclipse.platform.team-417102359362b06d07b39da2fa63ed1b3cc14c5a.tar.xz
eclipse.platform.team-417102359362b06d07b39da2fa63ed1b3cc14c5a.zip
fixed #67888: [accessibility] Go To Next Difference stops working on reuse of editorv20050609
-rw-r--r--bundles/org.eclipse.compare/buildnotes_compare.html1
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java11
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html1
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java11
4 files changed, 22 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 2cd574e09..f300b27ff 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -16,6 +16,7 @@ Eclipse Build Input 3.1RC2 2005
<h2>Problem reports fixed</h2>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=98828">98828</a>: CompareFilter bug filtering folders<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=67888">67888</a>: [accessibility] Go To Next Difference stops working on reuse of editor<br>
<h1><hr WIDTH="100%"></h1>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
index 42cf30a30..c2566cc2a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
@@ -100,7 +100,16 @@ public class CompareEditor extends EditorPart implements IReusableEditor {
public void setInput(IEditorInput input) {
try {
- doSetInput(input);
+ doSetInput(input);
+ // Need to refresh the contributor (see #67888)
+ IEditorSite editorSite= getEditorSite();
+ if (editorSite != null) {
+ IEditorActionBarContributor actionBarContributor= editorSite.getActionBarContributor();
+ if (actionBarContributor != null) {
+ actionBarContributor.setActiveEditor(null);
+ actionBarContributor.setActiveEditor(this);
+ }
+ }
} catch (CoreException x) {
String title= Utilities.getString("CompareEditor.error.setinput.title"); //$NON-NLS-1$
String msg= Utilities.getString("CompareEditor.error.setinput.message"); //$NON-NLS-1$
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 2cd574e09..f300b27ff 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
@@ -16,6 +16,7 @@ Eclipse Build Input 3.1RC2 2005
<h2>Problem reports fixed</h2>
<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=98828">98828</a>: CompareFilter bug filtering folders<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=67888">67888</a>: [accessibility] Go To Next Difference stops working on reuse of editor<br>
<h1><hr WIDTH="100%"></h1>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
index 42cf30a30..c2566cc2a 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
@@ -100,7 +100,16 @@ public class CompareEditor extends EditorPart implements IReusableEditor {
public void setInput(IEditorInput input) {
try {
- doSetInput(input);
+ doSetInput(input);
+ // Need to refresh the contributor (see #67888)
+ IEditorSite editorSite= getEditorSite();
+ if (editorSite != null) {
+ IEditorActionBarContributor actionBarContributor= editorSite.getActionBarContributor();
+ if (actionBarContributor != null) {
+ actionBarContributor.setActiveEditor(null);
+ actionBarContributor.setActiveEditor(this);
+ }
+ }
} catch (CoreException x) {
String title= Utilities.getString("CompareEditor.error.setinput.title"); //$NON-NLS-1$
String msg= Utilities.getString("CompareEditor.error.setinput.message"); //$NON-NLS-1$

Back to the top