Bug 334592 - IWorkbenchHelpSystem#displayHelpResource() no longer works for file: URLs

2 files changed, 12 insertions, 3 deletions

diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java
index 2f2380864..f307bb282 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -158,9 +158,10 @@ public class UrlUtil {
 	public static boolean isValidTopicParamOrWasOpenedFromHelpDisplay(String path) {
 		// Topics opened via the help display ( including cheat sheets and intro ) 
 		// are are always valid
-		if (path.equals(BaseHelpSystem.getHelpDisplay().getHrefOpenedFromHelpDisplay())) {
+		if (wasOpenedFromHelpDisplay(path)) {
 			return true;
 		}
+
 		if (new WebappPreferences().isRestrictTopicParameter()) {
 		    if (path.indexOf("://") >= 0) {  //$NON-NLS-1$
 			    return false;
@@ -168,6 +169,13 @@ public class UrlUtil {
 		}
 		return true;
 	}
+
+	public static boolean wasOpenedFromHelpDisplay(String path) {
+		if (path.equals(BaseHelpSystem.getHelpDisplay().getHrefOpenedFromHelpDisplay())) {
+			return true;
+		}
+		return path.equals(getHelpURL(BaseHelpSystem.getHelpDisplay().getHrefOpenedFromHelpDisplay()));
+	}
 	
 	/**
 	 * Returns a path to the given topic in the form of child indexes. For
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
index 398894866..66ce98a9e 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
@@ -94,7 +94,8 @@ public class EclipseConnector {
 			}
 			String lowerCaseuRL = url.toLowerCase(Locale.ENGLISH);
 			if (lowerCaseuRL.startsWith("jar:") //$NON-NLS-1$
-					|| lowerCaseuRL.startsWith("platform:")) { //$NON-NLS-1$
+					|| lowerCaseuRL.startsWith("platform:") //$NON-NLS-1$
+					|| (lowerCaseuRL.startsWith("file:") && UrlUtil.wasOpenedFromHelpDisplay(url))) { //$NON-NLS-1$
 				int i = url.indexOf('?');
 				if (i != -1)
 					url = url.substring(0, i);