Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Goldthorpe2008-01-25 20:45:54 +0000
committerChris Goldthorpe2008-01-25 20:45:54 +0000
commitcf32e34bc8c426db1805f2eecdda25bc79be7643 (patch)
tree8a4cf7fde68bed324d98437bf3681fc3da14ae14 /org.eclipse.ui.cheatsheets
parentdfe94f3b9928b38e27867a26287d5886b79c2fe8 (diff)
downloadeclipse.platform.ua-cf32e34bc8c426db1805f2eecdda25bc79be7643.tar.gz
eclipse.platform.ua-cf32e34bc8c426db1805f2eecdda25bc79be7643.tar.xz
eclipse.platform.ua-cf32e34bc8c426db1805f2eecdda25bc79be7643.zip
Bug 216528 – [CheatSheet] Using 3.3.2 + language pack from 3.2 composite cheatsheets not loading subtasks
Diffstat (limited to 'org.eclipse.ui.cheatsheets')
-rw-r--r--org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/AbstractTask.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/AbstractTask.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/AbstractTask.java
index 9dc096cf2..ca7d3bbcf 100644
--- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/AbstractTask.java
+++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/AbstractTask.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2008 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
@@ -17,6 +17,8 @@ import java.util.ArrayList;
import java.util.Dictionary;
import java.util.Hashtable;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.ui.internal.cheatsheets.composite.parser.ITaskParseStrategy;
import org.eclipse.ui.internal.provisional.cheatsheets.ICompositeCheatSheet;
@@ -176,12 +178,12 @@ public abstract class AbstractTask implements ICompositeCheatSheetTask {
*/
public URL getInputUrl(String path) throws MalformedURLException {
int index = path.indexOf('/', 1);
- if (index >= 1) {
+ if (index >= 1 && path.charAt(0) == '/') {
String bundleName = path.substring(1, index);
String relativePath = path.substring(index + 1);
Bundle bundle = Platform.getBundle(bundleName);
if (bundle != null) {
- return bundle.getEntry(relativePath);
+ return FileLocator.find(bundle, new Path(relativePath), null);
}
}
return new URL(model.getContentUrl(), path);

Back to the top