From a286076434cfc1ce6b3ebb1d873837ae529c7bfb Mon Sep 17 00:00:00 2001 From: Kevin Doyle Date: Mon, 7 Jul 2008 02:42:09 +0000 Subject: [PATCH] [222828] [useractions] Icons for some Actions Missing --- .../rse/internal/useractions/Activator.java | 60 ++++++++-------- .../useractions/IUserActionsImageIds.java | 14 ++++ .../internal/useractions/UserActionsIcon.java | 70 ++++++++----------- .../SystemWorkWithCompileCommandsAction.java | 4 +- .../ui/SystemCommandViewerConfiguration.java | 9 +++ .../ui/uda/SystemUDBaseManager.java | 3 +- .../SystemWorkWithFileTypesAction.java | 4 +- .../uda/actions/SystemWorkWithUDAsAction.java | 6 +- 8 files changed, 96 insertions(+), 74 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/Activator.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/Activator.java index a815f490948..a4bdd2f7d46 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/Activator.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/Activator.java @@ -8,20 +8,20 @@ * Contributors: * IBM Corporation - initial API and implementation * David Dykstal (IBM) - [186589] move user actions API out of org.eclipse.rse.ui + * Kevin Doyle (IBM) - [222828] Icons for some Actions Missing *******************************************************************************/ package org.eclipse.rse.internal.useractions; import java.net.URL; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.resource.ImageRegistry; -import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.rse.ui.SystemBasePlugin; import org.osgi.framework.BundleContext; /** * The main plugin class to be used in the desktop. */ -public class Activator extends AbstractUIPlugin { +public class Activator extends SystemBasePlugin { //The shared instance. private static Activator plugin; public static final String PLUGIN_ID = "org.eclipse.rse.useractions"; //$NON-NLS-1$ @@ -54,33 +54,33 @@ public class Activator extends AbstractUIPlugin { return plugin; } - /* (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry) + /* + * (non-Javadoc) + * @see org.eclipse.rse.ui.SystemBasePlugin#initializeImageRegistry() */ - protected void initializeImageRegistry(ImageRegistry registry) { - super.initializeImageRegistry(registry); - registry.put(IUserActionsImageIds.COMPILE_0, getImageDescriptor("icons/full/dlcl16/compile.gif")); //$NON-NLS-1$ - registry.put(IUserActionsImageIds.COMPILE_1, getImageDescriptor("icons/full/elcl16/compile.gif")); //$NON-NLS-1$ - registry.put(IUserActionsImageIds.WORK_WITH_COMPILE_COMMANDS_0, getImageDescriptor("icons/full/dlcl16/workwithcompilecmds.gif")); //$NON-NLS-1$ - registry.put(IUserActionsImageIds.WORK_WITH_COMPILE_COMMANDS_1, getImageDescriptor("icons/full/elcl16/workwithcompilecmds.gif")); //$NON-NLS-1$ - registry.put(IUserActionsImageIds.WORK_WITH_NAMED_TYPES_0, getImageDescriptor("icons/full/dlcl16/workwithnamedtypes.gif")); //$NON-NLS-1$ - registry.put(IUserActionsImageIds.WORK_WITH_NAMED_TYPES_1, getImageDescriptor("icons/full/elcl16/workwithnamedtypes.gif")); //$NON-NLS-1$ - registry.put(IUserActionsImageIds.WORK_WITH_USER_ACTIONS_0, getImageDescriptor("icons/full/dlcl16/workwithuseractions.gif")); //$NON-NLS-1$ - registry.put(IUserActionsImageIds.WORK_WITH_USER_ACTIONS_1, getImageDescriptor("icons/full/elcl16/workwithuseractions.gif")); //$NON-NLS-1$ - } - - /** - * Gets the image descriptor for images in the plugin bundle. - * @param path the plugin relative path of the image - * @return the image descriptor - */ - public ImageDescriptor getImageDescriptor(String path) { - ImageDescriptor descriptor = null; - URL url = getBundle().getResource(path); - if (url != null) { - descriptor = ImageDescriptor.createFromURL(url); - } - return descriptor; - } + protected void initializeImageRegistry() + { + putImageInRegistry(IUserActionsImageIds.COMPILE_0, "icons/full/dlcl16/compile.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.COMPILE_1, "icons/full/elcl16/compile.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.WORK_WITH_COMPILE_COMMANDS_0, "icons/full/dlcl16/workwithcompilecmds.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.WORK_WITH_COMPILE_COMMANDS_1, "icons/full/elcl16/workwithcompilecmds.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.WORK_WITH_NAMED_TYPES_0, "icons/full/dlcl16/workwithnamedtypes.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.WORK_WITH_NAMED_TYPES_1, "icons/full/elcl16/workwithnamedtypes.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.WORK_WITH_USER_ACTIONS_0, "icons/full/dlcl16/workwithuseractions.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.WORK_WITH_USER_ACTIONS_1, "icons/full/elcl16/workwithuseractions.gif"); //$NON-NLS-1$ + + putImageInRegistry(IUserActionsImageIds.USERACTION_NEW, "icons/full/obj16/user_action_new_obj.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.USERACTION_USR, "icons/full/obj16/user_action_obj.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.USERACTION_IBM, "icons/full/obj16/user_action_ibm_obj.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.USERACTION_IBMUSR, "icons/full/obj16/user_action_ibm_user_obj.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.USERTYPE_NEW, "icons/full/obj16/user_type_new_obj.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.USERTYPE_USR, "icons/full/obj16/user_type_obj.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.USERTYPE_IBM, "icons/full/obj16/user_type_ibm_obj.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.USERTYPE_IBMUSR, "icons/full/obj16/user_type_ibm_user_obj.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.COMPILE_NEW, "icons/full/obj16/compcmd_new_obj.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.COMPILE_USR, "icons/full/obj16/compcmd_user_obj.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.COMPILE_IBM, "icons/full/obj16/compcmd_ibm_obj.gif"); //$NON-NLS-1$ + putImageInRegistry(IUserActionsImageIds.COMPILE_IBMUSR, "icons/full/obj16/compcmd_ibmuser_obj.gif"); //$NON-NLS-1$ + } } diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/IUserActionsImageIds.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/IUserActionsImageIds.java index 85b3178fd44..9b46a6460ce 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/IUserActionsImageIds.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/IUserActionsImageIds.java @@ -8,6 +8,7 @@ * Contributors: * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands * API to the user actions plugin + * Kevin Doyle (IBM) - [222828] Icons for some Actions Missing *******************************************************************************/ package org.eclipse.rse.internal.useractions; @@ -22,4 +23,17 @@ public interface IUserActionsImageIds { public static final String WORK_WITH_COMPILE_COMMANDS_0 = "WORK_WITH_COMPILE_COMMANDS_0"; //$NON-NLS-1$ public static final String WORK_WITH_COMPILE_COMMANDS_1 = "WORK_WITH_COMPILE_COMMANDS_1"; //$NON-NLS-1$ + // Specific Compile Commands and User Action Icons + public static final String USERACTION_NEW = "USERACTION_NEW"; //$NON-NLS-1$ + public static final String USERACTION_USR = "USERACTION_USR"; //$NON-NLS-1$ + public static final String USERACTION_IBM = "USERACTION_IBM"; //$NON-NLS-1$ + public static final String USERACTION_IBMUSR = "USERACTION_IBMUSR"; //$NON-NLS-1$ + public static final String USERTYPE_NEW = "USERTYPE_NEW"; //$NON-NLS-1$ + public static final String USERTYPE_USR = "USERTYPE_USR"; //$NON-NLS-1$ + public static final String USERTYPE_IBM = "USERTYPE_IBM"; //$NON-NLS-1$ + public static final String USERTYPE_IBMUSR = "USERTYPE_IBMUSR"; //$NON-NLS-1$ + public static final String COMPILE_NEW = "COMPILE_NEW"; //$NON-NLS-1$ + public static final String COMPILE_USR = "COMPILE_USR"; //$NON-NLS-1$ + public static final String COMPILE_IBM = "COMPILE_IBM"; //$NON-NLS-1$ + public static final String COMPILE_IBMUSR = "COMPILE_IBMUSR"; //$NON-NLS-1$ } diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsIcon.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsIcon.java index 85afae2c2f6..c6ec9a54b93 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsIcon.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/UserActionsIcon.java @@ -9,11 +9,11 @@ * IBM Corporation - initial API and implementation * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands * API to the user actions plugin + * Kevin Doyle (IBM) - [222828] Icons for some Actions Missing *******************************************************************************/ package org.eclipse.rse.internal.useractions; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; /** @@ -23,65 +23,71 @@ import org.eclipse.swt.graphics.Image; * to access the images and descriptors. */ public class UserActionsIcon { + /** * A new user defined action. */ - public static final UserActionsIcon USERACTION_NEW = new UserActionsIcon("user_action_new_obj"); //$NON-NLS-1$ + public static final UserActionsIcon USERACTION_NEW = new UserActionsIcon(IUserActionsImageIds.USERACTION_NEW); + /** * An existing user defined user action. */ - public static final UserActionsIcon USERACTION_USR = new UserActionsIcon("user_action_obj"); //$NON-NLS-1$ + public static final UserActionsIcon USERACTION_USR = new UserActionsIcon(IUserActionsImageIds.USERACTION_USR); + /** * A predefined user defined action. */ - public static final UserActionsIcon USERACTION_IBM = new UserActionsIcon("user_action_ibm_obj"); //$NON-NLS-1$ + public static final UserActionsIcon USERACTION_IBM = new UserActionsIcon(IUserActionsImageIds.USERACTION_IBM); + /** * A predefined user defined action that has been modified. */ - public static final UserActionsIcon USERACTION_IBMUSR = new UserActionsIcon("user_action_ibm_user_obj"); //$NON-NLS-1$ + public static final UserActionsIcon USERACTION_IBMUSR = new UserActionsIcon(IUserActionsImageIds.USERACTION_IBMUSR); + /** * A new user defined type. */ - public static final UserActionsIcon USERTYPE_NEW = new UserActionsIcon("user_type_new_obj"); //$NON-NLS-1$ + public static final UserActionsIcon USERTYPE_NEW = new UserActionsIcon(IUserActionsImageIds.USERTYPE_NEW); + /** * An existing user defined type. */ - public static final UserActionsIcon USERTYPE_USR = new UserActionsIcon("user_type_obj"); //$NON-NLS-1$ + public static final UserActionsIcon USERTYPE_USR = new UserActionsIcon(IUserActionsImageIds.USERTYPE_USR); + /** * A predefined user defined type. */ - public static final UserActionsIcon USERTYPE_IBM = new UserActionsIcon("user_type_ibm_obj"); //$NON-NLS-1$ + public static final UserActionsIcon USERTYPE_IBM = new UserActionsIcon(IUserActionsImageIds.USERTYPE_IBM); + /** * A predefined user defined type that has been modified. */ - public static final UserActionsIcon USERTYPE_IBMUSR = new UserActionsIcon("user_type_ibm_user_obj"); //$NON-NLS-1$ + public static final UserActionsIcon USERTYPE_IBMUSR = new UserActionsIcon(IUserActionsImageIds.USERTYPE_IBMUSR); + /** * A new user defined compile command. */ - public static final UserActionsIcon COMPILE_NEW = new UserActionsIcon("compcmd_new_obj"); //$NON-NLS-1$ + public static final UserActionsIcon COMPILE_NEW = new UserActionsIcon(IUserActionsImageIds.COMPILE_NEW); + /** * An existing user defined compile command. */ - public static final UserActionsIcon COMPILE_USR = new UserActionsIcon("compcmd_user_obj"); //$NON-NLS-1$ + public static final UserActionsIcon COMPILE_USR = new UserActionsIcon(IUserActionsImageIds.COMPILE_USR); + /** * A predefined user defined compile command. */ - public static final UserActionsIcon COMPILE_IBM = new UserActionsIcon("compcmd_ibm_obj"); //$NON-NLS-1$ + public static final UserActionsIcon COMPILE_IBM = new UserActionsIcon(IUserActionsImageIds.COMPILE_IBM); + /** * A predefined user defined compile command that has been edited. */ - public static final UserActionsIcon COMPILE_IBMUSR = new UserActionsIcon("compcmd_ibmuser_obj"); //$NON-NLS-1$ - private static final String PREFIX = "icon."; //$NON-NLS-1$ - private static final String ICON_DIR = "icons/full/obj16/"; //$NON-NLS-1$ - private static final String ICON_EXT = ".gif"; //$NON-NLS-1$ - private String name; - private String id; - private String location; + public static final UserActionsIcon COMPILE_IBMUSR = new UserActionsIcon(IUserActionsImageIds.COMPILE_IBMUSR); + + private String imageID; - private UserActionsIcon(String name) { - this.name = name; - this.id = PREFIX + name; - this.location = ICON_DIR + name + ICON_EXT; + private UserActionsIcon(String imageID) { + this.imageID = imageID; } /** @@ -90,14 +96,7 @@ public class UserActionsIcon { * @return the image */ public Image getImage() { - ImageRegistry registry = Activator.getDefault().getImageRegistry(); - Image image = registry.get(id); - if (image == null) { - ImageDescriptor descriptor = getImageDescriptor(); - image = descriptor.createImage(); - registry.put(id, image); - } - return image; + return Activator.getDefault().getImage(imageID); } /** @@ -105,14 +104,7 @@ public class UserActionsIcon { * @return the image descriptor */ public ImageDescriptor getImageDescriptor() { - ImageDescriptor descriptor = Activator.getDefault().getImageDescriptor(location); - return descriptor; + return Activator.getDefault().getImageDescriptor(imageID); } - /** - * @return the name of the icon - */ - public String getName() { - return name; - } } diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/api/ui/compile/SystemWorkWithCompileCommandsAction.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/api/ui/compile/SystemWorkWithCompileCommandsAction.java index e728a885a59..3e2890af7f9 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/api/ui/compile/SystemWorkWithCompileCommandsAction.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/api/ui/compile/SystemWorkWithCompileCommandsAction.java @@ -11,6 +11,7 @@ * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands * API to the user actions plugin * Xuan Chen (IBM) - [225617] [useraction][api] Remove Team view support inside user action. + * Kevin Doyle (IBM) - [222828] Icons for some Actions Missing *******************************************************************************/ package org.eclipse.rse.internal.useractions.api.ui.compile; @@ -20,6 +21,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; +import org.eclipse.rse.internal.useractions.Activator; import org.eclipse.rse.internal.useractions.IUserActionsImageIds; import org.eclipse.rse.internal.useractions.api.files.compile.ISystemCompileManagerAdapter; import org.eclipse.rse.internal.useractions.files.compile.UniversalCompileManager; @@ -57,7 +59,7 @@ public class SystemWorkWithCompileCommandsAction extends SystemBaseDialogAction */ public SystemWorkWithCompileCommandsAction(Shell shell, boolean fromCascadingCompileAction) { super(fromCascadingCompileAction ? SystemUDAResources.ACTION_WORKWITH_WWCOMPILE_CMDS_LABEL : SystemUDAResources.ACTION_WORKWITH_COMPILE_CMDS_LABEL, - fromCascadingCompileAction ? SystemUDAResources.ACTION_WORKWITH_WWCOMPILE_CMDS_TOOLTIP : SystemUDAResources.ACTION_WORKWITH_COMPILE_CMDS_TOOLTIP, RSEUIPlugin.getDefault() + fromCascadingCompileAction ? SystemUDAResources.ACTION_WORKWITH_WWCOMPILE_CMDS_TOOLTIP : SystemUDAResources.ACTION_WORKWITH_COMPILE_CMDS_TOOLTIP, Activator.getDefault() .getImageDescriptor(IUserActionsImageIds.WORK_WITH_COMPILE_COMMANDS_1), shell); allowOnMultipleSelection(false); if (!fromCascadingCompileAction) diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/SystemCommandViewerConfiguration.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/SystemCommandViewerConfiguration.java index 2dd0430abf8..459379ae755 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/SystemCommandViewerConfiguration.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/SystemCommandViewerConfiguration.java @@ -19,6 +19,7 @@ import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.text.contentassist.IContentAssistant; import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.jface.text.contentassist.IContextInformationValidator; +import org.eclipse.jface.text.hyperlink.IHyperlinkDetector; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.SourceViewerConfiguration; @@ -97,6 +98,14 @@ public class SystemCommandViewerConfiguration extends SourceViewerConfiguration protected char[] getCompletionProposalAutoActivationCharacters() { return new char[] { '$' }; } + + /* + * (non-Javadoc) + * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getHyperlinkDetectors(org.eclipse.jface.text.source.ISourceViewer) + */ + public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) { + return null; + } /** * Internal class that implements the content assist processor interface diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java index e35ce1f4af9..8bc98b20fb3 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java @@ -13,6 +13,7 @@ * API to the user actions plugin * Xuan Chen (IBM) - [222263] Need to provide a PropertySet Adapter for System Team View (cleanup some use action stuff) * Kevin Doyle (IBM) - [222825] NPE when changing profile on Work with User Actions Dialog + * Kevin Doyle (IBM) - [222828] Icons for some Actions Missing *******************************************************************************/ package org.eclipse.rse.internal.useractions.ui.uda; @@ -626,7 +627,7 @@ public abstract class SystemUDBaseManager implements IResourceChangeListener, IS for (int idx = 0; idx < primedElements.length; idx++) { SystemXMLElementWrapper newElement = primedElements[idx]; newElement.setIBM(true); - newElement.setUserChanged(true); + newElement.setUserChanged(false); } } saveUserData(profile); diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/actions/SystemWorkWithFileTypesAction.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/actions/SystemWorkWithFileTypesAction.java index c44e18a1a02..343b53c4ef9 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/actions/SystemWorkWithFileTypesAction.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/actions/SystemWorkWithFileTypesAction.java @@ -12,11 +12,13 @@ package org.eclipse.rse.internal.useractions.ui.uda.actions; * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands * API to the user actions plugin * Xuan Chen (IBM) - [225617] [useraction][api] Remove Team view support inside user action. + * Kevin Doyle (IBM) - [222828] Icons for some Actions Missing *******************************************************************************/ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; +import org.eclipse.rse.internal.useractions.Activator; import org.eclipse.rse.internal.useractions.IUserActionsImageIds; import org.eclipse.rse.internal.useractions.ui.uda.SystemUDAResources; import org.eclipse.rse.internal.useractions.ui.uda.SystemUDActionSubsystem; @@ -74,7 +76,7 @@ public class SystemWorkWithFileTypesAction extends SystemBaseDialogAction { * @param parent The Shell of the parent UI for this dialog */ public SystemWorkWithFileTypesAction(Shell parent) { - super(SystemUDAResources.ACTION_WORKWITH_NAMEDTYPES_LABEL, SystemUDAResources.ACTION_WORKWITH_NAMEDTYPES_TOOLTIP, RSEUIPlugin.getDefault().getImageDescriptor( + super(SystemUDAResources.ACTION_WORKWITH_NAMEDTYPES_LABEL, SystemUDAResources.ACTION_WORKWITH_NAMEDTYPES_TOOLTIP, Activator.getDefault().getImageDescriptor( IUserActionsImageIds.WORK_WITH_NAMED_TYPES_1), parent); allowOnMultipleSelection(false); setContextMenuGroup(ISystemContextMenuConstants.GROUP_WORKWITH); diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/actions/SystemWorkWithUDAsAction.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/actions/SystemWorkWithUDAsAction.java index 0c46598bdf4..297bd7f38d4 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/actions/SystemWorkWithUDAsAction.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/actions/SystemWorkWithUDAsAction.java @@ -12,6 +12,7 @@ package org.eclipse.rse.internal.useractions.ui.uda.actions; * David Dykstal (IBM) - [186589] move user types, user actions, and compile commands * API to the user actions plugin * Xuan Chen (IBM) - [225617] [useraction][api] Remove Team view support inside user action. + * Kevin Doyle (IBM) - [222828] Icons for some Actions Missing *******************************************************************************/ //import java.util.Iterator; import org.eclipse.jface.dialogs.Dialog; @@ -19,6 +20,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; +import org.eclipse.rse.internal.useractions.Activator; import org.eclipse.rse.internal.useractions.IUserActionsImageIds; import org.eclipse.rse.internal.useractions.ui.uda.SystemUDAResources; import org.eclipse.rse.internal.useractions.ui.uda.SystemUDActionSubsystem; @@ -66,7 +68,7 @@ public class SystemWorkWithUDAsAction extends SystemBaseDialogAction { * @param parent The Shell of the parent UI for this dialog */ public SystemWorkWithUDAsAction(Shell parent) { - super(SystemUDAResources.ACTION_WORKWITH_UDAS_LABEL, SystemUDAResources.ACTION_WORKWITH_UDAS_TOOLTIP, RSEUIPlugin.getDefault().getImageDescriptor( + super(SystemUDAResources.ACTION_WORKWITH_UDAS_LABEL, SystemUDAResources.ACTION_WORKWITH_UDAS_TOOLTIP, Activator.getDefault().getImageDescriptor( IUserActionsImageIds.WORK_WITH_USER_ACTIONS_1), parent); allowOnMultipleSelection(false); setContextMenuGroup(ISystemContextMenuConstants.GROUP_WORKWITH); @@ -81,7 +83,7 @@ public class SystemWorkWithUDAsAction extends SystemBaseDialogAction { */ public SystemWorkWithUDAsAction(Shell parent, boolean fromCascadingCompileAction) { super(fromCascadingCompileAction ? SystemUDAResources.ACTION_WORKWITH_WWUDAS_LABEL : SystemUDAResources.ACTION_WORKWITH_UDAS_LABEL, - fromCascadingCompileAction ? SystemUDAResources.ACTION_WORKWITH_WWUDAS_TOOLTIP : SystemUDAResources.ACTION_WORKWITH_UDAS_TOOLTIP, RSEUIPlugin.getDefault().getImageDescriptor( + fromCascadingCompileAction ? SystemUDAResources.ACTION_WORKWITH_WWUDAS_TOOLTIP : SystemUDAResources.ACTION_WORKWITH_UDAS_TOOLTIP, Activator.getDefault().getImageDescriptor( IUserActionsImageIds.WORK_WITH_USER_ACTIONS_1), parent); allowOnMultipleSelection(false); if (!fromCascadingCompileAction)