Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Goldthorpe2010-01-14 23:55:13 +0000
committerChris Goldthorpe2010-01-14 23:55:13 +0000
commit989cdf16cd630696964151a500a92f85bc8c188c (patch)
tree59e740c36be261d59491cb82f9683f240455c723
parent0e7099de0a2ba0279558e7c81a1b288d126cb7c7 (diff)
downloadeclipse.platform.ua-989cdf16cd630696964151a500a92f85bc8c188c.tar.gz
eclipse.platform.ua-989cdf16cd630696964151a500a92f85bc8c188c.tar.xz
eclipse.platform.ua-989cdf16cd630696964151a500a92f85bc8c188c.zip
Bug 297637 - [Help] org.eclipse.help.contentExtension does not work in a fragment of a help plugin
-rw-r--r--org.eclipse.help/src/org/eclipse/help/internal/extension/ContentExtensionFileParser.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/extension/ContentExtensionFileParser.java b/org.eclipse.help/src/org/eclipse/help/internal/extension/ContentExtensionFileParser.java
index 6ecd2e737..78c19920a 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/extension/ContentExtensionFileParser.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/extension/ContentExtensionFileParser.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2010 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
@@ -19,6 +19,8 @@ import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
import org.eclipse.help.IUAElement;
import org.eclipse.help.internal.UAElement;
import org.eclipse.help.internal.dynamic.DocumentProcessor;
@@ -46,7 +48,7 @@ public class ContentExtensionFileParser extends DefaultHandler {
if (reader == null) {
reader = new DocumentReader();
}
- URL url = bundle.getEntry(path);
+ URL url= FileLocator.find(bundle, new Path(path), null);
if (url != null) {
InputStream in = url.openStream();
UAElement extension = (UAElement)reader.read(in);

Back to the top