Merge branch...

	 */

	@Override

	protected void initializeImageRegistry(ImageRegistry registry) {

		ImageDescriptor imageDescriptor = getImageDescriptor(IMG_ETOOL_PROBLEM_CATEGORY_FILE);

		ImageDescriptor imageDescriptor = loadImageDescriptor(IMG_ETOOL_PROBLEM_CATEGORY_FILE);

		registry.put(IMG_ETOOL_PROBLEM_CATEGORY, imageDescriptor);

		imageDescriptor = getImageDescriptor(IMG_DLGBAN_QUICKFIX_DLG_FILE);

		imageDescriptor = loadImageDescriptor(IMG_DLGBAN_QUICKFIX_DLG_FILE);

		registry.put(IMG_DLGBAN_QUICKFIX_DLG, imageDescriptor);

		imageDescriptor = getImageDescriptor(IMG_OBJS_ERROR_PATH_FILE);

		imageDescriptor = loadImageDescriptor(IMG_OBJS_ERROR_PATH_FILE);

		registry.put(IMG_OBJS_ERROR_PATH, imageDescriptor);

		imageDescriptor = getImageDescriptor(IMG_OBJS_WARNING_PATH_FILE);

		imageDescriptor = loadImageDescriptor(IMG_OBJS_WARNING_PATH_FILE);

		registry.put(IMG_OBJS_WARNING_PATH, imageDescriptor);

		imageDescriptor = getImageDescriptor(IMG_OBJS_INFO_PATH_FILE);

		imageDescriptor = loadImageDescriptor(IMG_OBJS_INFO_PATH_FILE);

		registry.put(IMG_OBJS_INFO_PATH, imageDescriptor);

		imageDescriptor = getImageDescriptor(IMG_OBJS_HEADER_COMPLETE_FILE);

		imageDescriptor = loadImageDescriptor(IMG_OBJS_HEADER_COMPLETE_FILE);

		registry.put(IMG_OBJS_HEADER_COMPLETE_FILE, imageDescriptor);

		imageDescriptor = getImageDescriptor(IMG_DLCL_QUICK_FIX_DISABLED_FILE);

		imageDescriptor = loadImageDescriptor(IMG_DLCL_QUICK_FIX_DISABLED_FILE);

		registry.put(IMG_DLCL_QUICK_FIX_DISABLED, imageDescriptor);

		imageDescriptor = getImageDescriptor(IMG_ELCL_QUICK_FIX_ENABLED_FILE);

		imageDescriptor = loadImageDescriptor(IMG_ELCL_QUICK_FIX_ENABLED_FILE);

		registry.put(IMG_ELCL_QUICK_FIX_ENABLED, imageDescriptor);

	}

	public ImageDescriptor getImageDescriptor(String key) {

		Object url = getImage(key);

	public ImageDescriptor loadImageDescriptor(String path) {

		Object url = getImage(path);

		if (url instanceof URL) {

			return getImageDescriptor((URL) url);

			return loadImageDescriptor((URL) url);

		} else {

			return null;

		}

	}

	public ImageDescriptor getImageDescriptor(URL url) {

	public ImageDescriptor loadImageDescriptor(URL url) {

		return ImageDescriptor.createFromURL(url);

	}

	public ImageDescriptor getImageDescriptor(String key) {

		return getImageRegistry().getDescriptor(key);

	}

}