Bug 126085v20060425

2 files changed, 59 insertions, 4 deletions

diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/BundleUtil.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/BundleUtil.java
index e8f794489..bb7f564a5 100644
--- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/BundleUtil.java
+++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/BundleUtil.java
@@ -161,8 +161,11 @@ public class BundleUtil {
                 Log.warning(msg);
                 return resource;
             }
+            /*
             localLocation = FileLocator.toFileURL(localLocation);
             return localLocation.toExternalForm();
+            */
+            return toExternalForm(localLocation);
         } catch (Exception e) {
             String msg = StringUtil.concat("Failed to load resource: ", //$NON-NLS-1$
                 resource, " from ", getBundleHeader(bundle, //$NON-NLS-1$
@@ -171,6 +174,25 @@ public class BundleUtil {
             return resource;
         }
     }
+    
+    private static String toExternalForm(URL localURL) {
+    	try {
+    		localURL = FileLocator.toFileURL(localURL);
+    		String result = localURL.toExternalForm();
+    		if (result.startsWith("file:/")) { //$NON-NLS-1$
+    			if (result.startsWith("file:///")==false) { //$NON-NLS-1$
+    				result = "file:///"+result.substring(6); //$NON-NLS-1$
+    			}
+    		}
+    		return result;
+    	}
+    	catch (IOException e) {
+            String msg = "Failed to resolve URL: " //$NON-NLS-1$
+                    + localURL.toString();
+                Log.error(msg, e);
+                return localURL.toString();
+    	}
+    }
 
 
 
@@ -202,17 +224,20 @@ public class BundleUtil {
             URL bundleLocation = bundle.getEntry(""); //$NON-NLS-1$
             if (bundleLocation == null)
                 return null;
+            /*
             bundleLocation = FileLocator.toFileURL(bundleLocation);
             return bundleLocation.toExternalForm();
+            */
+            return toExternalForm(bundleLocation);
         } catch (IllegalStateException e) {
             Log.error("Failed to access bundle: " //$NON-NLS-1$
                     + bundle.getSymbolicName(), e);
             return null;
-        } catch (IOException e) {
+        } /* catch (IOException e) {
             Log.error("Failed to resolve URL path for bundle: " //$NON-NLS-1$
                     + bundle.getSymbolicName(), e);
             return null;
-        }
+        } */
     }
 
     /**
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/util/BundleUtil.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/util/BundleUtil.java
index 1c0eb9f69..743d44c9f 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/util/BundleUtil.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/util/BundleUtil.java
@@ -163,8 +163,11 @@ public class BundleUtil {
                 Log.warning(msg);
                 return resource;
             }
+            /*
             localLocation = FileLocator.toFileURL(localLocation);
             return localLocation.toExternalForm();
+            */
+            return toExternalForm(localLocation);
         } catch (Exception e) {
             String msg = StringUtil.concat("Failed to load resource: ", //$NON-NLS-1$
                 resource, " from ", getBundleHeader(bundle, //$NON-NLS-1$
@@ -204,17 +207,20 @@ public class BundleUtil {
             URL bundleLocation = bundle.getEntry(""); //$NON-NLS-1$
             if (bundleLocation == null)
                 return null;
+            /*
             bundleLocation = FileLocator.toFileURL(bundleLocation);
             return bundleLocation.toExternalForm();
+            */
+            return toExternalForm(bundleLocation);
         } catch (IllegalStateException e) {
             Log.error("Failed to access bundle: " //$NON-NLS-1$
                     + bundle.getSymbolicName(), e);
             return null;
-        } catch (IOException e) {
+        }/* catch (IOException e) {
             Log.error("Failed to resolve URL path for bundle: " //$NON-NLS-1$
                     + bundle.getSymbolicName(), e);
             return null;
-        }
+        } */
     }
 
     /**
@@ -230,5 +236,29 @@ public class BundleUtil {
             return null;
         return getResolvedBundleLocation(bundle);
     }
+    
+    /*
+     * Bug 126085 - need to fix up file: protocol
+     * to a form that IE7 understands (file:///). 
+     */
+    
+    private static String toExternalForm(URL localURL) {
+    	try {
+    		localURL = FileLocator.toFileURL(localURL);
+    		String result = localURL.toExternalForm();
+    		if (result.startsWith("file:/")) { //$NON-NLS-1$
+    			if (result.startsWith("file:///")==false) { //$NON-NLS-1$
+    				result = "file:///"+result.substring(6); //$NON-NLS-1$
+    			}
+    		}
+    		return result;
+    	}
+    	catch (IOException e) {
+            String msg = "Failed to resolve URL: " //$NON-NLS-1$
+                    + localURL.toString();
+                Log.error(msg, e);
+                return localURL.toString();
+    	}
+    }
 
 }