/*******************************************************************************
 * Copyright (c) 2015-2016 Oak Ridge National Laboratory.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *******************************************************************************/
package org.csstudio.javafx;

import java.util.logging.Logger;

/** Plugin information
 *  @author Kay Kasemir
 */
@SuppressWarnings("nls")
public class Activator // Could become plugin activator
{
    /** Plugin ID */
    public static final String ID = "org.csstudio.javafx";

    /** Logger for plugin */
    public static final Logger logger = Logger.getLogger(ID);

    /** @param base_name Icon base name (no path, no extension)
     *  @return Icon path
     */
    public static String getIcon(final String base_name)
    {
        return "platform:/plugin/org.csstudio.javafx/icons/" + base_name + ".png";
    }
}

@@ -524,16 +524,106 @@
 ogger;%0A%0A
+import org.csstudio.display.builder.util.ResourceUtil;%0A%0Aimport javafx.scene.image.Image;%0A%0A
 /** Plug
@@ -1006,16 +1006,47 @@
 rn I
-con path
+mage%0A     *  @throws Exception on error
 %0A   
@@ -1068,22 +1068,21 @@
  static 
-String
+Image
  getIcon
@@ -1105,16 +1105,33 @@
 se_name)
+ throws Exception
 %0A    %7B%0A 
@@ -1137,22 +1137,29 @@
         
-return
+String path =
  %22platfo
@@ -1219,16 +1219,83 @@
 %22.png%22;%0A
+        return new Image(ResourceUtil.openPlatformResource(path));%0A
     %7D%0A%7D%0A

Revert to using ResourceUtil to load icons