[jbosstools-commits] JBoss Tools SVN: r20058 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: search and 1 other directory.

Author: dazarov Date: 2010-02-01 12:08:23 -0500 (Mon, 01 Feb 2010) New Revision: 20058 Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java Log: https://jira.jboss.org/jira/browse/JBIDE-3125 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2010-02-01 17:07:39 UTC (rev 20057) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2010-02-01 17:08:23 UTC (rev 20058) @@ -20,4 +20,6 @@ } public static String INJECTION_POINT_LABEL_PROVIDER; + public static String CDI_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL; + public static String CDI_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-02-01 17:07:39 UTC (rev 20057) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-02-01 17:08:23 UTC (rev 20058) @@ -9,4 +9,6 @@ ### Red Hat, Inc. - initial API and implementation ################################################################################## -INJECTION_POINT_LABEL_PROVIDER=Injected class \ No newline at end of file +INJECTION_POINT_LABEL_PROVIDER=Injected class +CDI_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL=Base url for image registry cannot be null. +CDI_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL=Image name cannot be null. \ No newline at end of file Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java 2010-02-01 17:08:23 UTC (rev 20058) @@ -0,0 +1,90 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ + +package org.jboss.tools.cdi.ui; + +import java.net.MalformedURLException; +import java.net.URL; + +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.swt.graphics.Image; + +public class CDIUiImages { + + private static CDIUiImages INSTANCE; + + static { + try { + INSTANCE = new CDIUiImages(new URL(CDIUIPlugin.getDefault().getBundle().getEntry("/"), "icons/")); //$NON-NLS-1$ //$NON-NLS-2$ + } catch (MalformedURLException e) { + CDIUIPlugin.getDefault().logError(e); + } + } + + public static final Image CDI_BEAN_IMAGE = getImage("search/cdi_bean.gif"); //$NON-NLS-1$ + public static final Image WELD_IMAGE = getImage("search/weld_icon_16x.gif"); //$NON-NLS-1$ + + + + public static Image getImage(String key) { + return INSTANCE.createImageDescriptor(key).createImage(); + } + + public static ImageDescriptor getImageDescriptor(String key) { + return INSTANCE.createImageDescriptor(key); + } + + public static void setImageDescriptors(IAction action, String iconName) { + action.setImageDescriptor(INSTANCE.createImageDescriptor(iconName)); + } + + public static CDIUiImages getInstance() { + return INSTANCE; + } + + private URL baseUrl; + private CDIUiImages parentRegistry; + + protected CDIUiImages(URL registryUrl, CDIUiImages parent){ + + if(registryUrl == null) throw new IllegalArgumentException(CDIUIMessages.CDI_UI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL); + baseUrl = registryUrl; + parentRegistry = parent; + } + + protected CDIUiImages(URL url){ + this(url,null); + } + + public Image getImageByFileName(String key) { + return createImageDescriptor(key).createImage(); + } + + public ImageDescriptor createImageDescriptor(String key) { + try { + return ImageDescriptor.createFromURL(makeIconFileURL(key)); + } catch (MalformedURLException e) { + if(parentRegistry == null) { + return ImageDescriptor.getMissingImageDescriptor(); + } else { + return parentRegistry.createImageDescriptor(key); + } + + } + } + + private URL makeIconFileURL(String name) throws MalformedURLException { + if (name == null) throw new MalformedURLException(CDIUIMessages.CDI_UI_IMAGESIMAGE_NAME_CANNOT_BE_NULL); + return new URL(baseUrl, name); + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2010-02-01 17:07:39 UTC (rev 20057) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2010-02-01 17:08:23 UTC (rev 20058) @@ -10,18 +10,18 @@ ******************************************************************************/ package org.jboss.tools.cdi.ui.search; -import org.eclipse.jdt.ui.ISharedImages; -import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.swt.graphics.Image; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.ui.CDIUIMessages; +import org.jboss.tools.cdi.ui.CDIUiImages; public class InjectionPointLabelProvider implements ILabelProvider { public Image getImage(Object element) { - return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS); + //return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS); + return CDIUiImages.WELD_IMAGE; } public String getText(Object element) {