Description Peter Dell 2012-06-14 05:03:21 EDT

Build Identifier: Version 3.6.2 M20110210-1200

Hello,
I have implemented the extensions point org.eclipse.help.toc and provided new icons which are used by my AbstractTocProvider implementation to indicate which help documents are PDF files.

The problem is that the following code in 
org.eclipse.help.ui.internal.views.AllTopicsPart

Checks for "instanceof Toc" and "instanceof Topic" instead of
checking for "instanceof IToc2" and "instanceof ITopic2".



	class TopicsLabelProvider extends LabelProvider {
		public String getText(Object obj) {
			if (obj instanceof IHelpResource)
				return ((IHelpResource) obj).getLabel();
			return super.getText(obj);
		}

		public Image getImage(Object obj) {
			boolean expanded = treeViewer.getExpandedState(obj);
			boolean expandable = treeViewer.isExpandable(obj);
			if (obj instanceof Toc){
				Toc toc = (Toc) obj;
				Image icon   = HelpUIResources.getImageFromId(toc.getIcon(), expanded, !expandable); 
				if (icon != null) {
					return icon;
				}						
			}
			
			if (obj instanceof Topic) {
				Topic topic = (Topic) obj;			
				Image icon   = HelpUIResources.getImageFromId(topic.getIcon(), expanded, !expandable); 
				if (icon != null) {
					return icon;
				}
			}

Reproducible: Always

Steps to Reproduce:
1. Implemente the extension point org.eclipse.help.toc, add a toc-icon
2. Implement own classes for the interfaces IToc2/ITopic2
3. Open the online help and see the standard icon used despite of coreect implementation.