[jbosstools-commits] JBoss Tools SVN: r34863 - in trunk/cdi/plugins: org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink and 2 other directories.

Author: dazarov Date: 2011-09-19 16:23:26 -0400 (Mon, 19 Sep 2011) New Revision: 34863 Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/annotation.png trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/bean_class.png trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/bean_field.png trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/bean_method.png trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/beans_xml.png trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/event.png trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/injection_point.png trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/interface.png Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java Log: We need icon images for CDI Tools UI https://issues.jboss.org/browse/JBIDE-9717 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF 2011-09-19 20:20:48 UTC (rev 34862) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF 2011-09-19 20:23:26 UTC (rev 34863) @@ -19,6 +19,7 @@ org.jboss.tools.cdi.core;bundle-version="1.0.0", org.jboss.tools.common;bundle-version="2.0.0", org.jboss.tools.common.el.core;bundle-version="2.0.0", - org.jboss.tools.common.model;bundle-version="2.0.0" + org.jboss.tools.common.model;bundle-version="2.0.0", + org.jboss.tools.cdi.ui;bundle-version="1.2.0" Bundle-Version: 1.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-09-19 20:20:48 UTC (rev 34862) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-09-19 20:23:26 UTC (rev 34863) @@ -26,6 +26,7 @@ import org.jboss.tools.cdi.core.IInjectionPointParameter; import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages; import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin; +import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; public class EventHyperlink extends AbstractHyperlink implements ITestableCDIHyperlink, IInformationItem{ @@ -93,7 +94,7 @@ } public Image getImage() { - return null; + return CDIUiImages.getImageByElement(event); } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-09-19 20:20:48 UTC (rev 34862) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-09-19 20:23:26 UTC (rev 34863) @@ -28,6 +28,7 @@ import org.jboss.tools.cdi.core.IProducerMethod; import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages; import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin; +import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; public class InjectedPointHyperlink extends AbstractHyperlink implements ITestableCDIHyperlink, IInformationItem{ @@ -126,7 +127,7 @@ } public Image getImage() { - return null; + return CDIUiImages.getImageByElement(bean); } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2011-09-19 20:20:48 UTC (rev 34862) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2011-09-19 20:23:26 UTC (rev 34863) @@ -24,6 +24,7 @@ import org.jboss.tools.cdi.core.IObserverMethod; import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages; import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin; +import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; public class ObserverMethodHyperlink extends AbstractHyperlink implements IInformationItem, ITestableCDIHyperlink{ @@ -84,7 +85,7 @@ } public Image getImage() { - return null; + return CDIUiImages.getImageByElement(observerMethod); } } Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/annotation.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/annotation.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/bean_class.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/bean_class.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/bean_field.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/bean_field.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/bean_method.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/bean_method.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/beans_xml.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/beans_xml.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/event.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/event.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/injection_point.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/injection_point.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/interface.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/interface.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: 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 2011-09-19 20:20:48 UTC (rev 34862) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java 2011-09-19 20:23:26 UTC (rev 34863) @@ -17,6 +17,15 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; +import org.jboss.tools.cdi.core.IBeanField; +import org.jboss.tools.cdi.core.IBeanMethod; +import org.jboss.tools.cdi.core.ICDIAnnotation; +import org.jboss.tools.cdi.core.ICDIElement; +import org.jboss.tools.cdi.core.IClassBean; +import org.jboss.tools.cdi.core.IInjectionPoint; +import org.jboss.tools.cdi.core.IProducerField; +import org.jboss.tools.cdi.core.IProducerMethod; +import org.jboss.tools.cdi.internal.core.impl.EventBean; public class CDIUiImages { @@ -33,6 +42,13 @@ 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 final Image BEAN_CLASS_IMAGE = getImage("bean_class.png"); //$NON-NLS-1$ + public static final Image BEAN_METHOD_IMAGE = getImage("bean_method.png"); //$NON-NLS-1$ + public static final Image BEAN_FIELD_IMAGE = getImage("bean_field.png"); //$NON-NLS-1$ + public static final Image INJECTION_POINT_IMAGE = getImage("injection_point.png"); //$NON-NLS-1$ + public static final Image ANNOTATION_IMAGE = getImage("annotation.png"); //$NON-NLS-1$ + public static final Image CDI_EVENT_IMAGE = getImage("event.png"); //$NON-NLS-1$ + public static final Image QUICKFIX_ADD = getImage("quickfixes/cdi_add.png"); //$NON-NLS-1$ public static final Image QUICKFIX_REMOVE = getImage("quickfixes/cdi_remove.png"); //$NON-NLS-1$ public static final Image QUICKFIX_EDIT = getImage("quickfixes/cdi_edit.png"); //$NON-NLS-1$ @@ -90,6 +106,23 @@ 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); - } + } + + public static Image getImageByElement(ICDIElement element){ + if(element instanceof IClassBean){ + return BEAN_CLASS_IMAGE; + }else if(element instanceof IInjectionPoint){ + return INJECTION_POINT_IMAGE; + }else if(element instanceof ICDIAnnotation){ + return ANNOTATION_IMAGE; + }else if(element instanceof EventBean){ + return CDI_EVENT_IMAGE; + }else if(element instanceof IProducerMethod || element instanceof IBeanMethod){ + return BEAN_METHOD_IMAGE; + }else if(element instanceof IProducerField || element instanceof IBeanField){ + return BEAN_FIELD_IMAGE; + } + return WELD_IMAGE; + } }