89998 Dynamic help view section title for F1 help is "About Problems", and incorrect context shown

6 files changed, 47 insertions, 47 deletions

diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/DefaultHelpUI.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/DefaultHelpUI.java
index 404bd6cb4..329622bf1 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/DefaultHelpUI.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/DefaultHelpUI.java
@@ -12,7 +12,8 @@ package org.eclipse.help.ui.internal;
 
 import java.net.URL;
 
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Preferences;
 import org.eclipse.help.IContext;
 import org.eclipse.help.browser.IBrowser;
 import org.eclipse.help.internal.base.BaseHelpSystem;
@@ -23,7 +24,7 @@ import org.eclipse.help.ui.internal.views.ContextHelpWindow;
 import org.eclipse.help.ui.internal.views.HelpView;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.service.environment.*;
+import org.eclipse.osgi.service.environment.Constants;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
@@ -280,9 +281,6 @@ public class DefaultHelpUI extends AbstractHelpUI {
 		return BaseHelpSystem.resolve(href, documentOnly);
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.help.AbstractHelpUI#unresolve(java.net.URL)
-	 */
 	public String unresolve(URL url) {
 		return BaseHelpSystem.unresolve(url);
 	}
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java
index da45ad3ad..a22e259d9 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpPart.java
@@ -201,42 +201,51 @@ public class ContextHelpPart extends SectionPart implements IHelpPart {
 					.getSearchExpression(lastControl) : null, lastControl);
 	}
 
