Merge branch '3939' into 'master'

3939: FX Icons

See merge request !20

org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/.ratings

 AF3Application.java 9bd897f7c02bfffc9be41c4fcb9ceca088a574b4 GREEN
-AF3ApplicationActivator.java 3f3a7bbe875ede3b265d7fa27e675961c5792e37 GREEN
+AF3ApplicationActivator.java cf948c7116dae2311d06e2fa54f51fd05aa3f2e8 GREEN
 NewProjectContextMenu.java cda28ae7d66ca140f24d13ec2e205c02068c3dc1 GREEN

org.fortiss.af3.rcp.application/src/org/fortiss/af3/rcp/application/AF3ApplicationActivator.java

@@ -15,6 +15,8 @@
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.rcp.application;
 
+import static org.eclipse.jface.resource.ResourceLocator.imageDescriptorFromBundle;
+
 import java.io.File;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -70,7 +72,7 @@ public class AF3ApplicationActivator extends AbstractUIPlugin {
 	 * relative path
 	 */
 	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
+		return imageDescriptorFromBundle(PLUGIN_ID, path).orElse(null);
 	}
 
 	/**

org.fortiss.af3.rcp.help/src/org/fortiss/af3/rcp/help/.ratings

-AF3HelpActivator.java ba9e079aa36be2c09780df324cdca9fcd280711e GREEN
+AF3HelpActivator.java 0e4b9fee0114114c727b0df1b359bc00053f66db GREEN

org.fortiss.af3.rcp.help/src/org/fortiss/af3/rcp/help/AF3HelpActivator.java

@@ -15,6 +15,8 @@
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.rcp.help;
 
+import static org.eclipse.jface.resource.ResourceLocator.imageDescriptorFromBundle;
+
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -53,6 +55,6 @@ public class AF3HelpActivator extends AbstractUIPlugin {
 
 	/** Returns an image descriptor for the image file at the given plug-in relative path. */
 	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
+		return imageDescriptorFromBundle(PLUGIN_ID, path).orElse(null);
 	}
 }