removing registration of help url handler

3 files changed, 19 insertions, 12 deletions

diff --git a/org.eclipse.help/plugin.xml b/org.eclipse.help/plugin.xml
index fd28d282a..d78b0a880 100644
--- a/org.eclipse.help/plugin.xml
+++ b/org.eclipse.help/plugin.xml
@@ -19,13 +19,4 @@
    <extension-point id="toc" name="%toc_extension_point_name" schema="schema/toc.exsd"/>
    <extension-point id="contentProducer" name="%content_producer_extension_point_name" schema="schema/contentProducer.exsd"/>
 
-<!--  Help URL protocols -->
-   <extension
-         point="org.eclipse.core.runtime.urlHandlers">
-      <handler
-            class="org.eclipse.help.internal.protocols.URLHandler"
-            protocol="help">
-      </handler>
-   </extension>
-
 </plugin>
diff --git a/org.eclipse.help/src/org/eclipse/help/HelpSystem.java b/org.eclipse.help/src/org/eclipse/help/HelpSystem.java
index b45a590c8..1b143d0a2 100644
--- a/org.eclipse.help/src/org/eclipse/help/HelpSystem.java
+++ b/org.eclipse.help/src/org/eclipse/help/HelpSystem.java
@@ -15,6 +15,7 @@ import java.net.*;
 
 import org.eclipse.core.boot.*;
 import org.eclipse.help.internal.*;
+import org.eclipse.help.internal.protocols.*;
 
 /**
  * This class provides general access to help content contributed to the 
@@ -69,7 +70,15 @@ public final class HelpSystem {
 	 */
 	public static InputStream getHelpContent(String href) {
 		try {
-			URL helpURL = new URL("help:" + href);
+			// URL helpURL = new URL("help:" + href);
+			URL helpURL =
+				new URL(
+					"help",
+					null,
+					-1,
+					href,
+					HelpURLStreamHandler.getDefault());
+			
 			return helpURL.openStream();
 		} catch (IOException ioe) {
 			return null;
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/protocols/URLHandler.java b/org.eclipse.help/src/org/eclipse/help/internal/protocols/HelpURLStreamHandler.java
index 15467fd55..8969f39a6 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/protocols/URLHandler.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/protocols/HelpURLStreamHandler.java
@@ -11,11 +11,12 @@
 package org.eclipse.help.internal.protocols;
 import java.io.*;
 import java.net.*;
-public class URLHandler extends URLStreamHandler {
+public class HelpURLStreamHandler extends URLStreamHandler {
+	private static HelpURLStreamHandler instance;
 	/**
 	 * Constructor for URLHandler
 	 */
-	public URLHandler() {
+	public HelpURLStreamHandler() {
 		super();
 	}
 	/**
@@ -29,4 +30,10 @@ public class URLHandler extends URLStreamHandler {
 			return null;
 		}
 	}
+	public static URLStreamHandler getDefault() {
+		if (instance == null) {
+			instance = new HelpURLStreamHandler();
+		}
+		return instance;
+	}
 }