diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java index a9f1e913a60..081f41db809 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugPluginImages.java @@ -29,7 +29,6 @@ import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; -import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkUtil; @@ -69,104 +68,63 @@ private static void declareImages() { declareRegistryImage(IDebugUIConstants.IMG_FIND_ACTION, ELCL + "find.svg"); //$NON-NLS-1$ //menus - declareRegistryImage(IDebugUIConstants.IMG_LCL_CHANGE_VARIABLE_VALUE, - IInternalDebugUIConstants.IMG_DLCL_CHANGE_VARIABLE_VALUE, ELCL + "changevariablevalue_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IDebugUIConstants.IMG_LCL_CHANGE_VARIABLE_VALUE, ELCL + "changevariablevalue_co.svg"); //$NON-NLS-1$ declareRegistryImage(IDebugUIConstants.IMG_LCL_CONTENT_ASSIST, ELCL + "metharg_obj.svg"); //$NON-NLS-1$ declareRegistryImage(IDebugUIConstants.IMG_ELCL_CONTENT_ASSIST, IDebugUIConstants.IMG_DLCL_CONTENT_ASSIST, ELCL + "metharg_obj.svg"); //$NON-NLS-1$ // Local toolbars - declareRegistryImage(IDebugUIConstants.IMG_LCL_DETAIL_PANE, IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE, - ELCL + "toggledetailpane_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IDebugUIConstants.IMG_LCL_DETAIL_PANE_UNDER, - IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_UNDER, ELCL + "det_pane_under.svg"); //$NON-NLS-1$ - declareRegistryImage(IDebugUIConstants.IMG_LCL_DETAIL_PANE_RIGHT, - IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_RIGHT, ELCL + "det_pane_right.svg"); //$NON-NLS-1$ - declareRegistryImage(IDebugUIConstants.IMG_LCL_DETAIL_PANE_HIDE, - IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_HIDE, ELCL + "det_pane_hide.svg"); //$NON-NLS-1$ - declareRegistryImage(IDebugUIConstants.IMG_LCL_LOCK, IInternalDebugUIConstants.IMG_DLCL_LOCK, - ELCL + "lock_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IDebugUIConstants.IMG_LCL_TYPE_NAMES, IInternalDebugUIConstants.IMG_DLCL_TYPE_NAMES, - ELCL + "tnames_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IDebugUIConstants.IMG_LCL_DISCONNECT, IInternalDebugUIConstants.IMG_DLCL_DISCONNECT, - ELCL + "disconnect_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IDebugUIConstants.IMG_LCL_REMOVE_ALL, IInternalDebugUIConstants.IMG_DLCL_REMOVE_ALL, - ELCL + "rem_all_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IDebugUIConstants.IMG_LCL_REMOVE, IInternalDebugUIConstants.IMG_DLCL_REMOVE, - ELCL + "rem_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IDebugUIConstants.IMG_LCL_ADD, IInternalDebugUIConstants.IMG_DLCL_MONITOR_EXPRESSION, - ELCL + "monitorexpression_tsk.svg"); //$NON-NLS-1$ + declareRegistryImage(IDebugUIConstants.IMG_LCL_DETAIL_PANE, ELCL + "toggledetailpane_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IDebugUIConstants.IMG_LCL_DETAIL_PANE_UNDER, ELCL + "det_pane_under.svg"); //$NON-NLS-1$ + declareRegistryImage(IDebugUIConstants.IMG_LCL_DETAIL_PANE_RIGHT, ELCL + "det_pane_right.svg"); //$NON-NLS-1$ + declareRegistryImage(IDebugUIConstants.IMG_LCL_DETAIL_PANE_HIDE, ELCL + "det_pane_hide.svg"); //$NON-NLS-1$ + declareRegistryImage(IDebugUIConstants.IMG_LCL_LOCK, ELCL + "lock_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IDebugUIConstants.IMG_LCL_TYPE_NAMES, ELCL + "tnames_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IDebugUIConstants.IMG_LCL_DISCONNECT, ELCL + "disconnect_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IDebugUIConstants.IMG_LCL_REMOVE_ALL, ELCL + "rem_all_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IDebugUIConstants.IMG_LCL_REMOVE, ELCL + "rem_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IDebugUIConstants.IMG_LCL_ADD, ELCL + "monitorexpression_tsk.svg"); //$NON-NLS-1$ // local toolbars - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE_AUTO, - IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_AUTO, ELCL + "det_pane_auto.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE_AUTO, ELCL + "det_pane_auto.svg"); //$NON-NLS-1$ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_DEBUG_VIEW_COMPACT_LAYOUT, ELCL + "debug_view_compact.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_SHOW_LOGICAL_STRUCTURE, - IInternalDebugUIConstants.IMG_DLCL_SHOW_LOGICAL_STRUCTURE, ELCL + "var_cntnt_prvdr.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_COLLAPSE_ALL, - IInternalDebugUIConstants.IMG_DLCL_COLLAPSE_ALL, ELCL + "collapseall.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE, IInternalDebugUIConstants.IMG_DLCL_TERMINATE, - ELCL + "terminate_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RUN_TO_LINE, - IInternalDebugUIConstants.IMG_DLCL_RUN_TO_LINE, ELCL + "runtoline_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_REMOVE_MEMORY, - IInternalDebugUIConstants.IMG_DLCL_REMOVE_MEMORY, ELCL + "removememory_tsk.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RESET_MEMORY, - IInternalDebugUIConstants.IMG_DLCL_RESET_MEMORY, ELCL + "memoryreset_tsk.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_SHOW_LOGICAL_STRUCTURE, ELCL + "var_cntnt_prvdr.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_COLLAPSE_ALL, ELCL + "collapseall.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE, ELCL + "terminate_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RUN_TO_LINE, ELCL + "runtoline_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_REMOVE_MEMORY, ELCL + "removememory_tsk.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RESET_MEMORY, ELCL + "memoryreset_tsk.svg"); //$NON-NLS-1$ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_COPY_VIEW_TO_CLIPBOARD, - IInternalDebugUIConstants.IMG_DLCL_COPY_VIEW_TO_CLIPBOARD, ELCL + "copyviewtoclipboard_tsk.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_PRINT_TOP_VIEW_TAB, - IInternalDebugUIConstants.IMG_DLCL_PRINT_TOP_VIEW_TAB, ELCL + "printview_tsk.svg"); //$NON-NLS-1$ + ELCL + "copyviewtoclipboard_tsk.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_PRINT_TOP_VIEW_TAB, ELCL + "printview_tsk.svg"); //$NON-NLS-1$ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_HIERARCHICAL, ELCL + "hierarchicalLayout.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_FILTER_CONFIGS, - IInternalDebugUIConstants.IMG_DLCL_FILTER_CONFIGS, ELCL + "filter_ps.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_DUPLICATE_CONFIG, - IInternalDebugUIConstants.IMG_DLCL_DUPLICATE_CONFIG, ELCL + "copy_edit_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_NEW_CONFIG, - IInternalDebugUIConstants.IMG_DLCL_NEW_CONFIG, ELCL + "new_con.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_DELETE_CONFIG, - IInternalDebugUIConstants.IMG_DLCL_DELETE_CONFIG, ELCL + "delete_config.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_NEW_PROTO, IInternalDebugUIConstants.IMG_DLCL_NEW_PROTO, - ELCL + "new_proto.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_LINK_PROTO, - IInternalDebugUIConstants.IMG_DLCL_LINK_PROTO, ELCL + "link_proto.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_UNLINK_PROTO, - IInternalDebugUIConstants.IMG_DLCL_UNLINK_PROTO, ELCL + "unlink_proto.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RESET_PROTO, - IInternalDebugUIConstants.IMG_DLCL_RESET_PROTO, ELCL + "reset_proto.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_SUSPEND, IInternalDebugUIConstants.IMG_DLCL_SUSPEND, - ELCL + "suspend_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RESUME, IInternalDebugUIConstants.IMG_DLCL_RESUME, - ELCL + "resume_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEP_RETURN, - IInternalDebugUIConstants.IMG_DLCL_STEP_RETURN, ELCL + "stepreturn_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEP_OVER, IInternalDebugUIConstants.IMG_DLCL_STEP_OVER, - ELCL + "stepover_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEP_INTO, IInternalDebugUIConstants.IMG_DLCL_STEP_INTO, - ELCL + "stepinto_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_FILTER_CONFIGS, ELCL + "filter_ps.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_DUPLICATE_CONFIG, ELCL + "copy_edit_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_NEW_CONFIG, ELCL + "new_con.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_DELETE_CONFIG, ELCL + "delete_config.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_NEW_PROTO, ELCL + "new_proto.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_LINK_PROTO, ELCL + "link_proto.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_UNLINK_PROTO, ELCL + "unlink_proto.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RESET_PROTO, ELCL + "reset_proto.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_SUSPEND, ELCL + "suspend_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RESUME, ELCL + "resume_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEP_RETURN, ELCL + "stepreturn_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEP_OVER, ELCL + "stepover_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STEP_INTO, ELCL + "stepinto_co.svg"); //$NON-NLS-1$ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_DROP_TO_FRAME, ELCL + "drop_to_frame.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_REMOVE, - IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_REMOVE, ELCL + "terminate_rem_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_ALL, - IInternalDebugUIConstants.IMG_DLCL_TERMINATE_ALL, ELCL + "terminate_all_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_RELAUNCH, - IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_RELAUNCH, CTOOL + "term_restart.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TOGGLE_STEP_FILTERS, - IInternalDebugUIConstants.IMG_DLCL_TOGGLE_STEP_FILTERS, ELCL + "stepbystep_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_REMOVE, ELCL + "terminate_rem_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_ALL, ELCL + "terminate_all_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_RELAUNCH, CTOOL + "term_restart.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_TOGGLE_STEP_FILTERS, ELCL + "stepbystep_co.svg"); //$NON-NLS-1$ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STANDARD_OUT, ELCL + "writeout_co.svg"); //$NON-NLS-1$ declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_STANDARD_ERR, ELCL + "writeerr_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_NEXT_THREAD, - IInternalDebugUIConstants.IMG_DLCL_NEXT_THREAD, ELCL + "next_thread_nav.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_PREVIOUS_THREAD, - IInternalDebugUIConstants.IMG_DLCL_PREVIOUS_THREAD, ELCL + "prev_thread_nav.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RESTART, IInternalDebugUIConstants.IMG_DLCL_RESTART, - ELCL + "restart_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_EXPORT_CONFIG, - IInternalDebugUIConstants.IMG_DLCL_EXPORT_CONFIG, ELCL + "export_wiz.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_IMPORT_CONFIG, - IInternalDebugUIConstants.IMG_DLCL_IMPORT_CONFIG, ELCL + "import_wiz.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_NEXT_THREAD, ELCL + "next_thread_nav.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_PREVIOUS_THREAD, ELCL + "prev_thread_nav.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_RESTART, ELCL + "restart_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_EXPORT_CONFIG, ELCL + "export_wiz.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_ELCL_IMPORT_CONFIG, ELCL + "import_wiz.svg"); //$NON-NLS-1$ //Object declareRegistryImage(IDebugUIConstants.IMG_OBJS_LAUNCH_DEBUG, OBJECT + "ldebug_obj.svg"); //$NON-NLS-1$ @@ -243,8 +201,7 @@ private static void declareImages() { //source location declareRegistryImage(IInternalDebugUIConstants.IMG_SRC_LOOKUP_MENU, ELCL + "edtsrclkup_co.svg"); //$NON-NLS-1$ - declareRegistryImage(IInternalDebugUIConstants.IMG_SRC_LOOKUP_MENU_ELCL, - IInternalDebugUIConstants.IMG_SRC_LOOKUP_MENU_DLCL, ELCL + "edtsrclkup_co.svg"); //$NON-NLS-1$ + declareRegistryImage(IInternalDebugUIConstants.IMG_SRC_LOOKUP_MENU_ELCL, ELCL + "edtsrclkup_co.svg"); //$NON-NLS-1$ declareRegistryImage(IInternalDebugUIConstants.IMG_SRC_LOOKUP_TAB, ELCL + "edtsrclkup_co.svg"); //$NON-NLS-1$ declareRegistryImage(IInternalDebugUIConstants.IMG_ADD_SRC_LOC_WIZ, WIZBAN + "addsrcloc_wiz.svg"); //$NON-NLS-1$ declareRegistryImage(IInternalDebugUIConstants.IMG_EDIT_SRC_LOC_WIZ, WIZBAN + "edtsrclkup_wiz.svg"); //$NON-NLS-1$ @@ -290,9 +247,7 @@ private final static void declareRegistryImage(String key, String disabledKey, S } imageRegistry.put(key, imageDescriptor); if (disabledKey != null) { - ImageDescriptor disabledImageDescriptor = ImageDescriptor.createWithFlags(imageDescriptor, - SWT.IMAGE_DISABLE); - imageRegistry.put(disabledKey, disabledImageDescriptor); + imageRegistry.put(disabledKey, imageDescriptor.asDisabledDescriptor()); } } diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java index 5df905efff5..128648fbd4b 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/IInternalDebugUIConstants.java @@ -35,54 +35,6 @@ public interface IInternalDebugUIConstants { // tool images String IMG_SRC_LOOKUP_MENU = "IMG_SRC_LOOKUP_MENU"; //$NON-NLS-1$ - // disabled local tool images - String IMG_DLCL_LOCK= "IMG_DLCL_LOCK"; //$NON-NLS-1$ - String IMG_DLCL_DETAIL_PANE= "IMG_DLCL_DETAIL_PANE"; //$NON-NLS-1$ - String IMG_DLCL_CHANGE_VARIABLE_VALUE= "IMG_DLCL_CHANGE_VARIABLE_VALUE"; //$NON-NLS-1$ - String IMG_DLCL_TYPE_NAMES= "IMG_DLCL_TYPE_NAMES"; //$NON-NLS-1$ - String IMG_DLCL_SHOW_LOGICAL_STRUCTURE= "IMG_DLCL_SHOW_LOGICAL_STRUCTURE"; //$NON-NLS-1$ - String IMG_DLCL_DETAIL_PANE_UNDER= "IMG_DLCL_DETAIL_PANE_UNDER"; //$NON-NLS-1$ - String IMG_DLCL_DETAIL_PANE_RIGHT= "IMG_DLCL_DETAIL_PANE_RIGHT"; //$NON-NLS-1$ - String IMG_DLCL_DETAIL_PANE_HIDE= "IMG_DLCL_DETAIL_PANE_HIDE"; //$NON-NLS-1$ - String IMG_DLCL_DETAIL_PANE_AUTO= "IMG_DLCL_DETAIL_PANE_AUTO"; //$NON-NLS-1$ - String IMG_DLCL_COLLAPSE_ALL = "IMG_DLCL_COLLAPSE_ALL"; //$NON-NLS-1$ - String IMG_DLCL_TERMINATE = "IMG_DLCL_TERMINATE"; //$NON-NLS-1$ - String IMG_DLCL_REMOVE_ALL = "IMG_DLCL_REMOVE_ALL"; //$NON-NLS-1$ - String IMG_DLCL_REMOVE = "IMG_DLCL_REMOVE"; //$NON-NLS-1$ - String IMG_DLCL_RUN_TO_LINE= "IMG_DLCL_RUN_TO_LINE"; //$NON-NLS-1$ - String IMG_SRC_LOOKUP_MENU_DLCL = "IMG_SRC_LOOKUP_MENU_DISABLED"; //$NON-NLS-1$ - String IMG_DLCL_MONITOR_EXPRESSION= "IMG_DLCL_MONITOR_EXPRESSION"; //$NON-NLS-1$ - String IMG_DLCL_REMOVE_MEMORY= "IMG_DLCL_REMOVE_MEMORY"; //$NON-NLS-1$ - String IMG_DLCL_RESET_MEMORY= "IMG_DLCL_RESET_MEMORY"; //$NON-NLS-1$ - String IMG_DLCL_COPY_VIEW_TO_CLIPBOARD= "IMG_DLCL_COPY_VIEW_TO_CLIPBOARD"; //$NON-NLS-1$ - String IMG_DLCL_PRINT_TOP_VIEW_TAB= "IMG_DLCL_PRINT_TOP_VIEW_TAB"; //$NON-NLS-1$ - String IMG_DLCL_NEW_CONFIG = "IMG_DLCL_NEW_CONFIG"; //$NON-NLS-1$ - String IMG_DLCL_DUPLICATE_CONFIG = "IMG_DLCL_DUPLICATE_CONFIG"; //$NON-NLS-1$ - String IMG_DLCL_DELETE_CONFIG = "IMG_DLCL_DELETE_CONFIG"; //$NON-NLS-1$ - String IMG_DLCL_FILTER_CONFIGS = "IMG_DLCL_FILTER_CONFIGS"; //$NON-NLS-1$ - String IMG_DLCL_NEW_PROTO = "IMG_DLCL_NEW_PROTO"; //$NON-NLS-1$ - String IMG_DLCL_LINK_PROTO = "IMG_DLCL_LINK_PROTO"; //$NON-NLS-1$ - String IMG_DLCL_UNLINK_PROTO = "IMG_DLCL_UNLINK_PROTO"; //$NON-NLS-1$ - String IMG_DLCL_RESET_PROTO = "IMG_DLCL_RESET_PROTO"; //$NON-NLS-1$ - String IMG_DLCL_SUSPEND = "IMG_DLCL_SUSPEND"; //$NON-NLS-1$ - String IMG_DLCL_RESUME = "IMG_DLCL_RESUME"; //$NON-NLS-1$ - String IMG_DLCL_STEP_RETURN = "IMG_DLCL_STEP_RETURN"; //$NON-NLS-1$ - String IMG_DLCL_STEP_OVER = "IMG_DLCL_STEP_OVER"; //$NON-NLS-1$ - String IMG_DLCL_STEP_INTO = "IMG_DLCL_STEP_INTO"; //$NON-NLS-1$ - String IMG_DLCL_TERMINATE_AND_REMOVE = "IMG_DLCL_TERMINATE_AND_REMOVE"; //$NON-NLS-1$ - String IMG_DLCL_TERMINATE_ALL = "IMG_DLCL_TERMINATE_ALL"; //$NON-NLS-1$ - String IMG_DLCL_TERMINATE_AND_RELAUNCH = "IMG_DLCL_TERMINATE_AND_RELAUNCH"; //$NON-NLS-1$ - String IMG_DLCL_TOGGLE_STEP_FILTERS = "IMG_DLCL_TOGGLE_STEP_FILTERS"; //$NON-NLS-1$ - String IMG_DLCL_NEXT_THREAD = "IMG_DLCL_NEXT_THREAD"; //$NON-NLS-1$ - String IMG_DLCL_PREVIOUS_THREAD = "IMG_DLCL_PREVIOUS_THREAD"; //$NON-NLS-1$ - String IMG_DLCL_RESTART = "IMG_DLCL_RESTART"; //$NON-NLS-1$ - String IMG_DLCL_EXPORT_CONFIG = "IMG_DLCL_EXPORT_CONFIG"; //$NON-NLS-1$ - String IMG_DLCL_IMPORT_CONFIG = "IMG_DLCL_IMPORT_CONFIG"; //$NON-NLS-1$ - - //TODO: Move this IDebugUIConstants. Created too late in 3.2 cycle to add API. - //The enabled icon is already API. - String IMG_DLCL_DISCONNECT= "IMG_DLCL_DISCONNECT"; //$NON-NLS-1$ - // enabled local tool images String IMG_ELCL_SHOW_LOGICAL_STRUCTURE= "IMG_ELCL_SHOW_LOGICAL_STRUCTURE"; //$NON-NLS-1$ String IMG_ELCL_DETAIL_PANE_AUTO= "IMG_ELCL_DETAIL_PANE_AUTO"; //$NON-NLS-1$ diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java index eba59876697..30ae3b429e4 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java @@ -31,7 +31,6 @@ public class CollapseAllAction extends Action implements IUpdate { public CollapseAllAction(TreeModelViewer viewer) { super(ActionMessages.CollapseAllAction_0, DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_COLLAPSE_ALL)); setToolTipText(ActionMessages.CollapseAllAction_0); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_COLLAPSE_ALL)); setActionDefinitionId(CollapseAllHandler.COMMAND_ID); fViewer = viewer; } diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java index 8094f270a09..aa2e4be9d02 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ChangeVariableValueAction.java @@ -25,7 +25,6 @@ import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; -import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.VariableValueEditorManager; import org.eclipse.debug.internal.ui.actions.ActionMessages; import org.eclipse.debug.internal.ui.views.variables.VariablesView; @@ -57,7 +56,6 @@ public ChangeVariableValueAction(VariablesView view) { super(view.getViewer(), ActionMessages.ChangeVariableValue_title); setDescription(ActionMessages.ChangeVariableValue_toolTipText); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_CHANGE_VARIABLE_VALUE)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_CHANGE_VARIABLE_VALUE)); PlatformUI.getWorkbench().getHelpSystem().setHelp( this, IDebugHelpContextIds.CHANGE_VALUE_ACTION); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ShowTypesAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ShowTypesAction.java index ed4a9344130..ce5357fb281 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ShowTypesAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ShowTypesAction.java @@ -18,7 +18,6 @@ import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; -import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.actions.ActionMessages; import org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer; import org.eclipse.debug.ui.IDebugModelPresentation; @@ -44,7 +43,6 @@ public ShowTypesAction(IDebugView view) { super(ActionMessages.ShowTypesAction_Show__Type_Names_1, IAction.AS_CHECK_BOX); setView(view); setToolTipText(ActionMessages.ShowTypesAction_Show_Type_Names); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TYPE_NAMES)); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_TYPE_NAMES)); setId(DebugUIPlugin.getUniqueIdentifier() + ".ShowTypesAction"); //$NON-NLS-1$ PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.SHOW_TYPES_ACTION); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java index d77feab5936..ed00ff647af 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/variables/ToggleDetailPaneAction.java @@ -48,28 +48,24 @@ public ToggleDetailPaneAction(VariablesView view, String orientation, String hid setToolTipText(ActionMessages.ToggleDetailPaneAction_2); setDescription(ActionMessages.ToggleDetailPaneAction_2); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DETAIL_PANE_UNDER)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_UNDER)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.VERTICAL_DETAIL_PANE_LAYOUT_ACTION); } else if (orientation == IDebugPreferenceConstants.VARIABLES_DETAIL_PANE_RIGHT) { setText(ActionMessages.ToggleDetailPaneAction_4); setToolTipText(ActionMessages.ToggleDetailPaneAction_5); setDescription(ActionMessages.ToggleDetailPaneAction_5); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DETAIL_PANE_RIGHT)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_RIGHT)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.HORIZONTAL_DETAIL_PANE_LAYOUT_ACTION); } else if (orientation == IDebugPreferenceConstants.VARIABLES_DETAIL_PANE_AUTO) { setText(ActionMessages.ToggleDetailPaneAction_0); setToolTipText(ActionMessages.ToggleDetailPaneAction_3); setDescription(ActionMessages.ToggleDetailPaneAction_3); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DETAIL_PANE_AUTO)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_AUTO)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.HORIZONTAL_DETAIL_PANE_LAYOUT_ACTION); } else { setText(hiddenLabel); setToolTipText(ActionMessages.ToggleDetailPaneAction_8); setDescription(ActionMessages.ToggleDetailPaneAction_8); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DETAIL_PANE_HIDE)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_HIDE)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.DETAIL_PANE_HIDDEN_LAYOUT_ACTION); } } diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java index dc92c62f225..ccaea8d8e62 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DisconnectCommandAction.java @@ -15,7 +15,6 @@ import org.eclipse.debug.core.commands.IDisconnectHandler; import org.eclipse.debug.internal.ui.DebugPluginImages; -import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.actions.ActionMessages; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.debug.ui.actions.DebugCommandAction; @@ -51,11 +50,6 @@ public String getToolTipText() { return ActionMessages.DisconnectAction_3; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DISCONNECT); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DISCONNECT); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java index b0995f10658..98360a00c07 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/DropToFrameCommandAction.java @@ -56,11 +56,6 @@ public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DROP_TO_FRAME); } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return null; - } - @Override protected Class getCommandType() { return IDropToFrameHandler.class; diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandAction.java index d68c690fec5..27438c83721 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/RestartCommandAction.java @@ -37,11 +37,6 @@ protected Class getCommandType() { return IRestartHandler.class; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RESTART); - } - @Override public String getHelpContextId() { return "org.eclipse.debug.ui.restart_action_context"; //$NON-NLS-1$ diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java index b7e59445172..796d99a95e3 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ResumeCommandAction.java @@ -51,11 +51,6 @@ public String getToolTipText() { return ActionMessages.ResumeAction_3; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RESUME); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESUME); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java index d7230c76664..eb833848b25 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepIntoCommandAction.java @@ -51,11 +51,6 @@ public String getToolTipText() { return ActionMessages.StepIntoAction_3; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEP_INTO); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_STEP_INTO); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java index 5a58a8c0fc3..c031e9af920 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepOverCommandAction.java @@ -37,11 +37,6 @@ public String getText() { return ActionMessages.StepOverAction_0; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEP_OVER); - } - @Override public String getHelpContextId() { return "org.eclipse.debug.ui.step_over_action_context"; //$NON-NLS-1$ diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java index 29c6babc194..972a45ec47f 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/StepReturnCommandAction.java @@ -32,11 +32,6 @@ public StepReturnCommandAction() { setActionDefinitionId("org.eclipse.debug.ui.commands.StepReturn"); //$NON-NLS-1$ } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_STEP_RETURN); - } - @Override public String getHelpContextId() { return "org.eclipse.debug.ui.step_return_action_context"; //$NON-NLS-1$ diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java index 72a076530e7..6590b40bc96 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/SuspendCommandAction.java @@ -51,11 +51,6 @@ public String getToolTipText() { return ActionMessages.SuspendAction_3; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_SUSPEND); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_SUSPEND); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java index 9928ec64443..258ca1d6a58 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAllAction.java @@ -83,12 +83,6 @@ public String getToolTipText() { return ActionMessages.TerminateAllAction_3; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugPluginImages - .getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_ALL); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugPluginImages diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRelaunchAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRelaunchAction.java index 7e7e0b6ff99..80a91e45d9e 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRelaunchAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRelaunchAction.java @@ -129,11 +129,6 @@ public String getToolTipText() { return ActionMessages.TerminateAndRelaunchAction_4; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_RELAUNCH); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_RELAUNCH); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRemoveAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRemoveAction.java index 4bd0460a80c..83f4ec61021 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRemoveAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateAndRemoveAction.java @@ -73,11 +73,6 @@ public String getToolTipText() { return ActionMessages.TerminateAndRemoveAction_3; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE_AND_REMOVE); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE_AND_REMOVE); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java index 4075b5b596d..828c78fa11a 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/TerminateCommandAction.java @@ -51,11 +51,6 @@ public String getToolTipText() { return ActionMessages.TerminateAction_3; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java index e4142ad3ecc..6ae91855b32 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/commands/actions/ToggleStepFiltersAction.java @@ -39,11 +39,6 @@ public class ToggleStepFiltersAction extends DebugCommandAction implements IPref private boolean fInitialized = !DebugUITools.isUseStepFilters(); - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TOGGLE_STEP_FILTERS); - } - @Override public String getHelpContextId() { return "org.eclipse.debug.ui.step_with_filters_action_context"; //$NON-NLS-1$ diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CollapseAllLaunchConfigurationAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CollapseAllLaunchConfigurationAction.java index 2871f2a008b..e97bcb12677 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CollapseAllLaunchConfigurationAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CollapseAllLaunchConfigurationAction.java @@ -59,11 +59,6 @@ public String getToolTipText() { return LaunchConfigurationsMessages.CollapseAllLaunchConfigurationAction_1; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_COLLAPSE_ALL); - } - @Override public void run() { fViewer.collapseAll(); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationAction.java index cf372252dad..c4c3364e55a 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationAction.java @@ -102,11 +102,6 @@ protected boolean updateSelection(IStructuredSelection selection) { return selection.size() == 1; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_NEW_CONFIG); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_NEW_CONFIG); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationPrototypeAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationPrototypeAction.java index 022655c062b..255890112c0 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationPrototypeAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/CreateLaunchConfigurationPrototypeAction.java @@ -119,11 +119,6 @@ protected boolean updateSelection(IStructuredSelection selection) { return false; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_NEW_PROTO); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_NEW_PROTO); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java index 1a1bbe51ad8..9c3d461f3fc 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DeleteLaunchConfigurationAction.java @@ -99,11 +99,6 @@ protected boolean updateSelection(IStructuredSelection selection) { return true; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DELETE_CONFIG); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DELETE_CONFIG); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchConfigurationAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchConfigurationAction.java index d6697599a93..63aadd32243 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchConfigurationAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/DuplicateLaunchConfigurationAction.java @@ -65,11 +65,6 @@ protected boolean updateSelection(IStructuredSelection selection) { return selection.size() == 1 && selection.getFirstElement() instanceof ILaunchConfiguration; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DUPLICATE_CONFIG); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_DUPLICATE_CONFIG); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ExportLaunchConfigurationAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ExportLaunchConfigurationAction.java index 8a395dd54fe..1c719b71775 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ExportLaunchConfigurationAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ExportLaunchConfigurationAction.java @@ -56,11 +56,6 @@ protected boolean updateSelection(IStructuredSelection selection) { return selection.size() > 0; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_EXPORT_CONFIG); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_EXPORT_CONFIG); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FilterLaunchConfigurationAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FilterLaunchConfigurationAction.java index 030a16cc6a0..fb588fb6ebe 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FilterLaunchConfigurationAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/FilterLaunchConfigurationAction.java @@ -54,11 +54,6 @@ public String getDescription() { return LaunchConfigurationsMessages.LaunchConfigurationsDialog_4; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_FILTER_CONFIGS); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_FILTER_CONFIGS); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ImportLaunchConfigurationAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ImportLaunchConfigurationAction.java index 2e86a763f30..efaf5c6d1c3 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ImportLaunchConfigurationAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ImportLaunchConfigurationAction.java @@ -43,11 +43,6 @@ protected void performAction() { dialog.open(); } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_IMPORT_CONFIG); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_IMPORT_CONFIG); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LinkPrototypeAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LinkPrototypeAction.java index 7ccbcb021a8..52777862a8e 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LinkPrototypeAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LinkPrototypeAction.java @@ -134,11 +134,6 @@ protected boolean updateSelection(IStructuredSelection selection) { return true; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_LINK_PROTO); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_LINK_PROTO); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ResetWithPrototypeValuesAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ResetWithPrototypeValuesAction.java index 9c5f3edea85..c85bbccb875 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ResetWithPrototypeValuesAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ResetWithPrototypeValuesAction.java @@ -103,11 +103,6 @@ protected boolean updateSelection(IStructuredSelection selection) { return onlyLaunchConfigurationWithPrototypeSelected; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RESET_PROTO); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESET_PROTO); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/UnlinkPrototypeAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/UnlinkPrototypeAction.java index 67b3f3517dc..8764694ba67 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/UnlinkPrototypeAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/UnlinkPrototypeAction.java @@ -102,11 +102,6 @@ protected boolean updateSelection(IStructuredSelection selection) { return onlyLaunchConfigurationWithPrototypeSelected; } - @Override - public ImageDescriptor getDisabledImageDescriptor() { - return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_UNLINK_PROTO); - } - @Override public ImageDescriptor getImageDescriptor() { return DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_UNLINK_PROTO); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java index 02755a288be..7091e6b24a3 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java @@ -18,7 +18,6 @@ import org.eclipse.debug.core.ILaunchesListener2; import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; -import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.actions.RemoveAllTerminatedAction; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.action.Action; @@ -58,7 +57,6 @@ public ConsoleRemoveAllTerminatedAction() { PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.CONSOLE_REMOVE_ALL_TERMINATED); setToolTipText(ConsoleMessages.ConsoleRemoveAllTerminatedAction_1); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE_ALL)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_ALL)); DebugPlugin.getDefault().getLaunchManager().addLaunchListener(this); update(); } diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java index 59a27c9daa8..ac6c6ef7221 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java @@ -19,7 +19,6 @@ import org.eclipse.debug.core.ILaunchesListener2; import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; -import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; @@ -47,7 +46,6 @@ public ConsoleRemoveLaunchAction() { setToolTipText(ConsoleMessages.ConsoleRemoveTerminatedAction_1); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.CONSOLE_REMOVE_LAUNCH); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE)); DebugPlugin.getDefault().getLaunchManager().addLaunchListener(this); ConsolePlugin.getDefault().getConsoleManager().addConsoleListener(this); } diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java index a6314a23ecf..4d2302893dc 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java @@ -53,7 +53,6 @@ public ConsoleTerminateAction(IWorkbenchWindow window, ProcessConsole console) { fWindow = window; setToolTipText(ConsoleMessages.ConsoleTerminateAction_1); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_TERMINATE)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_TERMINATE)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.CONSOLE_TERMINATE_ACTION); update(); } diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java index 171fe87e594..b675ef08626 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java @@ -39,7 +39,6 @@ import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.DebugUIMessages; import org.eclipse.debug.internal.ui.DebugUIPlugin; -import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.debug.ui.contexts.DebugContextEvent; @@ -99,7 +98,6 @@ private void doInitialization(IMemoryRenderingSite site) { fSite = site; setToolTipText(DebugUIMessages.AddMemoryBlockAction_tooltip); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_ADD)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_MONITOR_EXPRESSION)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".addMemoryMonitorAction_context"); //$NON-NLS-1$ // listen for context changed diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java index e29fb2e4dfd..21a7ba71a76 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java @@ -95,7 +95,6 @@ class TreeViewerRemoveMemoryBlocksAction extends Action { setToolTipText(DebugUIMessages.RemoveMemoryBlockAction_tooltip); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_MEMORY)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_MEMORY)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".RemoveMemoryBlockAction_context"); //$NON-NLS-1$ setEnabled(true); } @@ -125,7 +124,6 @@ class TreeViewerRemoveAllMemoryBlocksAction extends Action { setToolTipText(DebugUIMessages.MemoryBlocksTreeViewPane_2); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_REMOVE_ALL)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_ALL)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".RemoveAllMemoryBlocksAction_context"); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java index 853811fd90a..933cf49e334 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java @@ -41,7 +41,6 @@ public RemoveMemoryRenderingAction(IMemoryRenderingContainer viewPane) { setToolTipText(DebugUIMessages.RemoveMemoryRenderingAction_Remove_rendering); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_REMOVE_MEMORY)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_REMOVE_MEMORY)); fViewPane = viewPane; } diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java index d59e790dffb..629d86e642a 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneOrientationAction.java @@ -17,7 +17,6 @@ import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.DebugUIMessages; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; -import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jface.action.Action; import org.eclipse.ui.PlatformUI; @@ -35,12 +34,10 @@ class ViewPaneOrientationAction extends Action { setText(DebugUIMessages.ViewPaneOrientationAction_0); setToolTipText(DebugUIMessages.ViewPaneOrientationAction_1); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DETAIL_PANE_RIGHT)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_RIGHT)); } else if (orientation == MemoryView.VERTICAL_VIEW_ORIENTATION) { setText(DebugUIMessages.ViewPaneOrientationAction_2); setToolTipText(DebugUIMessages.ViewPaneOrientationAction_3); setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DETAIL_PANE_UNDER)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_DETAIL_PANE_UNDER)); } PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.MEMORY_VIEW_PANE_ORIENTATION_ACTION); } diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java index fe170dd46b6..002db9aa875 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java @@ -55,7 +55,6 @@ public CopyTableRenderingToClipboardAction(AbstractBaseTableRendering rendering, setText(DebugUIMessages.CopyViewToClipboardAction_title); setToolTipText(DebugUIMessages.CopyViewToClipboardAction_tooltip); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_COPY_VIEW_TO_CLIPBOARD)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_COPY_VIEW_TO_CLIPBOARD)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".PrintViewTabContextAction_context"); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java index a843c94facb..2a268aac6d0 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java @@ -54,7 +54,6 @@ public PrintTableRenderingAction(AbstractBaseTableRendering rendering, Structure fViewer = viewer; setToolTipText(DebugUIMessages.PrintViewTabAction_tooltip); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_PRINT_TOP_VIEW_TAB)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_PRINT_TOP_VIEW_TAB)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".PrintViewTabContextAction_context"); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ResetToBaseAddressAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ResetToBaseAddressAction.java index 4f628cc6811..4289e8e42f2 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ResetToBaseAddressAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ResetToBaseAddressAction.java @@ -41,7 +41,6 @@ public ResetToBaseAddressAction(AbstractBaseTableRendering rendering) { setToolTipText(DebugUIMessages.ResetMemoryBlockAction_tootip); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RESET_MEMORY)); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RESET_MEMORY)); PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".ResetBaseAddressContextAction_context"); //$NON-NLS-1$ } diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java index e9b087bc83a..f92f716bfc2 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java @@ -37,7 +37,6 @@ public ToggleLogicalStructureAction(VariablesView view) { super(null, IAction.AS_CHECK_BOX); setView(view); setToolTipText(VariablesViewMessages.ToggleObjectBrowsersAction_1); - setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_SHOW_LOGICAL_STRUCTURE)); setImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_SHOW_LOGICAL_STRUCTURE)); setId(ID); view.storeDefaultPreference(this, Boolean.TRUE); diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AddMemoryRenderingActionDelegate.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AddMemoryRenderingActionDelegate.java index 1616cc80ebf..ad2f28a3bc7 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AddMemoryRenderingActionDelegate.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AddMemoryRenderingActionDelegate.java @@ -21,7 +21,6 @@ import org.eclipse.debug.core.model.IMemoryBlockRetrieval; import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.DebugUIPlugin; -import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.actions.ActionMessages; import org.eclipse.debug.internal.ui.views.memory.MemoryViewUtil; import org.eclipse.debug.ui.DebugUITools; @@ -303,7 +302,6 @@ public void init(IAction action) { action.setText(ActionMessages.AddMemoryRenderingActionDelegate_2); action.setImageDescriptor(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_ADD)); - action.setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_MONITOR_EXPRESSION)); } } diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandAction.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandAction.java index cf49e7999c4..b4b8273661b 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandAction.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandAction.java @@ -298,7 +298,9 @@ protected IDebugContextService getDebugContextService() { public abstract String getToolTipText(); @Override - public abstract ImageDescriptor getDisabledImageDescriptor(); + public ImageDescriptor getDisabledImageDescriptor() { + return super.getDisabledImageDescriptor(); + } @Override public ImageDescriptor getHoverImageDescriptor() { diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java index cce467c25f1..27c3eb749cf 100644 --- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java +++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java @@ -138,7 +138,6 @@ public void init(IAction action) { if (action != null) { action.setText(ActionMessages.RunToLineActionDelegate_4); action.setImageDescriptor(DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_RUN_TO_LINE)); - action.setDisabledImageDescriptor(DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RUN_TO_LINE)); } } diff --git a/team/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF index 009bca6d241..efb434c2506 100644 --- a/team/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF +++ b/team/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare.win32;singleton:=true -Bundle-Version: 1.3.800.qualifier +Bundle-Version: 1.3.900.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-17 Eclipse-PlatformFilter: (osgi.os=win32) diff --git a/team/bundles/org.eclipse.compare.win32/pom.xml b/team/bundles/org.eclipse.compare.win32/pom.xml index 5e753e3055b..0b02ab76d07 100644 --- a/team/bundles/org.eclipse.compare.win32/pom.xml +++ b/team/bundles/org.eclipse.compare.win32/pom.xml @@ -18,7 +18,7 @@ ../../ org.eclipse.compare.win32 - 1.3.800-SNAPSHOT + 1.3.900-SNAPSHOT eclipse-plugin diff --git a/team/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java b/team/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java index c3da0ac769b..16ef3be104d 100644 --- a/team/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java +++ b/team/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java @@ -151,23 +151,16 @@ private static void initAction(IAction a, ResourceBundle bundle, String prefix) String relPath= getString(bundle, imageKey, null); if (relPath != null && relPath.trim().length() > 0) { - String dPath; String ePath; if (relPath.contains("/")) { //$NON-NLS-1$ String path= relPath.substring(1); - dPath= 'd' + path; ePath= 'e' + path; } else { - dPath= "dlcl16/" + relPath; //$NON-NLS-1$ ePath= "elcl16/" + relPath; //$NON-NLS-1$ } - ImageDescriptor id= getImageDescriptor(dPath); // we set the disabled image first (see PR 1GDDE87) - if (id != null) { - a.setDisabledImageDescriptor(id); - } - id= getImageDescriptor(ePath); + ImageDescriptor id = getImageDescriptor(ePath); if (id != null) { a.setImageDescriptor(id); } diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java index 82436b30240..ba1dc5c5897 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java @@ -275,23 +275,16 @@ public static void initAction(IAction a, ResourceBundle bundle, String prefix) { String relPath= getString(bundle, imageKey, null); if (relPath != null && relPath.trim().length() > 0) { - String dPath; String ePath; if (relPath.contains("/")) { //$NON-NLS-1$ String path= relPath.substring(1); - dPath= 'd' + path; ePath= 'e' + path; } else { - dPath= "dlcl16/" + relPath; //$NON-NLS-1$ ePath= "elcl16/" + relPath; //$NON-NLS-1$ } - ImageDescriptor id= CompareUIPlugin.getImageDescriptor(dPath); // we set the disabled image first (see PR 1GDDE87) - if (id != null) { - a.setDisabledImageDescriptor(id); - } - id= CompareUIPlugin.getImageDescriptor(ePath); + ImageDescriptor id = CompareUIPlugin.getImageDescriptor(ePath); if (id != null) { a.setImageDescriptor(id); }