-	public void handleActivation(IContext context, Control c,
-			IWorkbenchPart part) {
-		if (text.isDisposed())
-			return;
-		lastControl = c;
-		lastContext = context;
-		lastPart = part;
-		lastProvider = null;
-		String helpText = formatHelpContext(context);
-		updateTitle();
-		if (getSection().isExpanded())
-			updateText(helpText);
-		updateDynamicHelp();
-	}
-
-	public void handleActivation(IContextProvider provider, Control c,
+//	public void handleActivation(IContext context, Control c,
+//			IWorkbenchPart part) {
+//		if (text.isDisposed())
+//			return;
+//		lastControl = c;
+//		lastContext = context;
+//		lastPart = part;
+//		lastProvider = null;
+//		String helpText = formatHelpContext(context);
+//		updateTitle(context!=null);
+//		if (getSection().isExpanded())
+//			updateText(helpText);
+//		updateDynamicHelp();
+//	}
+
+	public void handleActivation(IContextProvider provider, IContext context, 
+			Control c,
 			IWorkbenchPart part) {
 		if (text.isDisposed())
 			return;
 		lastControl = c;
 		lastProvider = provider;
+		lastContext = context;
 		lastPart = part;
-		String helpText = createContextHelp(provider, c);
-		updateTitle();
+		if (context==null && provider!=null) {
+			lastContext = provider.getContext(c);
+		}
+		String helpText;
+		if (lastContext!=null)
+			helpText = formatHelpContext(lastContext);
+		else
+			helpText = createContextHelp(c);
+		updateTitle(context!=null);
 		if (getSection().isExpanded())
 			updateText(helpText);
 		updateDynamicHelp();
 	}
 
-	private void updateTitle() {
+	private void updateTitle(boolean contextSupplied) {
 		String title = null;
 		if (lastContext != null && lastContext instanceof IContext2) {
 			IContext2 c2 = (IContext2)lastContext;
 			title = c2.getTitle(); 
 		}
-		if (title==null && lastPart != null)
+		if (title==null && !contextSupplied && lastPart != null)
 			title = NLS.bind(Messages.ContextHelpPart_aboutP, lastPart
 							.getSite().getRegisteredName());
 		if (title==null)
@@ -488,12 +497,12 @@ public class ContextHelpPart extends SectionPart implements IHelpPart {
 	public boolean setFormInput(Object input) {
 		if (input instanceof ContextHelpProviderInput) {
 			ContextHelpProviderInput chinput = (ContextHelpProviderInput) input;
-			if (chinput.getContext() != null)
-				handleActivation(chinput.getContext(), chinput.getControl(),
-						chinput.getPart());
-			else
-				handleActivation(chinput.getProvider(), chinput.getControl(),
+			//if (chinput.getContext() != null)
+				handleActivation(chinput.getProvider(), chinput.getContext(), chinput.getControl(),
 						chinput.getPart());
+			//else
+				//handleActivation(chinput.getProvider(), chinput.getControl(),
+					//	chinput.getPart());
 			return true;
 		}
 		return false;
@@ -538,7 +547,5 @@ public class ContextHelpPart extends SectionPart implements IHelpPart {
 	}
 
 	public void saveState(IMemento memento) {
-		// TODO Auto-generated method stub
-
 	}
 }
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpProviderInput.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpProviderInput.java
index fda16cdab..796c2623b 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpProviderInput.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ContextHelpProviderInput.java
@@ -20,15 +20,10 @@ public class ContextHelpProviderInput {
 	private IContextProvider provider;
 	private Control control;
 	private IWorkbenchPart part;
-	public ContextHelpProviderInput(IContextProvider provider, Control control, IWorkbenchPart part) {
+	public ContextHelpProviderInput(IContextProvider provider, IContext context, Control control, IWorkbenchPart part) {
 		this.provider = provider;
-		this.control =control;
-		this.part = part;
-	}
-	
-	public ContextHelpProviderInput(IContext context, Control control, IWorkbenchPart part) {
 		this.context = context;
-		this.control = control;
+		this.control =control;
 		this.part = part;
 	}
 	
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/HelpView.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/HelpView.java
index 107cf21fd..1d070d1d2 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/HelpView.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/HelpView.java
@@ -127,7 +127,7 @@ public class HelpView extends ViewPart implements IPartListener2,
 					.getAdapter(IContextProvider.class);
 			if (provider != null) {
 				if (visible)
-					reusableHelpPart.update(provider, part, c);
+					reusableHelpPart.update(provider, null, part, c);
 				if ((provider.getContextChangeMask() & IContextProvider.SELECTION) != 0) {
 					// context help changes with selections
 					installSelectionListener(part);
@@ -189,7 +189,7 @@ public class HelpView extends ViewPart implements IPartListener2,
 				.getFocusControl();
 		if (c != null && c.isDisposed() == false && visible) {
 			if (provider != null)
-				reusableHelpPart.update(provider, monitoredPart, c);
+				reusableHelpPart.update(provider, null, monitoredPart, c);
 			else
 				reusableHelpPart.update(monitoredPart, c);
 		}
@@ -348,7 +348,7 @@ public class HelpView extends ViewPart implements IPartListener2,
 					provider = (IContextProvider) part
 					.getAdapter(IContextProvider.class);
 			if (provider != null)
-				reusableHelpPart.update(provider, part, control);
+				reusableHelpPart.update(provider, context, part, control);
 			else
 				reusableHelpPart.update(context, part, control);
 		}
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/RelatedTopicsPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/RelatedTopicsPart.java
index f9ee77c6e..4db6a38c7 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/RelatedTopicsPart.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/RelatedTopicsPart.java
@@ -169,8 +169,8 @@ public class RelatedTopicsPart extends AbstractFormPart implements IHelpPart {
 	}
 
 	public void saveState(IMemento memento) {
-		// TODO Auto-generated method stub
 	}
+
 	public void setFocus() {
 		if (contextHelpPart!=null)
 			contextHelpPart.setFocus();
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java
index 0a49a5ca0..400775682 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java
@@ -986,16 +986,16 @@ public class ReusableHelpPart implements IHelpUIConstants,
 
 	public void update(IWorkbenchPart part, Control control) {
 		mform.setInput(new ContextHelpProviderInput((IContextProvider) null,
-				control, part));
+				null, control, part));
 	}
 
-	public void update(IContextProvider provider, IWorkbenchPart part,
+	public void update(IContextProvider provider, IContext context, IWorkbenchPart part,
 			Control control) {
-		mform.setInput(new ContextHelpProviderInput(provider, control, part));
+		mform.setInput(new ContextHelpProviderInput(provider, context, control, part));
 	}
 
 	public void update(IContext context, IWorkbenchPart part, Control control) {
-		mform.setInput(new ContextHelpProviderInput(context, control, part));
+		mform.setInput(new ContextHelpProviderInput(null, context, control, part));
 	}
 
 	private IHelpPart createPart(String id, IToolBarManager tbm) {