stop requiring runtime.compatibilityv20040314_disabled_embedded_browser_on_2nd_displayv20030314_disabled_second_display_browser

1 files changed, 8 insertions, 35 deletions

diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java
index 097d9abac..54dd1dd8d 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowser.java
@@ -209,41 +209,14 @@ public class EmbeddedBrowser {
 	 * @return URL as String or null
 	 */
 	private String getProductImageURL() {
-		// TODO implement getProductImageURL
-//		IPlatformConfiguration c = BootLoader.getCurrentPlatformConfiguration();
-//		String primaryFeatureId = c.getPrimaryFeatureIdentifier();
-//		if (primaryFeatureId == null)
-//			return null; // no primary feature installed
-//		IPluginDescriptor pfd =
-//			Platform.getPluginRegistry().getPluginDescriptor(primaryFeatureId);
-//		if (pfd == null)
-//			return null; // no primary feature installed
-//
-//		URL aboutURL = pfd.find(new Path("about.ini"));
-//		if (aboutURL == null)
-//			return null;
-//		try {
-//			aboutURL = Platform.asLocalURL(Platform.resolve(aboutURL));
-//			Properties aboutProps = new Properties();
-//			aboutProps.load(aboutURL.openStream());
-//			String windowIconPathStr = (String) aboutProps.get("windowImage");
-//			if (windowIconPathStr == null)
-//				return null;
-//			IPath windowIconPath = new Path(windowIconPathStr);
-//			URL windowIconURL;
-//			// find icon under pluginID/nl/ directory
-//			Map override = new HashMap(1);
-//			override.put("$nl$", Platform.getNL());
-//			windowIconURL = pfd.find(windowIconPath, override);
-//			if (windowIconURL == null)
-//				return null;
-//			windowIconURL = Platform.asLocalURL(Platform.resolve(windowIconURL));
-//			return windowIconURL.toString();
-//		} catch (IOException ioe) {
-//			HelpUIPlugin.logError(
-//				HelpUIResources.getString("WE029"),
-//				ioe);
-//		}
+		IProduct product = Platform.getProduct();
+		if(product!=null){
+			String url= Platform.getProduct().getProperty("windowImages");
+			if(url!=null || url.length()>0){
+				return url.split(",\\s*")[0];
+			}
+			return product.getProperty("windowImages");
+		}
 		return null;
 	}