2626
2727import org .osgi .framework .Bundle ;
2828
29+ import org .eclipse .swt .SWT ;
2930import org .eclipse .swt .graphics .Image ;
3031import org .eclipse .swt .graphics .ImageData ;
3132import org .eclipse .swt .widgets .Display ;
@@ -57,9 +58,7 @@ public class JavaPluginImages {
5758 private static final String T_OVR = "ovr16" ; //$NON-NLS-1$
5859 private static final String T_WIZBAN = "wizban" ; //$NON-NLS-1$
5960 private static final String T_ELCL = "elcl16" ; //$NON-NLS-1$
60- private static final String T_DLCL = "dlcl16" ; //$NON-NLS-1$
6161 private static final String T_ETOOL = "etool16" ; //$NON-NLS-1$
62- private static final String T_DTOOL = "dtool16" ; //$NON-NLS-1$
6362 private static final String T_EVIEW = "eview16" ; //$NON-NLS-1$
6463
6564 /*
@@ -77,7 +76,6 @@ public class JavaPluginImages {
7776 public static final String IMG_FIELD_DEFAULT = NAME_PREFIX + "field_default_obj.gif" ; //$NON-NLS-1$
7877
7978 public static final String IMG_ELCL_VIEW_MENU = NAME_PREFIX + T_ELCL + "view_menu.gif" ; //$NON-NLS-1$
80- public static final String IMG_DLCL_VIEW_MENU = NAME_PREFIX + T_DLCL + "view_menu.gif" ; //$NON-NLS-1$
8179
8280 public static final String IMG_OBJS_GHOST = NAME_PREFIX + "ghost.gif" ; //$NON-NLS-1$
8381 public static final String IMG_OBJS_SEARCH_TSK = NAME_PREFIX + "search_tsk.gif" ; //$NON-NLS-1$
@@ -213,13 +211,10 @@ public class JavaPluginImages {
213211 public static final ImageDescriptor DESC_VIEW_JDKCOMPLIANCE_TAB = createUnManaged (T_EVIEW , "jdkcompliance_tab.svg" ); //$NON-NLS-1$
214212
215213 public static final ImageDescriptor DESC_ELCL_FILTER = createUnManaged (T_ELCL , "filter_ps.svg" ); //$NON-NLS-1$
216- public static final ImageDescriptor DESC_DLCL_FILTER = createUnManaged (T_DLCL , "filter_ps.png" ); //$NON-NLS-1$
217214
218215 public static final ImageDescriptor DESC_ELCL_CODE_ASSIST = createUnManaged (T_ELCL , "metharg_obj.svg" ); //$NON-NLS-1$
219- public static final ImageDescriptor DESC_DLCL_CODE_ASSIST = createUnManaged (T_DLCL , "metharg_obj.png" ); //$NON-NLS-1$
220216
221217 public static final ImageDescriptor DESC_ELCL_VIEW_MENU = createManaged (T_ELCL , "view_menu.svg" , IMG_ELCL_VIEW_MENU ); //$NON-NLS-1$
222- public static final ImageDescriptor DESC_DLCL_VIEW_MENU = createManaged (T_DLCL , "view_menu.png" , IMG_DLCL_VIEW_MENU ); //$NON-NLS-1$
223218
224219 public static final ImageDescriptor DESC_MISC_PUBLIC = createManagedFromKey (T_OBJ , IMG_MISC_PUBLIC );
225220 public static final ImageDescriptor DESC_MISC_PROTECTED = createManagedFromKey (T_OBJ , IMG_MISC_PROTECTED );
@@ -249,7 +244,6 @@ public class JavaPluginImages {
249244 public static final ImageDescriptor DESC_OBJS_CFILE = createManagedFromKey (T_OBJ , IMG_OBJS_CFILE );
250245 public static final ImageDescriptor DESC_OBJS_CFILECLASS = createManagedFromKey (T_OBJ , IMG_OBJS_CFILECLASS );
251246 public static final ImageDescriptor DESC_ELCL_CLEAR = createUnManaged (T_ELCL , "clear_co.svg" ); //$NON-NLS-1$
252- public static final ImageDescriptor DESC_DLCL_CLEAR = createUnManaged (T_DLCL , "clear_co.png" ); //$NON-NLS-1$
253247 public static final ImageDescriptor DESC_OBJS_CFILEINT = createManagedFromKey (T_OBJ , IMG_OBJS_CFILEINT );
254248 public static final ImageDescriptor DESC_OBJS_PACKAGE = createManagedFromKey (T_OBJ , IMG_OBJS_PACKAGE );
255249 public static final ImageDescriptor DESC_OBJS_EMPTY_LOGICAL_PACKAGE = createManagedFromKey (T_OBJ , IMG_OBJS_EMPTY_LOGICAL_PACKAGE );
@@ -383,46 +377,28 @@ public class JavaPluginImages {
383377 public static final ImageDescriptor DESC_ELCL_INCLUSION = createUnManaged (T_ELCL , "inclusion_filter_attrib.svg" ); //$NON-NLS-1$
384378 public static final ImageDescriptor DESC_ELCL_EXCLUSION = createUnManaged (T_ELCL , "exclusion_filter_attrib.svg" ); //$NON-NLS-1$
385379
386- public static final ImageDescriptor DESC_DLCL_ADD_TO_BP = createUnManaged (T_DLCL , "add_to_buildpath.png" ); //$NON-NLS-1$
387- public static final ImageDescriptor DESC_DLCL_REMOVE_FROM_BP = createUnManaged (T_DLCL , "remove_from_buildpath.png" ); //$NON-NLS-1$
388- public static final ImageDescriptor DESC_DLCL_INCLUSION = createUnManaged (T_DLCL , "inclusion_filter_attrib.png" ); //$NON-NLS-1$
389- public static final ImageDescriptor DESC_DLCL_EXCLUSION = createUnManaged (T_DLCL , "exclusion_filter_attrib.png" ); //$NON-NLS-1$
390-
391- public static final ImageDescriptor DESC_DLCL_ADD_LINKED_SOURCE_TO_BUILDPATH = createUnManaged (T_DLCL , "add_linked_source_to_buildpath.png" ); //$NON-NLS-1$
392380 public static final ImageDescriptor DESC_ELCL_ADD_LINKED_SOURCE_TO_BUILDPATH = createUnManaged (T_ELCL , "add_linked_source_to_buildpath.svg" ); //$NON-NLS-1$
393381
394- public static final ImageDescriptor DESC_DLCL_CONFIGURE_BUILDPATH = createUnManaged (T_DLCL , "configure_build_path.png" ); //$NON-NLS-1$
395382 public static final ImageDescriptor DESC_ELCL_CONFIGURE_BUILDPATH = createUnManaged (T_ELCL , "configure_build_path.svg" ); //$NON-NLS-1$
396383
397- public static final ImageDescriptor DESC_DLCL_CONFIGURE_ANNOTATIONS = createUnManaged (T_DLCL , "configure_annotations.png" ); //$NON-NLS-1$
398384 public static final ImageDescriptor DESC_ELCL_CONFIGURE_ANNOTATIONS = createUnManaged (T_ELCL , "configure_annotations.svg" ); //$NON-NLS-1$
399385
400- public static final ImageDescriptor DESC_DLCL_CONFIGURE_BUILDPATH_FILTERS = createUnManaged (T_DLCL , "configure_buildpath_filters.png" ); //$NON-NLS-1$
401386 public static final ImageDescriptor DESC_ELCL_CONFIGURE_BUILDPATH_FILTERS = createUnManaged (T_ELCL , "configure_buildpath_filters.svg" ); //$NON-NLS-1$
402387
403- public static final ImageDescriptor DESC_DLCL_CONFIGURE_OUTPUT_FOLDER = createUnManaged (T_DLCL , "configure_output_folder.png" ); //$NON-NLS-1$
404388 public static final ImageDescriptor DESC_ELCL_CONFIGURE_OUTPUT_FOLDER = createUnManaged (T_ELCL , "configure_output_folder.svg" ); //$NON-NLS-1$
405389
406- public static final ImageDescriptor DESC_DLCL_CONFIGURE_PROBLEM_SEVERITIES = createUnManaged (T_DLCL , "configure_problem_severity.png" ); //$NON-NLS-1$
407390 public static final ImageDescriptor DESC_ELCL_CONFIGURE_PROBLEM_SEVERITIES = createManagedFromKey (T_ELCL , IMG_CONFIGURE_PROBLEM_SEVERITIES );
408391
409- public static final ImageDescriptor DESC_DLCL_EXCLUDE_FROM_BUILDPATH = createUnManaged (T_DLCL , "exclude_from_buildpath.png" ); //$NON-NLS-1$
410392 public static final ImageDescriptor DESC_ELCL_EXCLUDE_FROM_BUILDPATH = createUnManaged (T_ELCL , "exclude_from_buildpath.svg" ); //$NON-NLS-1$
411393
412- public static final ImageDescriptor DESC_DLCL_INCLUDE_ON_BUILDPATH = createUnManaged (T_DLCL , "include_on_buildpath.png" ); //$NON-NLS-1$
413394 public static final ImageDescriptor DESC_ELCL_INCLUDE_ON_BUILDPATH = createUnManaged (T_ELCL , "include_on_buildpath.svg" ); //$NON-NLS-1$
414395
415- public static final ImageDescriptor DESC_DLCL_ADD_AS_SOURCE_FOLDER = createUnManaged (T_DLCL , "add_as_source_folder.png" ); //$NON-NLS-1$
416396 public static final ImageDescriptor DESC_ELCL_ADD_AS_SOURCE_FOLDER = createUnManaged (T_ELCL , "add_as_source_folder.svg" ); //$NON-NLS-1$
417397
418- public static final ImageDescriptor DESC_DLCL_REMOVE_AS_SOURCE_FOLDER = createUnManaged (T_DLCL , "remove_as_source_folder.png" ); //$NON-NLS-1$
419398 public static final ImageDescriptor DESC_ELCL_REMOVE_AS_SOURCE_FOLDER = createUnManaged (T_ELCL , "remove_as_source_folder.svg" ); //$NON-NLS-1$
420399
421- public static final ImageDescriptor DESC_DLCL_COPY_QUALIFIED_NAME = createUnManaged (T_DLCL , "cpyqual_menu.png" ); //$NON-NLS-1$
422400 public static final ImageDescriptor DESC_ELCL_COPY_QUALIFIED_NAME = createUnManaged (T_ELCL , "cpyqual_menu.svg" ); //$NON-NLS-1$
423401
424- public static final ImageDescriptor DESC_DLCL_OPEN_BROWSER = createUnManaged (T_DLCL , "open_browser.png" ); //$NON-NLS-1$
425-
426402 public static final ImageDescriptor DESC_ELCL_OPEN_BROWSER = createUnManaged (T_ELCL , "open_browser.svg" ); //$NON-NLS-1$
427403
428404 public static final ImageDescriptor DESC_OBJ_OVERRIDES = createUnManaged (T_OBJ , "over_co.svg" ); //$NON-NLS-1$
@@ -516,43 +492,28 @@ public class JavaPluginImages {
516492
517493 public static final ImageDescriptor DESC_TOOL_CLASSPATH_ORDER = createUnManaged (T_OBJ , "cp_order_obj.svg" ); //$NON-NLS-1$
518494 public static final ImageDescriptor DESC_ELCL_EXPANDALL = createUnManaged (T_ELCL , "expandall.svg" ); //$NON-NLS-1$
519- public static final ImageDescriptor DESC_DLCL_EXPANDALL = createUnManaged (T_DLCL , "expandall.png" ); //$NON-NLS-1$
520495 public static final ImageDescriptor DESC_ELCL_COLLAPSEALL = createUnManaged (T_ELCL , "collapseall.svg" ); //$NON-NLS-1$
521- public static final ImageDescriptor DESC_DLCL_COLLAPSEALL = createUnManaged (T_DLCL , "collapseall.png" ); //$NON-NLS-1$
522496
523497 public static final ImageDescriptor DESC_ELCL_MODIFYALL = createUnManaged (T_ELCL , "modifyall.svg" ); //$NON-NLS-1$
524498
525499 public static final ImageDescriptor DESC_ELCL_REMOVE_EXTRA_LINES = createUnManaged (T_ELCL , "remove_extra_lines.svg" ); //$NON-NLS-1$
526- public static final ImageDescriptor DESC_DLCL_REMOVE_EXTRA_LINES = createUnManaged (T_DLCL , "remove_extra_lines.png" ); //$NON-NLS-1$
527500
528501 // Image descriptors used for formatter line wrapping preferences
529502 public static final ImageDescriptor DESC_ELCL_INDENT_COLUMN = createUnManaged (T_ELCL , "indent_column.svg" ); //$NON-NLS-1$
530- public static final ImageDescriptor DESC_DLCL_INDENT_COLUMN = createUnManaged (T_DLCL , "indent_column.png" ); //$NON-NLS-1$
531503 public static final ImageDescriptor DESC_ELCL_INDENT_DEFAULT = createUnManaged (T_ELCL , "indent_default.svg" ); //$NON-NLS-1$
532- public static final ImageDescriptor DESC_DLCL_INDENT_DEFAULT = createUnManaged (T_DLCL , "indent_default.png" ); //$NON-NLS-1$
533504 public static final ImageDescriptor DESC_ELCL_INDENT_ONE = createUnManaged (T_ELCL , "indent_one.svg" ); //$NON-NLS-1$
534- public static final ImageDescriptor DESC_DLCL_INDENT_ONE = createUnManaged (T_DLCL , "indent_one.png" ); //$NON-NLS-1$
535505 public static final ImageDescriptor DESC_ELCL_WRAP_AFTER = createUnManaged (T_ELCL , "wrap_after.svg" ); //$NON-NLS-1$
536- public static final ImageDescriptor DESC_DLCL_WRAP_AFTER = createUnManaged (T_DLCL , "wrap_after.png" ); //$NON-NLS-1$
537506 public static final ImageDescriptor DESC_ELCL_WRAP_ALL = createUnManaged (T_ELCL , "wrap_all.svg" ); //$NON-NLS-1$
538- public static final ImageDescriptor DESC_DLCL_WRAP_ALL = createUnManaged (T_DLCL , "wrap_all.png" ); //$NON-NLS-1$
539507 public static final ImageDescriptor DESC_ELCL_WRAP_ALL_INDENT = createUnManaged (T_ELCL , "wrap_all_indent.svg" ); //$NON-NLS-1$
540- public static final ImageDescriptor DESC_DLCL_WRAP_ALL_INDENT = createUnManaged (T_DLCL , "wrap_all_indent.png" ); //$NON-NLS-1$
541508 public static final ImageDescriptor DESC_ELCL_WRAP_ALL_NOT_FIRST = createUnManaged (T_ELCL , "wrap_all_not_first.svg" ); //$NON-NLS-1$
542- public static final ImageDescriptor DESC_DLCL_WRAP_ALL_NOT_FIRST = createUnManaged (T_DLCL , "wrap_all_not_first.png" ); //$NON-NLS-1$
543509 public static final ImageDescriptor DESC_ELCL_WRAP_BEFORE = createUnManaged (T_ELCL , "wrap_before.svg" ); //$NON-NLS-1$
544- public static final ImageDescriptor DESC_DLCL_WRAP_BEFORE = createUnManaged (T_DLCL , "wrap_before.png" ); //$NON-NLS-1$
545510 public static final ImageDescriptor DESC_ELCL_WRAP_FIRST_NECESSARY = createUnManaged (T_ELCL , "wrap_first_necessary.svg" ); //$NON-NLS-1$
546- public static final ImageDescriptor DESC_DLCL_WRAP_FIRST_NECESSARY = createUnManaged (T_DLCL , "wrap_first_necessary.png" ); //$NON-NLS-1$
547511 public static final ImageDescriptor DESC_ELCL_WRAP_FORCE = createUnManaged (T_ELCL , "wrap_force.svg" ); //$NON-NLS-1$
548- public static final ImageDescriptor DESC_DLCL_WRAP_FORCE = createUnManaged (T_DLCL , "wrap_force.png" ); //$NON-NLS-1$
549512 public static final ImageDescriptor DESC_ELCL_WRAP_NECESSARY = createUnManaged (T_ELCL , "wrap_necessary.svg" ); //$NON-NLS-1$
550- public static final ImageDescriptor DESC_DLCL_WRAP_NECESSARY = createUnManaged (T_DLCL , "wrap_necessary.png" ); //$NON-NLS-1$
551513 public static final ImageDescriptor DESC_ELCL_WRAP_NOT = createUnManaged (T_ELCL , "wrap_not.svg" ); //$NON-NLS-1$
552- public static final ImageDescriptor DESC_DLCL_WRAP_NOT = createUnManaged (T_DLCL , "wrap_not.png" ); //$NON-NLS-1$
553514
554515 public static final ImageDescriptor DESC_ETOOL_JDOC_HOVER_EDIT = createUnManaged (T_ETOOL , "jdoc_hover_edit.svg" ); //$NON-NLS-1$
555- public static final ImageDescriptor DESC_DTOOL_JDOC_HOVER_EDIT = createUnManaged ( T_DTOOL , "jdoc_hover_edit.png" ); //$NON-NLS-1$
516+ public static final ImageDescriptor DESC_DTOOL_JDOC_HOVER_EDIT = ImageDescriptor . createWithFlags ( DESC_ETOOL_JDOC_HOVER_EDIT , SWT . IMAGE_DISABLE );
556517
557518 // Keys for correction proposal. We have to put the image into the registry since "code assist" doesn't
558519 // have a life cycle. So no chance to dispose icons.
0 commit comments