Bug 125549 - Adding helpers for URL converter
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/ProductPreferencesService.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/ProductPreferencesService.java
index 7d69df3..67bb827 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/ProductPreferencesService.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/ProductPreferencesService.java
@@ -74,7 +74,7 @@
url = new URL(customizationValue);
} catch (MalformedURLException e) {
// didn't work so treat it as a filename
- url = BundleFinder.find(customizationBundle, new Path(customizationValue), null);
+ url = FileLocator.find(customizationBundle, new Path(customizationValue), null);
}
}
@@ -91,7 +91,7 @@
URL transURL = null;
if (customizationValue != null)
- transURL = BundleFinder.find(customizationBundle, NL_DIR.append(customizationValue).removeFileExtension().addFileExtension(PROPERTIES_FILE_EXTENSION), null);
+ transURL = FileLocator.find(customizationBundle, NL_DIR.append(customizationValue).removeFileExtension().addFileExtension(PROPERTIES_FILE_EXTENSION), null);
if (transURL == null && InternalPlatform.DEBUG_PLUGIN_PREFERENCES)
InternalPlatform.message("No preference translations found for product/file: " + customizationBundle.getSymbolicName() + '/' + customizationValue); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Plugin.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Plugin.java
index 87d7ff2..3f90cc4 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Plugin.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Plugin.java
@@ -228,11 +228,10 @@
*
* @param path path relative to plug-in installation location
* @return a URL for the given path or <code>null</code>
- * XXX deprecate and use {@link BundleFinder}
+ * @deprecated use {@link FileLocator#find(Bundle, IPath, Map)}
*/
public final URL find(IPath path) {
- return BundleFinder.find(bundle, path, null);
- // TODO: deprecate?
+ return FileLocator.find(bundle, path, null);
}
/**
@@ -247,11 +246,10 @@
* or does not contain the required substitution argument, the default
* is used.
* @return a URL for the given path or <code>null</code>
- * XXX deprecate and use {@link BundleFinder}
+ * @deprecated use {@link FileLocator#find(Bundle, IPath, Map)}
*/
public final URL find(IPath path, Map override) {
- return BundleFinder.find(bundle, path, override);
- // TODO: deprecate?
+ return FileLocator.find(bundle, path, override);
}
/**
