*** empty log message ***

1 files changed, 25 insertions, 2 deletions

diff --git a/org.eclipse.help/src/org/eclipse/help/internal/protocols/TocURL.java b/org.eclipse.help/src/org/eclipse/help/internal/protocols/TocURL.java
index 187bf125c..e0540134c 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/protocols/TocURL.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/protocols/TocURL.java
@@ -17,7 +17,7 @@ import org.eclipse.help.internal.util.XMLGenerator;
  * <ul>

  * <li>toc/pluginid/tocfile.xml: the toc defined by the specified toc xml</li> 

  * <li>toc/: all the toc's </li>

- * <li>toc/topic=/pluginid/topic.html: the toc that contains the specified topic </li>

+ * <li>toc/?topic=/pluginid/topic.html: a list of toc that contain the specified topic </li>

  * </ul>

  */

 public class TocURL extends HelpURL {

@@ -47,7 +47,7 @@ public class TocURL extends HelpURL {
 			if (getValue("topic") == null)

 				return serializeTocs();

 			else

-				return serializeToc(findTocContainingTopic(getValue("topic")));

+				return serializeTocs(findTocContainingTopic(getValue("topic")));

 		} 

 		return serializeToc(url);

 	}

@@ -101,6 +101,29 @@ public class TocURL extends HelpURL {
 	}

 	

 	/**

+	 * @return InputStream from XML representation of TOC list

+	 */

+	private InputStream serializeTocs(IToc toc) {

+		if (toc == null)

+			return null;

+

+		StringWriter stWriter = new StringWriter();

+		TocWriter gen = new TocWriter(stWriter);

+		gen.println("<tocs>");

+		gen.pad++;

+		gen.printPad();

+		gen.generate(toc, false);

+		gen.pad--;

+		gen.println("</tocs>");

+		gen.close();

+		try {

+			return new ByteArrayInputStream(stWriter.toString().getBytes("UTF8"));

+		} catch (UnsupportedEncodingException uee) {

+			return null;

+		}

+	}

+	

+	/**

 	 * Finds a TOC that contains specified topic

 	 * @param topic the topic href

 	 */