Author: dazarov Date: 2011-09-20 17:54:40 -0400 (Tue, 20 Sep 2011) New Revision: 34892 Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/annotation.png trunk/cdi/plugins/org.jboss.tools.cdi.core/images/bean_class.png trunk/cdi/plugins/org.jboss.tools.cdi.core/images/bean_field.png trunk/cdi/plugins/org.jboss.tools.cdi.core/images/bean_method.png trunk/cdi/plugins/org.jboss.tools.cdi.core/images/beans_xml.png trunk/cdi/plugins/org.jboss.tools.cdi.core/images/cdi16.png trunk/cdi/plugins/org.jboss.tools.cdi.core/images/event.png trunk/cdi/plugins/org.jboss.tools.cdi.core/images/injection_point.png trunk/cdi/plugins/org.jboss.tools.cdi.core/images/interface.png trunk/cdi/plugins/org.jboss.tools.cdi.core/images/open_cdi_named_bean.gif trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/ trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_add.png trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_change.png trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_edit.png trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_remove.png trunk/cdi/plugins/org.jboss.tools.cdi.core/images/search/ trunk/cdi/plugins/org.jboss.tools.cdi.core/images/search/cdi_bean.gif trunk/cdi/plugins/org.jboss.tools.cdi.core/images/search/weld_icon_16x.gif trunk/cdi/plugins/org.jboss.tools.cdi.core/images/wizard/ trunk/cdi/plugins/org.jboss.tools.cdi.core/images/wizard/WeldWizBan.gif trunk/cdi/plugins/org.jboss.tools.cdi.core/images/wizard/weld_icon_48x.gif trunk/cdi/plugins/org.jboss.tools.cdi.core/images/wizard/weld_icon_64x.gif trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java Removed: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/messages.properties trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/ca/BeansXmlProcessor.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 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/marker/AddAnnotationMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 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/wizard/NewAnnotationLiteralWizardPage.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeansXMLCreationWizard.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewCDIAnnotationWizardPage.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/facet/CDIInstallWizardPage.java Log: We need icon images for CDI Tools UI https://issues.jboss.org/browse/JBIDE-9717 Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/annotation.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/annotation.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/bean_class.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/bean_class.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/bean_field.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/bean_field.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/bean_method.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/bean_method.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/beans_xml.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/beans_xml.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/cdi16.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/cdi16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/event.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/event.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/injection_point.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/injection_point.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/interface.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/interface.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/open_cdi_named_bean.gif =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/open_cdi_named_bean.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_add.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_change.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_change.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_edit.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_remove.png =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/quickfixes/cdi_remove.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/search/cdi_bean.gif =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/search/cdi_bean.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/search/weld_icon_16x.gif =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/search/weld_icon_16x.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/wizard/WeldWizBan.gif =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/wizard/WeldWizBan.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/wizard/weld_icon_48x.gif =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/wizard/weld_icon_48x.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/wizard/weld_icon_64x.gif =================================================================== (Binary files differ) Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/wizard/weld_icon_64x.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreMessages.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreMessages.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreMessages.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -36,4 +36,8 @@ public static String CDI_RENAME_PROCESSOR_BEAN_HAS_NO_FILE; public static String CDI_RENAME_PROCESSOR_BEAN_HAS_NO_NAME_LOCATION; public static String CDI_UTIL_BUILD_CDI_MODEL; + + public static String CDI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL; + public static String CDI_IMAGESIMAGE_NAME_CANNOT_BE_NULL; + } \ No newline at end of file Copied: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java (from rev 34879, trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java) =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -0,0 +1,122 @@ +/******************************************************************************* + * 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.core; + +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; +import org.jboss.tools.cdi.internal.core.impl.EventBean; + +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$ + } catch (MalformedURLException e) { + 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 = 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$ + 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(); + } + + 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 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); + baseUrl = registryUrl; + parentRegistry = parent; + } + + protected CDIImages(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(CDICoreMessages.CDI_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 IBeanMethod){ + return BEAN_METHOD_IMAGE; + }else if(element instanceof IBeanField){ + return BEAN_FIELD_IMAGE; + } + System.out.println("NO IMAGE for - "+element.getClass()); + return WELD_IMAGE; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/messages.properties =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/messages.properties 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/messages.properties 2011-09-20 21:54:40 UTC (rev 34892) @@ -10,3 +10,6 @@ CDI_RENAME_PROCESSOR_BEAN_HAS_NO_FILE=Named Bean does not have a file CDI_RENAME_PROCESSOR_BEAN_HAS_NO_NAME_LOCATION=Named Bean does not have a name location CDI_UTIL_BUILD_CDI_MODEL=Build CDI Model +CDI_IMAGESBASE_URL_FOR_IMAGE_REGISTRY_CANNOT_BE_NULL=Base url for image registry cannot be null. +CDI_IMAGESIMAGE_NAME_CANNOT_BE_NULL=Image name cannot be null. + Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/ca/BeansXmlProcessor.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/ca/BeansXmlProcessor.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/ca/BeansXmlProcessor.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -21,6 +21,7 @@ import org.eclipse.swt.graphics.Image; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.core.IClassBean; @@ -94,7 +95,7 @@ for (IBean bean : alternatives) { if(bean instanceof IClassBean) { IType type = bean.getBeanClass(); - addMatchedType(type, value, proposals); + addMatchedType(type, value, proposals, CDIImages.getImageByElement(bean)); } } return proposals.toArray(new TextProposal[0]); @@ -107,7 +108,7 @@ for (IStereotype stereotype : alternatives) { if(stereotype.isAlternative()) { IType type = stereotype.getSourceType(); - addMatchedType(type, value, proposals); + addMatchedType(type, value, proposals, CDIImages.getImageByElement(stereotype)); } } return proposals.toArray(new TextProposal[0]); @@ -119,7 +120,7 @@ IDecorator[] decorators = cdiProject.getDecorators(); for (IDecorator bean : decorators) { IType type = bean.getBeanClass(); - addMatchedType(type, value, proposals); + addMatchedType(type, value, proposals, CDIImages.getImageByElement(bean)); } return proposals.toArray(new TextProposal[0]); } @@ -130,7 +131,7 @@ IInterceptor[] interceptors = cdiProject.getInterceptors(); for (IInterceptor bean : interceptors) { IType type = bean.getBeanClass(); - addMatchedType(type, value, proposals); + addMatchedType(type, value, proposals, CDIImages.getImageByElement(bean)); } return proposals.toArray(new TextProposal[0]); } @@ -145,7 +146,7 @@ return (st > 0) ? value.substring(st) : value; } - private void addMatchedType(IType type, String value, List<TextProposal> proposals) { + private void addMatchedType(IType type, String value, List<TextProposal> proposals, Image image) { String fullTypeName = type.getFullyQualifiedName(); if(fullTypeName.startsWith(value)) { TextProposal proposal = new TextProposal(); @@ -154,16 +155,7 @@ // proposal.setLabel(fullTypeName); proposal.setReplacementString(fullTypeName); proposal.setPosition(fullTypeName.length()); -// proposal.setImage(CdiElResolver.CDI_EL_PROPOSAL_IMAGE); - try { - if(type.isClass()) { - proposal.setImage(CLASS_PROPOSAL_IMAGE); - } else { - proposal.setImage(ANNOTATION_PROPOSAL_IMAGE); - } - } catch (JavaModelException e) { - CDICorePlugin.getDefault().logError(e); - } + proposal.setImage(image); proposals.add(proposal); } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -22,6 +22,7 @@ import org.eclipse.swt.graphics.Image; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.CDIUtil; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IBeanManager; @@ -36,6 +37,7 @@ import org.jboss.tools.common.el.core.resolver.IRelevanceCheck; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo; +import org.jboss.tools.common.text.TextProposal; /** * @author Alexey Kazakov @@ -44,17 +46,17 @@ private static ELParserFactory factory = ELParserUtil.getJbossFactory(); - public static final Image CDI_EL_PROPOSAL_IMAGE = - CDICorePlugin.getDefault().getImage(CDICorePlugin.CA_CDI_EL_IMAGE_PATH); - - /* (non-Javadoc) * @see org.jboss.tools.jst.web.kb.el.AbstractELCompletionEngine#getELProposalImage() */ @Override public Image getELProposalImage() { - return CDI_EL_PROPOSAL_IMAGE; + return null; } + + protected void setImage(TextProposal kbProposal, IBean var) { + kbProposal.setImage(CDIImages.getImageByElement(var)); + } /* (non-Javadoc) * @see org.jboss.tools.jst.web.kb.el.AbstractELCompletionEngine#log(java.lang.Exception) 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-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -20,13 +20,13 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.ICDIElement; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IInjectionPointField; 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{ @@ -94,7 +94,7 @@ } public Image getImage() { - return CDIUiImages.getImageByElement(event); + return CDIImages.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-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -20,6 +20,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.ICDIElement; import org.jboss.tools.cdi.core.IDecorator; @@ -28,7 +29,6 @@ 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{ @@ -127,7 +127,7 @@ } public Image getImage() { - return CDIUiImages.getImageByElement(bean); + return CDIImages.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-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -20,11 +20,11 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.ICDIElement; 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{ @@ -85,7 +85,7 @@ } public Image getImage() { - return CDIUiImages.getImageByElement(observerMethod); + return CDIImages.getImageByElement(observerMethod); } } Deleted: 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-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUiImages.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -1,128 +0,0 @@ -/******************************************************************************* - * 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; -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 { - - 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 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$ - 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(); - } - - 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); - } - - 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 IBeanMethod){ - return BEAN_METHOD_IMAGE; - }else if(element instanceof IBeanField){ - return BEAN_FIELD_IMAGE; - } - return WELD_IMAGE; - } - -} Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -23,9 +23,9 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; public class AddAnnotationMarkerResolution implements IMarkerResolution2 { @@ -74,6 +74,6 @@ } public Image getImage() { - return CDIUiImages.QUICKFIX_ADD; + return CDIImages.QUICKFIX_ADD; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -28,9 +28,9 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; import org.jboss.tools.cdi.core.CDIConstants; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.EclipseUtil; import org.jboss.tools.common.model.util.EclipseJavaUtil; @@ -126,7 +126,7 @@ } public Image getImage() { - return CDIUiImages.QUICKFIX_ADD; + return CDIImages.QUICKFIX_ADD; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -19,9 +19,9 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; import org.jboss.tools.cdi.core.CDIConstants; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; public class AddRetentionAnnotationMarkerResolution implements IMarkerResolution2 { @@ -58,6 +58,6 @@ } public Image getImage() { - return CDIUiImages.QUICKFIX_ADD; + return CDIImages.QUICKFIX_ADD; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -20,9 +20,9 @@ import org.eclipse.jdt.core.IType; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.EclipseUtil; /** @@ -70,7 +70,7 @@ @Override public Image getImage() { - return CDIUiImages.QUICKFIX_ADD; + return CDIImages.QUICKFIX_ADD; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -19,9 +19,9 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; import org.jboss.tools.cdi.core.CDIConstants; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; public class AddTargetAnnotationMarkerResolution implements IMarkerResolution2 { @@ -68,6 +68,6 @@ } public Image getImage() { - return CDIUiImages.QUICKFIX_ADD; + return CDIImages.QUICKFIX_ADD; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -21,9 +21,9 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; import org.jboss.tools.cdi.core.CDIConstants; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; public class ChangeAnnotationMarkerResolution implements IMarkerResolution2 { @@ -106,6 +106,6 @@ } public Image getImage() { - return CDIUiImages.QUICKFIX_CHANGE; + return CDIImages.QUICKFIX_CHANGE; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -19,8 +19,8 @@ import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.cdi.ui.wizard.DeletePreviewWizard; /** @@ -59,7 +59,7 @@ } public Image getImage() { - return CDIUiImages.QUICKFIX_REMOVE; + return CDIImages.QUICKFIX_REMOVE; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -20,8 +20,8 @@ import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.cdi.ui.wizard.DeletePreviewWizard; /** @@ -69,7 +69,7 @@ } public Image getImage() { - return CDIUiImages.QUICKFIX_REMOVE; + return CDIImages.QUICKFIX_REMOVE; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -23,9 +23,9 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; public class DeleteAnnotationMarkerResolution implements IMarkerResolution2 { @@ -74,6 +74,6 @@ } public Image getImage() { - return CDIUiImages.QUICKFIX_REMOVE; + return CDIImages.QUICKFIX_REMOVE; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -29,11 +29,11 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; import org.jboss.tools.cdi.core.CDIConstants; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IScopeDeclaration; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.EclipseUtil; /** @@ -146,7 +146,7 @@ @Override public Image getImage() { - return CDIUiImages.QUICKFIX_EDIT; + return CDIImages.QUICKFIX_EDIT; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -25,9 +25,9 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IMarkerResolution2; import org.eclipse.ui.PlatformUI; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.EclipseUtil; /** @@ -99,6 +99,6 @@ @Override public Image getImage() { - return CDIUiImages.QUICKFIX_EDIT; + return CDIImages.QUICKFIX_EDIT; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -23,9 +23,9 @@ import org.eclipse.jdt.core.Signature; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.EclipseUtil; /** @@ -91,7 +91,7 @@ } public Image getImage() { - return CDIUiImages.QUICKFIX_EDIT; + return CDIImages.QUICKFIX_EDIT; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -23,12 +23,12 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IMarkerResolution2; import org.eclipse.ui.PlatformUI; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.ui.CDIUIMessages; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.cdi.ui.wizard.AddQualifiersToBeanWizard; import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite; import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier; @@ -137,7 +137,7 @@ } public Image getImage() { - return CDIUiImages.QUICKFIX_EDIT; + return CDIImages.QUICKFIX_EDIT; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -25,9 +25,9 @@ import org.eclipse.jdt.core.Signature; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.EclipseUtil; import org.jboss.tools.common.model.util.EclipseJavaUtil; @@ -146,7 +146,7 @@ } public Image getImage() { - return CDIUiImages.QUICKFIX_ADD; + return CDIImages.QUICKFIX_ADD; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -23,9 +23,9 @@ import org.eclipse.jdt.core.Signature; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.EclipseUtil; /** @@ -90,7 +90,7 @@ } public Image getImage() { - return CDIUiImages.QUICKFIX_EDIT; + return CDIImages.QUICKFIX_EDIT; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -21,12 +21,12 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IMarkerResolution2; import org.eclipse.ui.PlatformUI; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.ui.CDIUIMessages; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.cdi.ui.wizard.SelectBeanWizard; import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier; @@ -120,6 +120,6 @@ } public Image getImage() { - return CDIUiImages.QUICKFIX_EDIT; + return CDIImages.QUICKFIX_EDIT; } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -32,6 +32,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.PartInitException; import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.ICDIElement; import org.jboss.tools.cdi.core.ICDIProject; @@ -41,7 +42,6 @@ import org.jboss.tools.cdi.core.IInjectionPointParameter; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.java.IParametedType; public class CDIBeanQueryParticipant implements IQueryParticipant{ @@ -160,7 +160,10 @@ @Override public Image getImage(Object element) { - return CDIUiImages.WELD_IMAGE; + if(element instanceof ICDIElement){ + CDIImages.getImageByElement((ICDIElement)element); + } + return CDIImages.WELD_IMAGE; } @Override 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 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -14,6 +14,7 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.graphics.Image; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.ICDIElement; import org.jboss.tools.cdi.core.IInitializerMethod; @@ -21,12 +22,14 @@ import org.jboss.tools.cdi.core.IInjectionPointParameter; import org.jboss.tools.cdi.core.IObserverMethod; 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 CDIUiImages.WELD_IMAGE; + if(element instanceof ICDIElement){ + CDIImages.getImageByElement((ICDIElement)element); + } + return CDIImages.WELD_IMAGE; } public String getText(Object element) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -52,11 +52,11 @@ import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.ICDIAnnotation; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.ui.CDIUIMessages; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.java.generation.JavaBeanGenerator; import org.jboss.tools.common.ui.widget.editor.ButtonFieldEditor; @@ -81,7 +81,7 @@ public NewAnnotationLiteralWizardPage() { setTitle(CDIUIMessages.NEW_ANNOTATION_LITERAL_WIZARD_PAGE_NAME); setDescription(CDIUIMessages.NEW_ANNOTATION_LITERAL_WIZARD_DESCRIPTION); - setImageDescriptor(CDIUiImages.getImageDescriptor(CDIUiImages.WELD_WIZARD_IMAGE_PATH)); + setImageDescriptor(CDIImages.getImageDescriptor(CDIImages.WELD_WIZARD_IMAGE_PATH)); qualifiersProvider.setMulti(false); } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -48,12 +48,12 @@ import org.eclipse.ui.PlatformUI; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.ICDIAnnotation; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.core.IScope; import org.jboss.tools.cdi.ui.CDIUIMessages; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.ui.widget.editor.CheckBoxFieldEditor; import org.jboss.tools.common.ui.widget.editor.CompositeEditor; import org.jboss.tools.common.ui.widget.editor.IFieldEditor; @@ -89,7 +89,7 @@ public NewBeanWizardPage() { setTitle(CDIUIMessages.NEW_BEAN_WIZARD_PAGE_NAME); setDescription(CDIUIMessages.NEW_BEAN_WIZARD_DESCRIPTION); - setImageDescriptor(CDIUiImages.getImageDescriptor(CDIUiImages.WELD_WIZARD_IMAGE_PATH)); + setImageDescriptor(CDIImages.getImageDescriptor(CDIImages.WELD_WIZARD_IMAGE_PATH)); } public void setMayBeRegisteredInBeansXML(boolean b) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeansXMLCreationWizard.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeansXMLCreationWizard.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeansXMLCreationWizard.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -39,9 +39,9 @@ import org.eclipse.ui.internal.ide.misc.ResourceAndContainerGroup; import org.eclipse.ui.internal.wizards.newresource.ResourceMessages; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.project.ProjectHome; @@ -74,7 +74,7 @@ mainPage = new WizardNewBeansXMLFileCreationPage("newFilePage1", getSelection());//$NON-NLS-1$ mainPage.setTitle(CDIUIMessages.NEW_BEANS_XML_WIZARD_PAGE_NAME); mainPage.setDescription(CDIUIMessages.NEW_BEANS_XML_WIZARD_DESCRIPTION); - mainPage.setImageDescriptor(CDIUiImages.getImageDescriptor(CDIUiImages.WELD_WIZARD_IMAGE_PATH)); + mainPage.setImageDescriptor(CDIImages.getImageDescriptor(CDIImages.WELD_WIZARD_IMAGE_PATH)); mainPage.setFileName("beans.xml"); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewCDIAnnotationWizardPage.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewCDIAnnotationWizardPage.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewCDIAnnotationWizardPage.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -36,9 +36,9 @@ import org.jboss.tools.cdi.core.CDICoreMessages; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.ui.CDIUIMessages; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.ui.widget.editor.CheckBoxFieldEditor; import org.jboss.tools.common.ui.widget.editor.CompositeEditor; import org.jboss.tools.common.ui.widget.editor.IFieldEditor; @@ -57,7 +57,7 @@ protected IFieldEditor target = null; public NewCDIAnnotationWizardPage() { - setImageDescriptor(CDIUiImages.getImageDescriptor(CDIUiImages.WELD_WIZARD_IMAGE_PATH)); + setImageDescriptor(CDIImages.getImageDescriptor(CDIImages.WELD_WIZARD_IMAGE_PATH)); } protected void createTypeMembers(IType newType, final ImportsManager imports, IProgressMonitor monitor) throws CoreException { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -49,8 +49,8 @@ import org.eclipse.ui.PlatformUI; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.ui.CDIUIMessages; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.cdi.ui.wizard.NewBeanWizardPage.CheckBoxEditorWrapper; import org.jboss.tools.common.java.generation.JavaBeanGenerator; import org.jboss.tools.common.ui.widget.editor.CompositeEditor; @@ -77,7 +77,7 @@ public NewDecoratorWizardPage() { setTitle(CDIUIMessages.NEW_DECORATOR_WIZARD_PAGE_NAME); setDescription(CDIUIMessages.NEW_DECORATOR_WIZARD_DESCRIPTION); - setImageDescriptor(CDIUiImages.getImageDescriptor(CDIUiImages.WELD_WIZARD_IMAGE_PATH)); + setImageDescriptor(CDIImages.getImageDescriptor(CDIImages.WELD_WIZARD_IMAGE_PATH)); } public void setMayBeRegisteredInBeansXML(boolean b) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewInterceptorWizardPage.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -59,10 +59,10 @@ import org.eclipse.ui.PlatformUI; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICoreNature; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.ICDIAnnotation; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.ui.CDIUIMessages; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.cdi.ui.wizard.NewBeanWizardPage.CheckBoxEditorWrapper; import org.jboss.tools.common.java.generation.JavaBeanGenerator; import org.jboss.tools.common.ui.widget.editor.CompositeEditor; @@ -94,7 +94,7 @@ public NewInterceptorWizardPage() { setTitle(CDIUIMessages.NEW_INTERCEPTOR_WIZARD_PAGE_NAME); setDescription(CDIUIMessages.NEW_INTERCEPTOR_WIZARD_DESCRIPTION); - setImageDescriptor(CDIUiImages.getImageDescriptor(CDIUiImages.WELD_WIZARD_IMAGE_PATH)); + setImageDescriptor(CDIImages.getImageDescriptor(CDIImages.WELD_WIZARD_IMAGE_PATH)); } public void init(IStructuredSelection selection) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -40,13 +40,13 @@ import org.eclipse.ui.XMLMemento; import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog; import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.internal.core.event.CDIProjectChangeEvent; import org.jboss.tools.cdi.internal.core.event.ICDIProjectChangeListener; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.CDIUiImages; /** * Open CDI Named Bean Dialog @@ -336,7 +336,7 @@ public class CDINamedBeanLabelProvider implements ILabelProvider { public Image getImage(Object element) { - return CDIUiImages.CDI_BEAN_IMAGE; + return CDIImages.CDI_BEAN_IMAGE; } public String getText(Object element) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/facet/CDIInstallWizardPage.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/facet/CDIInstallWizardPage.java 2011-09-20 20:07:44 UTC (rev 34891) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/facet/CDIInstallWizardPage.java 2011-09-20 21:54:40 UTC (rev 34892) @@ -25,9 +25,9 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener; import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage; import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage; +import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.internal.core.project.facet.ICDIFacetDataModelProperties; import org.jboss.tools.cdi.ui.CDIUIMessages; -import org.jboss.tools.cdi.ui.CDIUiImages; import org.jboss.tools.common.ui.widget.editor.IFieldEditor; import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory; @@ -44,7 +44,7 @@ public CDIInstallWizardPage() { super(CDIUIMessages.CDI_INSTALL_WIZARD_PAGE_FACET); setTitle(CDIUIMessages.CDI_INSTALL_WIZARD_PAGE_FACET); - setImageDescriptor(CDIUiImages.getImageDescriptor(CDIUiImages.WELD_WIZARD_IMAGE_PATH)); + setImageDescriptor(CDIImages.getImageDescriptor(CDIImages.WELD_WIZARD_IMAGE_PATH)); setDescription(CDIUIMessages.CDI_INSTALL_WIZARD_PAGE_CONFIGURE); }