173328 [Webapp] Links not showing correctly (Help test scenario A2.6)v20070207

3 files changed, 4 insertions, 12 deletions

diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java
index 8ea86f145..2bb63eccb 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpDisplay.java
@@ -195,8 +195,7 @@ public class HelpDisplay {
 
 	private String getContextID(IContext context) {
 		if (context instanceof Context) {
-			Context c = (Context)context;
-			return c.getPluginId() + '.' + c.getId();
+			return ((Context)context).getId();
 		}
 		return HelpPlugin.getContextManager().addContext(context);
 	}
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/context/Context.java b/org.eclipse.help/src/org/eclipse/help/internal/context/Context.java
index cf01695f7..ee797bf3b 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/context/Context.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/context/Context.java
@@ -27,9 +27,10 @@ public class Context extends UAElement implements IContext {
 	public static final String ATTRIBUTE_ID = "id"; //$NON-NLS-1$
 	public static final String ATTRIBUTE_PLUGIN_ID = "pluginId"; //$NON-NLS-1$
 	
-	public Context(IContext src) {
+	public Context(IContext src, String id) {
 		super(NAME);
 		setText(src.getText());
+		setId(id);
 		IHelpResource[] topics = src.getRelatedTopics();
 		for (int i=0;i<topics.length;++i) {
 			if (topics[i] instanceof ITopic) {
@@ -56,10 +57,6 @@ public class Context extends UAElement implements IContext {
 		return getAttribute(ATTRIBUTE_ID);
 	}
 	
-	public String getPluginId() {
-		return getAttribute(ATTRIBUTE_PLUGIN_ID);
-	}
-	
 	public String getText() {
 		Node node = element.getFirstChild();
 		while (node != null) {
@@ -82,10 +79,6 @@ public class Context extends UAElement implements IContext {
 		setAttribute(ATTRIBUTE_ID, id);
 	}
 
-	public void setPluginId(String pluginId) {
-		setAttribute(ATTRIBUTE_PLUGIN_ID, pluginId);
-	}
-	
 	public void setText(String text) {
 		Node node = element.getFirstChild();
 		while (node != null) {
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/context/ContextManager.java b/org.eclipse.help/src/org/eclipse/help/internal/context/ContextManager.java
index 85b338b3a..50b8bc355 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/context/ContextManager.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/context/ContextManager.java
@@ -76,7 +76,7 @@ public class ContextManager {
 			while (iter.hasNext()) {
 				AbstractContextProvider provider = (AbstractContextProvider)iter.next();
 				try {
-					return provider.getContext(contextId, locale);
+					return new Context(provider.getContext(contextId, locale), contextId);
 				}
 				catch (Throwable t) {
 					// log and skip