Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Goldthorpe2011-07-25 20:59:15 +0000
committerChris Goldthorpe2011-07-25 20:59:15 +0000
commit8a68868aed61ffd9f1e09ce8b0dc582a5a26db9c (patch)
tree8b28ea268a59d7c3d5725b23fec99b90fb0bebde
parent1d0b9170c3128ef67deae4f4a420934516bf4879 (diff)
downloadeclipse.platform.ua-8a68868aed61ffd9f1e09ce8b0dc582a5a26db9c.tar.gz
eclipse.platform.ua-8a68868aed61ffd9f1e09ce8b0dc582a5a26db9c.tar.xz
eclipse.platform.ua-8a68868aed61ffd9f1e09ce8b0dc582a5a26db9c.zip
Bug 193522 - [Help] Help doesn't work on Eclipse 3.2.1 on AIX
-rw-r--r--org.eclipse.help.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SeeAlsoPart.java2
-rw-r--r--org.eclipse.ua.tests/bundleversions/bundleversions.odsbin14521 -> 14534 bytes
3 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.help.ui/META-INF/MANIFEST.MF b/org.eclipse.help.ui/META-INF/MANIFEST.MF
index 241b06444..cffd64969 100644
--- a/org.eclipse.help.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.help.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %help_system_plugin_name
Bundle-SymbolicName: org.eclipse.help.ui; singleton:=true
-Bundle-Version: 3.5.100.qualifier
+Bundle-Version: 3.5.200.qualifier
Bundle-Activator: org.eclipse.help.ui.internal.HelpUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SeeAlsoPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SeeAlsoPart.java
index 8b049ec79..9f050be87 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SeeAlsoPart.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SeeAlsoPart.java
@@ -213,7 +213,7 @@ public class SeeAlsoPart extends AbstractFormPart implements IHelpPart {
* @see org.eclipse.help.ui.internal.views.IHelpPart#hasFocusControl(org.eclipse.swt.widgets.Control)
*/
public boolean hasFocusControl(Control control) {
- return control.getParent() == linkContainer;
+ return control != null && control.getParent() == linkContainer;
}
public IAction getGlobalAction(String id) {
diff --git a/org.eclipse.ua.tests/bundleversions/bundleversions.ods b/org.eclipse.ua.tests/bundleversions/bundleversions.ods
index 955032304..f75a4ed9e 100644
--- a/org.eclipse.ua.tests/bundleversions/bundleversions.ods
+++ b/org.eclipse.ua.tests/bundleversions/bundleversions.ods
Binary files differ

Back to the top