Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Kolosowski2004-01-19 13:14:22 -0500
committerKonrad Kolosowski2004-01-19 13:14:22 -0500
commitb35bdfb76df67a9da327c713330afbc46de4f6e1 (patch)
tree1f1a578b915febbb78560c2934955422e13643bd
parentead16b704114e1f9d096d9396a6c988f6a54ab3c (diff)
downloadeclipse.platform.ua-b35bdfb76df67a9da327c713330afbc46de4f6e1.tar.gz
eclipse.platform.ua-b35bdfb76df67a9da327c713330afbc46de4f6e1.tar.xz
eclipse.platform.ua-b35bdfb76df67a9da327c713330afbc46de4f6e1.zip
Platform.resolve changed behavior, need to use Platform.asLocalURLv20040119
-rw-r--r--org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/WebappManager.java2
-rw-r--r--org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserAdapter.java10
-rw-r--r--org.eclipse.help/src/org/eclipse/help/internal/toc/DirectoryToc.java4
-rw-r--r--org.eclipse.help/src/org/eclipse/help/internal/util/ResourceLocator.java2
4 files changed, 9 insertions, 9 deletions
diff --git a/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/WebappManager.java b/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/WebappManager.java
index 10e952058..2e951d308 100644
--- a/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/WebappManager.java
+++ b/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/WebappManager.java
@@ -130,7 +130,7 @@ public class WebappManager {
}
try {
- String webappLocation = Platform.resolve(webappURL).getFile();
+ String webappLocation = Platform.asLocalURL(Platform.resolve(webappURL)).getFile();
return new Path(webappLocation);
} catch (IOException ioe) {
throw new CoreException(
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserAdapter.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserAdapter.java
index b2af9007d..b14b44def 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserAdapter.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserAdapter.java
@@ -60,11 +60,11 @@ public class EmbeddedBrowserAdapter implements IBrowser, Runnable {
try {
URL instURL =
- Platform.resolve(
+ Platform.asLocalURL(Platform.resolve(
HelpUIPlugin
.getDefault()
.getDescriptor()
- .getInstallURL());
+ .getInstallURL()));
installURL = instURL.toExternalForm();
} catch (IOException ioe) {
HelpUIPlugin.logError(
@@ -332,7 +332,7 @@ public class EmbeddedBrowserAdapter implements IBrowser, Runnable {
for (Iterator it = installURLs.iterator(); it.hasNext();) {
URL installURL = (URL) it.next();
try {
- installURL = Platform.resolve(installURL);
+ installURL = Platform.asLocalURL(Platform.resolve(installURL));
} catch (IOException ioe) {
continue;
}
@@ -386,7 +386,7 @@ public class EmbeddedBrowserAdapter implements IBrowser, Runnable {
if (aboutURL == null)
return null;
try {
- aboutURL = Platform.resolve(aboutURL);
+ aboutURL = Platform.asLocalURL(Platform.resolve(aboutURL));
Properties aboutProps = new Properties();
aboutProps.load(aboutURL.openStream());
String windowIconPathStr = (String) aboutProps.get("windowImage");
@@ -400,7 +400,7 @@ public class EmbeddedBrowserAdapter implements IBrowser, Runnable {
windowIconURL = pfd.find(windowIconPath, override);
if (windowIconURL == null)
return null;
- windowIconURL = Platform.resolve(windowIconURL);
+ windowIconURL = Platform.asLocalURL(Platform.resolve(windowIconURL));
return windowIconURL.toString();
} catch (IOException ioe) {
HelpUIPlugin.logError(
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/toc/DirectoryToc.java b/org.eclipse.help/src/org/eclipse/help/internal/toc/DirectoryToc.java
index e9bf69c2c..1fbaf2a89 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/toc/DirectoryToc.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/toc/DirectoryToc.java
@@ -133,7 +133,7 @@ public class DirectoryToc {
Collection ret = new ArrayList(0);
URL realZipURL;
try {
- realZipURL = Platform.resolve(url);
+ realZipURL = Platform.asLocalURL(Platform.resolve(url));
} catch (IOException ioe) {
HelpPlugin.logError(
HelpResources.getString("E036", url.toString()),
@@ -196,7 +196,7 @@ public class DirectoryToc {
Collection col = new ArrayList();
URL realURL;
try {
- realURL = Platform.resolve(url);
+ realURL = Platform.asLocalURL(Platform.resolve(url));
} catch (IOException ioe) {
HelpPlugin.logError(
HelpResources.getString("E038", url.toString()),
diff --git a/org.eclipse.help/src/org/eclipse/help/internal/util/ResourceLocator.java b/org.eclipse.help/src/org/eclipse/help/internal/util/ResourceLocator.java
index e27240374..f277c5efb 100644
--- a/org.eclipse.help/src/org/eclipse/help/internal/util/ResourceLocator.java
+++ b/org.eclipse.help/src/org/eclipse/help/internal/util/ResourceLocator.java
@@ -249,7 +249,7 @@ public class ResourceLocator {
URL zipFileURL =
pluginDesc.getPlugin().find(zipFilePath, override);
if (zipFileURL != null) {
- URL realZipURL = Platform.resolve(zipFileURL);
+ URL realZipURL = Platform.asLocalURL(Platform.resolve(zipFileURL));
cached = realZipURL.toExternalForm();
} else {
cached = ZIP_NOT_FOUND;

Back to the top