Author: akazakov Date: 2011-09-22 16:49:22 -0400 (Thu, 22 Sep 2011) New Revision: 34973 Added: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/annotation.png Removed: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/annotation.png Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java Log: https://issues.jboss.org/browse/JBIDE-9717 Icons for CDI Tools UI Elements Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/annotation.png =================================================================== (Binary files differ) Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java 2011-09-22 19:39:17 UTC (rev 34972) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java 2011-09-22 20:49:22 UTC (rev 34973) @@ -23,7 +23,7 @@ public class CDIImages { private static CDIImages INSTANCE; - + static { try { INSTANCE = new CDIImages(new URL(CDICorePlugin.getDefault().getBundle().getEntry("/"), "images/")); //$NON-NLS-1$ //$NON-NLS-2$ @@ -31,24 +31,24 @@ CDICorePlugin.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 final Image BEAN_CLASS_IMAGE = CDIXMLImages.BEAN_CLASS_IMAGE; 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 ANNOTATION_IMAGE = CDIXMLImages.ANNOTATION_IMAGE; 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$ public static final Image QUICKFIX_CHANGE = getImage("quickfixes/cdi_change.png"); //$NON-NLS-1$ - + public static final String WELD_WIZARD_IMAGE_PATH = "wizard/WeldWizBan.gif"; //$NON-NLS-1$ - + public static Image getImage(String key) { return INSTANCE.createImageDescriptor(key).createImage(); } @@ -60,14 +60,14 @@ public static void setImageDescriptors(IAction action, String iconName) { action.setImageDescriptor(INSTANCE.createImageDescriptor(iconName)); } - + public static CDIImages getInstance() { return INSTANCE; } private URL baseUrl; private CDIImages parentRegistry; - + protected CDIImages(URL registryUrl, CDIImages parent){ if(registryUrl == null) throw new IllegalArgumentException(CDICoreMessages.CDI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL); @@ -102,7 +102,6 @@ } public static Image getImageByElement(ICDIElement element){ - if(element instanceof IClassBean){ return BEAN_CLASS_IMAGE; }else if(element instanceof IInjectionPoint){ @@ -118,5 +117,4 @@ } return WELD_IMAGE; } - -} +} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-09-22 19:39:17 UTC (rev 34972) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-09-22 20:49:22 UTC (rev 34973) @@ -183,7 +183,7 @@ <wizard category="org.jboss.tools.cdi.ui" class="org.jboss.tools.cdi.ui.wizard.NewQualifierCreationWizard" - icon="platform:/plugin/org.jboss.tools.cdi.core/images/annotation.png" + icon="platform:/plugin/org.jboss.tools.cdi.xml/images/annotation.png" id="org.jboss.tools.cdi.ui.wizard.NewQualifierCreationWizard" name="Qualifier Annotation" project="false"> @@ -198,7 +198,7 @@ <wizard category="org.jboss.tools.cdi.ui" class="org.jboss.tools.cdi.ui.wizard.NewStereotypeCreationWizard" - icon="platform:/plugin/org.jboss.tools.cdi.core/images/annotation.png" + icon="platform:/plugin/org.jboss.tools.cdi.xml/images/annotation.png" id="org.jboss.tools.cdi.ui.wizard.NewStereotypeCreationWizard" name="Stereotype Annotation" project="false"> @@ -213,7 +213,7 @@ <wizard category="org.jboss.tools.cdi.ui" class="org.jboss.tools.cdi.ui.wizard.NewScopeCreationWizard" - icon="platform:/plugin/org.jboss.tools.cdi.core/images/annotation.png" + icon="platform:/plugin/org.jboss.tools.cdi.xml/images/annotation.png" id="org.jboss.tools.cdi.ui.wizard.NewScopeCreationWizard" name="Scope Annotation" project="false"> @@ -228,7 +228,7 @@ <wizard category="org.jboss.tools.cdi.ui" class="org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingCreationWizard" - icon="platform:/plugin/org.jboss.tools.cdi.core/images/annotation.png" + icon="platform:/plugin/org.jboss.tools.cdi.xml/images/annotation.png" id="org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingCreationWizard" name="Interceptor Binding Annotation" project="false"> @@ -288,7 +288,7 @@ <wizard category="org.jboss.tools.cdi.ui" class="org.jboss.tools.cdi.ui.wizard.NewAnnotationLiteralCreationWizard" - icon="platform:/plugin/org.jboss.tools.cdi.core/images/annotation.png" + icon="platform:/plugin/org.jboss.tools.cdi.xml/images/annotation.png" id="org.jboss.tools.cdi.ui.wizard.NewAnnotationLiteralCreationWizard" name="Annotation Literal" project="false"> Added: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/annotation.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.xml/images/annotation.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta 2011-09-22 19:39:17 UTC (rev 34972) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/resources/meta/cdi-beans.meta 2011-09-22 20:49:22 UTC (rev 34973) @@ -24,6 +24,7 @@ <GROUP name="cdi"> <ICON name="bean" path="plugin:org.jboss.tools.cdi.xml:images/bean_class.png"/> <ICON name="file" path="plugin:org.jboss.tools.cdi.xml:images/beans_xml.png"/> + <ICON name="annotation" path="plugin:org.jboss.tools.cdi.xml:images/annotation.png"/> </GROUP> </GROUP> </ICONS> @@ -221,7 +222,7 @@ <XChildrenEntities/> <XEntityRenderer> <ICONS> - <ICON info="main.cdi.bean" type="main"/> + <ICON info="main.cdi.annotation" type="main"/> </ICONS> </XEntityRenderer> <XModelAttributes> Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java 2011-09-22 19:39:17 UTC (rev 34972) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java 2011-09-22 20:49:22 UTC (rev 34973) @@ -8,7 +8,6 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ - package org.jboss.tools.cdi.xml; import java.net.MalformedURLException; @@ -31,6 +30,7 @@ } public static final Image BEAN_CLASS_IMAGE = getImage("bean_class.png"); //$NON-NLS-1$ + public static final Image ANNOTATION_IMAGE = getImage("annotation.png"); //$NON-NLS-1$ public static Image getImage(String key) { return INSTANCE.createImageDescriptor(key).createImage();