[jbosstools-commits] JBoss Tools SVN: r42679 - in trunk: cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core and 26 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Jul 23 18:33:22 EDT 2012
Author: akazakov
Date: 2012-07-23 18:33:19 -0400 (Mon, 23 Jul 2012)
New Revision: 42679
Added:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/xpl/
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/xpl/ImageDescriptorRegistry.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
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/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.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.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/AddNameMarkerResolution.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/CreateCDIElementMarkerResolution.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/DeleteAllOtherAnnotationsFromParametersMarkerResolution.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.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/HierarchyInformationControl.java
trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIPlugin.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/TextProposal.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/el/JSF2ElResolver.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFELCompletionEngine.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ActionProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/CSSClassProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ConverterIDProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/EnumerationProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FaceletsJsfCProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FacetNameProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/IDProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourceBundleNameProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourcePathProposalType.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
Log:
https://issues.jboss.org/browse/JBIDE-12353 Deadlock when invoking code completion
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2012-07-23 22:33:19 UTC (rev 42679)
@@ -28,7 +28,8 @@
org.jboss.tools.jst.web,
org.jboss.tools.common.validation,
org.jboss.tools.cdi.xml;visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="3.7.0"
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.jboss.tools.common.ui
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -18,6 +18,7 @@
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.cdi.internal.core.impl.EventBean;
import org.jboss.tools.cdi.xml.CDIXMLImages;
+import org.jboss.tools.common.ui.CommonUIPlugin;
public class CDIImages {
@@ -31,28 +32,32 @@
}
}
- 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 ImageDescriptor CDI_BEAN_IMAGE = getImageDescriptor("search/cdi_bean.gif"); //$NON-NLS-1$
+ public static final ImageDescriptor WELD_IMAGE = getImageDescriptor("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 = CDIXMLImages.ANNOTATION_IMAGE;
- public static final Image CDI_EVENT_IMAGE = getImage("event.png"); //$NON-NLS-1$
+ public static final ImageDescriptor BEAN_CLASS_IMAGE = CDIXMLImages.BEAN_CLASS_IMAGE;
+ public static final ImageDescriptor BEAN_METHOD_IMAGE = getImageDescriptor("bean_method.png"); //$NON-NLS-1$
+ public static final ImageDescriptor BEAN_FIELD_IMAGE = getImageDescriptor("bean_field.png"); //$NON-NLS-1$
+ public static final ImageDescriptor INJECTION_POINT_IMAGE = getImageDescriptor("injection_point.png"); //$NON-NLS-1$
+ public static final ImageDescriptor ANNOTATION_IMAGE = CDIXMLImages.ANNOTATION_IMAGE;
+ public static final ImageDescriptor CDI_EVENT_IMAGE = getImageDescriptor("event.png"); //$NON-NLS-1$
- public static final Image MESSAGE_BUNDLE_IMAGE = getImage("message_bundle.gif"); //$NON-NLS-1$
+ public static final ImageDescriptor MESSAGE_BUNDLE_IMAGE = getImageDescriptor("message_bundle.gif"); //$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 ImageDescriptor QUICKFIX_ADD = getImageDescriptor("quickfixes/cdi_add.png"); //$NON-NLS-1$
+ public static final ImageDescriptor QUICKFIX_REMOVE = getImageDescriptor("quickfixes/cdi_remove.png"); //$NON-NLS-1$
+ public static final ImageDescriptor QUICKFIX_EDIT = getImageDescriptor("quickfixes/cdi_edit.png"); //$NON-NLS-1$
+ public static final ImageDescriptor QUICKFIX_CHANGE = getImageDescriptor("quickfixes/cdi_change.png"); //$NON-NLS-1$
public static final String CDI_PROJECT_IMAGE = "wizard/CDIProjectWizBan.png"; //$NON-NLS-1$
public static final String CDI_BEANS_XML_IMAGE = "wizard/CDIBeansXMLWizBan.png"; //$NON-NLS-1$
public static final String CDI_CLASS_IMAGE = "wizard/CDIClassWizBan.png"; //$NON-NLS-1$
public static final String CDI_ANNOTATION_IMAGE = "wizard/CDIAnnotationWizBan.png"; //$NON-NLS-1$
+ public static Image getImage(ImageDescriptor descriptor) {
+ return CommonUIPlugin.getImageDescriptorRegistry().get(descriptor);
+ }
+
public static Image getImage(String key) {
return INSTANCE.createImageDescriptor(key).createImage();
}
@@ -102,8 +107,12 @@
if (name == null) throw new MalformedURLException(CDICoreMessages.CDI_IMAGESIMAGE_NAME_CANNOT_BE_NULL);
return new URL(baseUrl, name);
}
-
- public static Image getImageByElement(ICDIElement element){
+
+ public static Image getImageByElement(ICDIElement element) {
+ return getImage(getImageDescriptorByElement(element));
+ }
+
+ public static ImageDescriptor getImageDescriptorByElement(ICDIElement element) {
if(element instanceof IClassBean){
return BEAN_CLASS_IMAGE;
}else if(element instanceof IInjectionPoint){
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/ca/BeansXmlProcessor.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -16,8 +16,8 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.ui.JavaPluginImages;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
@@ -95,7 +95,7 @@
for (IBean bean : alternatives) {
if(bean instanceof IClassBean) {
IType type = bean.getBeanClass();
- addMatchedType(type, value, proposals, CDIImages.getImageByElement(bean));
+ addMatchedType(type, value, proposals, CDIImages.getImageDescriptorByElement(bean));
}
}
return proposals.toArray(new TextProposal[0]);
@@ -108,7 +108,7 @@
for (IStereotype stereotype : alternatives) {
if(stereotype.isAlternative()) {
IType type = stereotype.getSourceType();
- addMatchedType(type, value, proposals, CDIImages.getImageByElement(stereotype));
+ addMatchedType(type, value, proposals, CDIImages.getImageDescriptorByElement(stereotype));
}
}
return proposals.toArray(new TextProposal[0]);
@@ -120,7 +120,7 @@
IDecorator[] decorators = cdiProject.getDecorators();
for (IDecorator bean : decorators) {
IType type = bean.getBeanClass();
- addMatchedType(type, value, proposals, CDIImages.getImageByElement(bean));
+ addMatchedType(type, value, proposals, CDIImages.getImageDescriptorByElement(bean));
}
return proposals.toArray(new TextProposal[0]);
}
@@ -131,7 +131,7 @@
IInterceptor[] interceptors = cdiProject.getInterceptors();
for (IInterceptor bean : interceptors) {
IType type = bean.getBeanClass();
- addMatchedType(type, value, proposals, CDIImages.getImageByElement(bean));
+ addMatchedType(type, value, proposals, CDIImages.getImageDescriptorByElement(bean));
}
return proposals.toArray(new TextProposal[0]);
}
@@ -146,7 +146,7 @@
return (st > 0) ? value.substring(st) : value;
}
- private void addMatchedType(IType type, String value, List<TextProposal> proposals, Image image) {
+ private void addMatchedType(IType type, String value, List<TextProposal> proposals, ImageDescriptor image) {
String fullTypeName = type.getFullyQualifiedName();
if(fullTypeName.startsWith(value)) {
TextProposal proposal = new TextProposal();
@@ -155,7 +155,7 @@
// proposal.setLabel(fullTypeName);
proposal.setReplacementString(fullTypeName);
proposal.setPosition(fullTypeName.length());
- proposal.setImage(image);
+ proposal.setImageDescriptor(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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -19,13 +19,12 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
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;
import org.jboss.tools.cdi.core.IBeanMember;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IClassBean;
@@ -54,7 +53,7 @@
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImageForMember(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo)
*/
@Override
- public Image getELProposalImageForMember(MemberInfo memberInfo) {
+ public ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo) {
return (memberInfo instanceof TypeInfoCollector.FieldInfo)?CDIImages.BEAN_FIELD_IMAGE:CDIImages.BEAN_METHOD_IMAGE;
}
@@ -63,7 +62,7 @@
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImage(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberPresentation)
*/
@Override
- protected Image getELProposalImage(MemberPresentation memberPresentation) {
+ protected ImageDescriptor getELProposalImage(MemberPresentation memberPresentation) {
return memberPresentation.isProperty()?CDIImages.BEAN_FIELD_IMAGE:CDIImages.BEAN_METHOD_IMAGE;
}
@@ -73,7 +72,7 @@
*/
@Override
protected void setImage(TextProposal kbProposal, IBean var) {
- kbProposal.setImage(CDIImages.getImageByElement(var));
+ kbProposal.setImageDescriptor(CDIImages.getImageDescriptorByElement(var));
}
/* (non-Javadoc)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -22,9 +22,9 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
-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;
@@ -76,7 +76,7 @@
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImageForMember(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo)
*/
@Override
- public Image getELProposalImageForMember(MemberInfo memberInfo) {
+ public ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo) {
return CDIImages.MESSAGE_BUNDLE_IMAGE;
}
@@ -301,7 +301,7 @@
if(varName.startsWith(operand.getText())) {
TextProposal proposal = new TextProposal();
proposal.setReplacementString(varName.substring(operand.getLength()));
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
proposals.add(proposal);
}
}
@@ -324,7 +324,7 @@
proposal.setReplacementString(varName.substring(operand.getLength()));
proposal.setLabel(varName);
proposal.setPropertyName(null); // Since it's not a property
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
List<XModelObject> objects = new ArrayList<XModelObject>();
IBundleModel bundleModel = BundleModelFactory.getBundleModel(var.f.getProject());
@@ -343,7 +343,7 @@
TextProposal proposal = new TextProposal();
proposal.setReplacementString(varName);
proposal.setLabel(varName);
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
proposals.add(proposal);
}
resolution.getLastSegment().getVariables().add(var);
@@ -435,7 +435,7 @@
MessagesELTextProposal kbProposal = createProposal(mbr, key);
if (key.indexOf('.') == -1) kbProposal.setReplacementString(key.substring(filter.length()));
else kbProposal.setReplacementString('[' + kbProposal.getReplacementString());
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
kbProposals.add(kbProposal);
}
}
@@ -582,7 +582,7 @@
kbProposal.setLabel(proposal);
}
kbProposal.setAlternateMatch(proposal);
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
List<XModelObject> objects = new ArrayList<XModelObject>();
IBundleModel bundleModel = BundleModelFactory.getBundleModel(mbr.f.getProject());
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -169,17 +169,20 @@
}
}
+ @Override
protected Control createTitleMenuArea(Composite parent) {
Composite fViewMenuButtonComposite= (Composite) super.createTitleMenuArea(parent);
fFilterText = createFilterText(parent);
return fViewMenuButtonComposite;
}
+ @Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
newShell.setText(CDIExtensionsMessages.ASSIGNABLE_BEANS_DIALOG_TITLE);
}
+ @Override
protected Control createDialogArea(Composite parent) {
composite = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(2, false);
@@ -230,6 +233,7 @@
// PopupDialog
list.getTable().addMouseMoveListener(new MouseMoveListener() {
+ @Override
public void mouseMove(MouseEvent e) {
ViewerCell cell = list.getCell(new Point(e.x, e.y));
if(cell != null) {
@@ -242,6 +246,7 @@
}
});
list.getTable().addMouseListener(new MouseAdapter() {
+ @Override
public void mouseUp(MouseEvent e) {
gotoSelectedElement();
}
@@ -297,6 +302,7 @@
});
}
+ @Override
protected Control getFocusControl() {
return getFilterText();
}
@@ -315,6 +321,7 @@
fFilterText.setLayoutData(data);
fFilterText.addKeyListener(new KeyListener() {
+ @Override
public void keyPressed(KeyEvent e) {
if (e.keyCode == 0x0D) // return
gotoSelectedElement();
@@ -325,6 +332,7 @@
if (e.character == 0x1B) // ESC
close();
}
+ @Override
public void keyReleased(KeyEvent e) {
// do nothing
}
@@ -336,6 +344,7 @@
fFilterText.setText(""); //$NON-NLS-1$
fFilterText.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
list.refresh();
}
@@ -346,10 +355,12 @@
return AssignableBeansDialog.class.getName();
}
+ @Override
protected Point getDefaultSize() {
return new Point(700, 400);
}
+ @Override
protected Point getDefaultLocation(Point size) {
Display display = Display.getCurrent();
if(display == null) {
@@ -365,10 +376,13 @@
}
// PopupDialog
+ @Override
protected void fillDialogMenu(IMenuManager dialogMenu) {
super.fillDialogMenu(dialogMenu);
dialogMenu.add(new ShowHideAction());
}
+
+ @Override
protected IDialogSettings getDialogSettings() {
IDialogSettings settings = CDIExtensionsPlugin.getDefault().getDialogSettings().getSection(getId());
if(settings == null && filters != null && injectionPoint != null) {
@@ -381,6 +395,7 @@
return settings;
}
+ @Override
public boolean close() {
saveFilterOptions();
return super.close();
@@ -435,6 +450,7 @@
super("Show/Hide panel", Action.AS_CHECK_BOX);
setChecked(showHideOptions);
}
+ @Override
public void run() {
setFiltersEnabled(isChecked());
}
@@ -587,6 +603,7 @@
this.bold = bold;
}
+ @Override
public void applyStyles(TextStyle textStyle) {
if (foreground != null) {
textStyle.foreground = foreground;
@@ -601,6 +618,7 @@
}
class LP extends StyledCellLabelProvider implements DelegatingStyledCellLabelProvider.IStyledLabelProvider {
+ @Override
public void update(ViewerCell cell) {
ELIGIBLE_QUALIFIER = DISABLED;
Object element = cell.getElement();
@@ -615,6 +633,8 @@
public String getText(Object element) {
return getStyledText(element).getString();
}
+
+ @Override
public StyledString getStyledText(Object element) {
IBean b = (IBean)element;
RESOLVED_NAME = new DefaultStyler(black, true, false);
@@ -636,8 +656,9 @@
return sb;
}
+ @Override
public Image getImage(Object element) {
return CDIImages.getImageByElement((ICDIElement)element);
}
}
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -32,6 +32,7 @@
super(parent, title, shellStyle, tableStyle, hyperlinks);
}
+ @Override
protected BeanTableLabelProvider createTableLableProvider() {
return new BeanTableLabelProvider2();
}
@@ -40,7 +41,8 @@
protected String getId() {
return "org.jboss.tools.cdi.text.ext.InformationControl";
}
-
+
+ @Override
protected boolean select2(SearchPattern patternMatcher, Object element) {
if (element instanceof IInformationItem) {
String name = ((IInformationItem)element).getCDIElement().getElementName();
@@ -55,6 +57,7 @@
}
class BeanTableLabelProvider2 extends BeanTableLabelProvider {
+ @Override
public void update(ViewerCell cell) {
Object element = cell.getElement();
StyledString styledString = getStyledText(element);
@@ -65,9 +68,12 @@
super.update(cell);
}
+ @Override
public String getText(Object element) {
return getStyledText(element).getString();
}
+
+ @Override
public StyledString getStyledText(Object element) {
StyledString sb = new StyledString();
if(element instanceof IHyperlink){
@@ -84,6 +90,7 @@
return sb;
}
+ @Override
public Image getImage(Object element) {
if(element instanceof IInformationItem){
ICDIElement cdiElement = ((IInformationItem)element).getCDIElement();
@@ -92,5 +99,4 @@
return null;
}
}
-}
-
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -11,8 +11,6 @@
package org.jboss.tools.cdi.ui.ca;
import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.jdom.IDOMNode;
-import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
@@ -29,6 +27,7 @@
import org.jboss.tools.cdi.internal.core.ca.BeansXmlProcessor;
import org.jboss.tools.common.el.core.resolver.ELContext;
import org.jboss.tools.common.text.TextProposal;
+import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
import org.jboss.tools.jst.jsp.contentassist.computers.XmlTagCompletionProposalComputer;
import org.jboss.tools.jst.web.kb.KbQuery;
@@ -106,7 +105,7 @@
int replacementOffset = contentAssistRequest.getReplacementBeginPosition() - matchString.length();
int replacementLength = matchString.length();
int cursorPosition = getCursorPositionForProposedText(replacementString);
- Image image = textProposal.getImage();
+ Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
if (image == null) {
image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
}
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -79,9 +79,8 @@
return change;
}
-
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_ADD;
+ return CDIImages.getImage(CDIImages.QUICKFIX_ADD);
}
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -91,7 +91,6 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_ADD;
+ return CDIImages.getImage(CDIImages.QUICKFIX_ADD);
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddNameMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddNameMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddNameMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -24,6 +24,6 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_ADD;
+ return CDIImages.getImage(CDIImages.QUICKFIX_ADD);
}
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -50,9 +50,9 @@
}
return change;
}
-
+
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_ADD;
+ return CDIImages.getImage(CDIImages.QUICKFIX_ADD);
}
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -29,9 +29,9 @@
*/
public class AddSerializableInterfaceMarkerResolution extends BaseMarkerResolution {
public static final String SERIALIZABLE = "java.io.Serializable"; //$NON-NLS-1$
-
+
private IType type;
-
+
public AddSerializableInterfaceMarkerResolution(IType type){
super(type.getCompilationUnit());
this.label = MessageFormat.format(CDIUIMessages.ADD_SERIALIZABLE_INTERFACE_MARKER_RESOLUTION_TITLE, new Object[]{type.getElementName()});
@@ -42,22 +42,21 @@
@Override
protected CompilationUnitChange getChange(ICompilationUnit compilationUnit){
CompilationUnitChange change = new CompilationUnitChange("", compilationUnit);
-
+
MultiTextEdit edit = new MultiTextEdit();
-
+
change.setEdit(edit);
try{
CDIMarkerResolutionUtils.addInterfaceToClass(compilationUnit, type, SERIALIZABLE, edit);
} catch (JavaModelException e) {
CDIUIPlugin.getDefault().logError(e);
}
-
+
return change;
}
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_ADD;
+ return CDIImages.getImage(CDIImages.QUICKFIX_ADD);
}
-
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -60,9 +60,9 @@
return change;
}
-
+
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_ADD;
+ return CDIImages.getImage(CDIImages.QUICKFIX_ADD);
}
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -107,6 +107,6 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_CHANGE;
+ return CDIImages.getImage(CDIImages.QUICKFIX_CHANGE);
}
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -123,7 +123,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_EDIT;
+ return CDIImages.getImage(CDIImages.QUICKFIX_EDIT);
}
@Override
@@ -155,6 +155,4 @@
public IContextInformation getContextInformation() {
return null;
}
-
-
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -114,7 +114,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_REMOVE;
+ return CDIImages.getImage(CDIImages.QUICKFIX_REMOVE);
}
@Override
@@ -146,5 +146,4 @@
public IContextInformation getContextInformation() {
return null;
}
-
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -123,7 +123,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_REMOVE;
+ return CDIImages.getImage(CDIImages.QUICKFIX_REMOVE);
}
@Override
@@ -155,5 +155,4 @@
public IContextInformation getContextInformation() {
return null;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllOtherAnnotationsFromParametersMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllOtherAnnotationsFromParametersMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllOtherAnnotationsFromParametersMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -112,7 +112,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_REMOVE;
+ return CDIImages.getImage(CDIImages.QUICKFIX_REMOVE);
}
@Override
@@ -144,5 +144,4 @@
public IContextInformation getContextInformation() {
return null;
}
-
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -80,6 +80,6 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_REMOVE;
+ return CDIImages.getImage(CDIImages.QUICKFIX_REMOVE);
}
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -116,7 +116,6 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_EDIT;
+ return CDIImages.getImage(CDIImages.QUICKFIX_EDIT);
}
-
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -162,7 +162,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_EDIT;
+ return CDIImages.getImage(CDIImages.QUICKFIX_EDIT);
}
@Override
@@ -194,4 +194,4 @@
public IContextInformation getContextInformation() {
return null;
}
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -83,7 +83,6 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_EDIT;
+ return CDIImages.getImage(CDIImages.QUICKFIX_EDIT);
}
-
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -36,7 +36,7 @@
private IInjectionPoint injectionPoint;
private List<IBean> beans;
private IBean selectedBean;
-
+
public MakeInjectedPointUnambiguousMarkerResolution(IInjectionPoint injectionPoint, List<IBean> beans, int index){
this.injectionPoint = injectionPoint;
this.beans = beans;
@@ -48,12 +48,12 @@
public String getLabel() {
return label;
}
-
+
@Override
public void runForTest(IMarker marker){
internal_run(true);
}
-
+
@Override
public void run(IMarker marker) {
internal_run(false);
@@ -65,7 +65,7 @@
AddQualifiersToBeanWizard wizard = new AddQualifiersToBeanWizard(refactoring);
wizard.showWizard();
}
-
+
@Override
public String getDescription() {
return label;
@@ -73,7 +73,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_EDIT;
+ return CDIImages.getImage(CDIImages.QUICKFIX_EDIT);
}
@Override
@@ -105,5 +105,4 @@
public IContextInformation getContextInformation() {
return null;
}
-
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -163,7 +163,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_ADD;
+ return CDIImages.getImage(CDIImages.QUICKFIX_ADD);
}
@Override
@@ -195,5 +195,4 @@
public IContextInformation getContextInformation() {
return null;
}
-
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -34,7 +34,7 @@
*/
public class MakeMethodPublicMarkerResolution extends BaseMarkerResolution {
private IMethod method;
-
+
public MakeMethodPublicMarkerResolution(IMethod method){
super(CDIMarkerResolutionUtils.getJavaMember(method).getCompilationUnit());
this.label = MessageFormat.format(CDIUIMessages.MAKE_METHOD_PUBLIC_MARKER_RESOLUTION_TITLE, new Object[]{method.getElementName()});
@@ -45,20 +45,20 @@
@Override
protected CompilationUnitChange getChange(ICompilationUnit compilationUnit){
CompilationUnitChange change = new CompilationUnitChange("", compilationUnit);
-
+
MultiTextEdit edit = new MultiTextEdit();
-
+
change.setEdit(edit);
-
+
try{
IBuffer buffer = compilationUnit.getBuffer();
-
+
IMethod workingCopyMethod = CDIMarkerResolutionUtils.findWorkingCopy(compilationUnit, method);
if(workingCopyMethod != null){
int flag = workingCopyMethod.getFlags();
-
+
String text = buffer.getText(workingCopyMethod.getSourceRange().getOffset(), workingCopyMethod.getSourceRange().getLength());
-
+
// make method public
int position = workingCopyMethod.getSourceRange().getOffset();
if(!Flags.isPublic(flag)){
@@ -83,9 +83,9 @@
}
return change;
}
-
+
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_EDIT;
+ return CDIImages.getImage(CDIImages.QUICKFIX_EDIT);
}
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -34,7 +34,7 @@
private String label;
private IInjectionPoint injectionPoint;
private List<IBean> beans;
-
+
public SelectBeanMarkerResolution(IInjectionPoint injectionPoint, List<IBean> beans){
this.injectionPoint = injectionPoint;
this.label = CDIUIMessages.SELECT_BEAN_TITLE;
@@ -50,7 +50,7 @@
public void runForTest(IMarker marker){
internal_run(true);
}
-
+
@Override
public void run(IMarker marker) {
internal_run(false);
@@ -62,7 +62,7 @@
SelectBeanWizard wizard = new SelectBeanWizard(refactoring);
wizard.showWizard();
}
-
+
@Override
public String getDescription() {
return label;
@@ -70,7 +70,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_EDIT;
+ return CDIImages.getImage(CDIImages.QUICKFIX_EDIT);
}
@Override
@@ -102,4 +102,4 @@
public IContextInformation getContextInformation() {
return null;
}
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -178,7 +178,7 @@
if(element instanceof CDIElementWrapper){
return CDIImages.getImageByElement(((CDIElementWrapper)element).getCDIElement());
}
- return CDIImages.WELD_IMAGE;
+ return CDIImages.getImage(CDIImages.WELD_IMAGE);
}
@Override
@@ -193,9 +193,6 @@
return text+cdiElement.getElementName()+BeanPresentationUtil.getCDIElementLocation(cdiElement, false);
}
return ""; //$NON-NLS-1$
-
}
-
}
-
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -19,13 +19,15 @@
public class InjectionPointLabelProvider implements ILabelProvider {
+ @Override
public Image getImage(Object element) {
if(element instanceof CDIElementWrapper){
return CDIImages.getImageByElement(((CDIElementWrapper)element).getCDIElement());
}
- return CDIImages.WELD_IMAGE;
+ return CDIImages.getImage(CDIImages.WELD_IMAGE);
}
+ @Override
public String getText(Object element) {
if(element instanceof CDIElementWrapper){
ICDIElement cdiElement = ((CDIElementWrapper)element).getCDIElement();
@@ -39,16 +41,20 @@
return ""; //$NON-NLS-1$
}
+ @Override
public void addListener(ILabelProviderListener listener) {
}
+ @Override
public void dispose() {
}
+ @Override
public boolean isLabelProperty(Object element, String property) {
return false;
}
+ @Override
public void removeListener(ILabelProviderListener listener) {
}
-}
+}
\ No newline at end of file
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 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -29,8 +29,8 @@
}
}
- 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 final ImageDescriptor BEAN_CLASS_IMAGE = getImageDescriptor("bean_class.png"); //$NON-NLS-1$
+ public static final ImageDescriptor ANNOTATION_IMAGE = getImageDescriptor("annotation.png"); //$NON-NLS-1$
public static Image getImage(String key) {
return INSTANCE.createImageDescriptor(key).createImage();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -12,7 +12,7 @@
import junit.framework.TestCase;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.cdi.core.CDIImages;
import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.internal.core.impl.BeanField;
@@ -32,7 +32,7 @@
public void checkImageForCDIElement(ICDIElement element){
assertNotNull("CDI Element must be not null", element);
- Image image = CDIImages.getImageByElement(element);
+ ImageDescriptor image = CDIImages.getImageDescriptorByElement(element);
assertNotNull("Icon image for CDI element - "+element.getClass()+" not loaded", image);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -13,10 +13,10 @@
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.cdi.core.CDIImages;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
+import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
/**
@@ -28,9 +28,10 @@
private ContentAssistantTestCase caTest = new ContentAssistantTestCase();
private static final String PAGE_NAME = "WebContent/test.jsp";
private String[] beanProposals = new String[] {"example", "example.com", "fishJBT", "game", "haddock", "salmon", "sheep", "tunaFarm", "whitefishJBT", "wolf"};
- private Image[] beanImages = new Image[] {CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE};
+ Image beanClassImage = CommonUIPlugin.getImageDescriptorRegistry().get(CDIImages.BEAN_CLASS_IMAGE);
+ private Image[] beanImages = new Image[] {beanClassImage, beanClassImage, beanClassImage, beanClassImage, beanClassImage, beanClassImage, beanClassImage, beanClassImage, beanClassImage, beanClassImage};
private String[] propertyProposals = new String[] {"game.value", "game.initialize()"};
- private Image[] propertyImages = new Image[] {CDIImages.BEAN_FIELD_IMAGE, CDIImages.BEAN_METHOD_IMAGE};
+ private Image[] propertyImages = new Image[] {CommonUIPlugin.getImageDescriptorRegistry().get(CDIImages.BEAN_FIELD_IMAGE), CommonUIPlugin.getImageDescriptorRegistry().get(CDIImages.BEAN_METHOD_IMAGE)};
public void setUp() {
project = TCKTest.findTestProject();
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/TextProposal.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/TextProposal.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/TextProposal.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -12,7 +12,7 @@
import java.util.Comparator;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
/**
* Text Proposal for Content Assist.
@@ -39,7 +39,7 @@
private Object source;
private String label;
private String contextInfo;
- private Image image;
+ private ImageDescriptor imageDescriptor;
private boolean emptyImage = true;
private String replacementString;
private String alternateMatch = null;
@@ -65,7 +65,7 @@
newObject.source = this.source;
newObject.label = this.label;
newObject.contextInfo = this.contextInfo;
- newObject.image = this.image;
+ newObject.imageDescriptor = this.imageDescriptor;
newObject.emptyImage = this.emptyImage;
newObject.replacementString = this.replacementString;
newObject.emptyContextInfo = this.emptyContextInfo;
@@ -121,10 +121,11 @@
/**
* @return
*/
- public Image getImage() {
- return image;
+ public ImageDescriptor getImageDescriptor() {
+ return imageDescriptor;
}
+// CommonUIPlugin.getImageDescriptorRegistry().get
/**
* @return
*/
@@ -164,9 +165,9 @@
/**
* @param string
*/
- public void setImage(Image img) {
- this.image = img;
- if(this.image != null) {
+ public void setImageDescriptor(ImageDescriptor img) {
+ this.imageDescriptor = img;
+ if(this.imageDescriptor != null) {
emptyImage = false;
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -24,9 +24,9 @@
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.Signature;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.ELReference;
import org.jboss.tools.common.el.core.model.ELArgument;
@@ -75,13 +75,13 @@
public AbstractELCompletionEngine() {}
- protected abstract Image getELProposalImageForMember(MemberInfo memberInfo);
+ protected abstract ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo);
protected abstract void log(Exception e);
private static ELParserFactory defaultFactory = ELParserUtil.getJbossFactory();
- protected Image getELProposalImage(MemberPresentation memberPresentation) {
+ protected ImageDescriptor getELProposalImage(MemberPresentation memberPresentation) {
return getELProposalImageForMember(memberPresentation!=null?memberPresentation.getMember():null);
}
@@ -396,7 +396,7 @@
proposal.setLabel(v.getName());
proposal.setReplacementString(varNameProposal);
proposal.setLabel(v.getName());
- proposal.setImage(getELProposalImageForMember(memberInfo));
+ proposal.setImageDescriptor(getELProposalImageForMember(memberInfo));
proposal.setType(typeName);
proposal.setSourceType(sourceTypeName);
if (jmSegment != null) {
@@ -835,7 +835,7 @@
ELTextProposal proposal = new ELTextProposal();
proposal.setReplacementString(presentationString);
proposal.setLabel(presentationDisplayName);
- proposal.setImage(getELProposalImage(presentation));
+ proposal.setImageDescriptor(getELProposalImage(presentation));
proposal.setType(typeName);
proposal.setSourceType(sourceTypeName);
for (MemberInfo mi : presentation.getAllMembers()) {
@@ -881,7 +881,7 @@
ELTextProposal proposal = new ELTextProposal();
proposal.setReplacementString(presentationString);
proposal.setLabel(presentationDisplayName);
- proposal.setImage(getELProposalImage(presentation));
+ proposal.setImageDescriptor(getELProposalImage(presentation));
proposal.setType(typeName);
proposal.setSourceType(sourceTypeName);
for (MemberInfo mi : presentation.getAllMembers()) {
@@ -986,7 +986,7 @@
ELTextProposal kbProposal = new ELTextProposal();
kbProposal.setReplacementString(proposal.getPresentation().substring(filter.length()));
kbProposal.setLabel(proposal.getPresentationDisplayName());
- kbProposal.setImage(getELProposalImageForMember(proposal.getMember()));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(proposal.getMember()));
kbProposal.setType(typeName);
kbProposal.setSourceType(sourceTypeName);
for (MemberInfo mi : proposal.getAllMembers()) {
@@ -1122,7 +1122,7 @@
kbProposal.setReplacementString(replacementString);
kbProposal.setLabel(proposal.getPresentationDisplayName());
- kbProposal.setImage(getELProposalImageForMember(member));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(member));
kbProposal.setType(typeName);
kbProposal.setSourceType(sourceTypeName);
for (MemberInfo mi : proposal.getAllMembers()) {
@@ -1152,11 +1152,11 @@
}
protected void setImage(TextProposal kbProposal, TypeInfoCollector.MemberPresentation proposal) {
- kbProposal.setImage(getELProposalImage(proposal));
+ kbProposal.setImageDescriptor(getELProposalImage(proposal));
}
protected void setImage(TextProposal kbProposal, V var) {
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
}
/**
Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -71,6 +71,7 @@
import org.jboss.tools.common.model.filesystems.impl.JarSystemImpl;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.common.util.EclipseUIUtil;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -612,8 +613,7 @@
for (TextProposal kbProposal : uniqueSuggestions) {
String string = kbProposal.getReplacementString();
- Image image = kbProposal.hasImage() ? kbProposal.getImage()
- : getImage();
+ Image image = kbProposal.hasImage() ? CommonUIPlugin.getImageDescriptorRegistry().get(kbProposal.getImageDescriptor()):getImage();
if (string.length() >= 0) {
string = proposalPrefix + string;
if (string.length() > 0 && ('#' == string.charAt(0) || '$' == string.charAt(0)))
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/HierarchyInformationControl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -114,7 +114,7 @@
protected String getId() {
return "org.jboss.tools.cdi.text.ext.InformationControl";
}
-
+
public static class BeanTableContentProvider implements IStructuredContentProvider{
private IHyperlink[] hyperlinks;
@@ -134,9 +134,8 @@
public Object[] getElements(Object inputElement) {
return hyperlinks;
}
+ }
- }
-
protected boolean select2(SearchPattern patternMatcher, Object element) {
return true;
}
@@ -147,11 +146,11 @@
return true;
}
+ @Override
public boolean select(Viewer viewer, Object parentElement,
Object element) {
return select2(patternMatcher, element);
}
-
}
protected static Color gray = new Color(null, 128, 128, 128);
@@ -159,7 +158,7 @@
protected static Styler NAME_STYLE = new DefaultStyler(black, false);
protected static Styler PACKAGE_STYLE = new DefaultStyler(gray, false);
-
+
private static class DefaultStyler extends Styler {
private final Color foreground;
private final boolean italic;
@@ -169,6 +168,7 @@
this.italic = italic;
}
+ @Override
public void applyStyles(TextStyle textStyle) {
if (foreground != null) {
textStyle.foreground = foreground;
@@ -178,8 +178,9 @@
}
}
}
-
+
protected class BeanTableLabelProvider extends StyledCellLabelProvider implements DelegatingStyledCellLabelProvider.IStyledLabelProvider {
+ @Override
public void update(ViewerCell cell) {
Object element = cell.getElement();
StyledString styledString = getStyledText(element);
@@ -193,6 +194,8 @@
public String getText(Object element) {
return getStyledText(element).getString();
}
+
+ @Override
public StyledString getStyledText(Object element) {
StyledString sb = new StyledString();
if(element instanceof IHyperlink){
@@ -201,9 +204,9 @@
return sb;
}
+ @Override
public Image getImage(Object element) {
return null;
}
}
}
-
Modified: trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2012-07-23 22:33:19 UTC (rev 42679)
@@ -44,7 +44,8 @@
org.jboss.tools.common.ui.ssh,
org.jboss.tools.common.ui.widget.editor,
org.jboss.tools.common.ui.widget.field,
- org.jboss.tools.common.ui.wizard
+ org.jboss.tools.common.ui.wizard,
+ org.jboss.tools.common.ui.xpl
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIPlugin.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIPlugin.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIPlugin.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -12,6 +12,7 @@
package org.jboss.tools.common.ui;
import org.jboss.tools.common.log.BaseUIPlugin;
+import org.jboss.tools.common.ui.xpl.ImageDescriptorRegistry;
import org.osgi.framework.BundleContext;
/**
@@ -24,7 +25,9 @@
// The shared instance
private static CommonUIPlugin plugin;
-
+
+ private ImageDescriptorRegistry fImageDescriptorRegistry;
+
/**
* The constructor
*/
@@ -32,6 +35,17 @@
plugin = this;
}
+ public static ImageDescriptorRegistry getImageDescriptorRegistry() {
+ return getDefault().internalGetImageDescriptorRegistry();
+ }
+
+ private synchronized ImageDescriptorRegistry internalGetImageDescriptorRegistry() {
+ if (fImageDescriptorRegistry == null) {
+ fImageDescriptorRegistry= new ImageDescriptorRegistry();
+ }
+ return fImageDescriptorRegistry;
+ }
+
/*
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
Added: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/xpl/ImageDescriptorRegistry.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/xpl/ImageDescriptorRegistry.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/xpl/ImageDescriptorRegistry.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.jboss.tools.common.ui.xpl;
+
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * A registry that maps <code>ImageDescriptors</code> to <code>Image</code>.
+ */
+public class ImageDescriptorRegistry {
+
+ private HashMap<ImageDescriptor, Image> fRegistry= new HashMap<ImageDescriptor, Image>(10);
+ private Display fDisplay;
+
+ /**
+ * Creates a new image descriptor registry for the given display. All images
+ * managed by this registry will be disposed when the display gets disposed.
+ */
+ public ImageDescriptorRegistry() {
+ fDisplay= PlatformUI.getWorkbench().getDisplay();
+ Assert.isNotNull(fDisplay);
+ hookDisplay();
+ }
+
+ /**
+ * Returns the image associated with the given image descriptor.
+ *
+ * @param descriptor the image descriptor for which the registry manages an image,
+ * or <code>null</code> for a missing image descriptor
+ * @return the image associated with the image descriptor or <code>null</code>
+ * if the image descriptor can't create the requested image.
+ */
+ public Image get(ImageDescriptor descriptor) {
+ if (descriptor == null)
+ descriptor= ImageDescriptor.getMissingImageDescriptor();
+
+ Image result= fRegistry.get(descriptor);
+ if (result != null)
+ return result;
+
+ result= descriptor.createImage();
+ if (result != null)
+ fRegistry.put(descriptor, result);
+ return result;
+ }
+
+ /**
+ * Disposes all images managed by this registry.
+ */
+ public void dispose() {
+ for (Iterator<Image> iter= fRegistry.values().iterator(); iter.hasNext(); ) {
+ Image image= iter.next();
+ image.dispose();
+ }
+ fRegistry.clear();
+ }
+
+ private void hookDisplay() {
+ fDisplay.disposeExec(new Runnable() {
+ public void run() {
+ dispose();
+ }
+ });
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/xpl/ImageDescriptorRegistry.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/el/JSF2ElResolver.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/el/JSF2ElResolver.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/el/JSF2ElResolver.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -16,7 +16,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
import org.jboss.tools.common.el.core.parser.ELParserFactory;
@@ -36,15 +36,15 @@
private static ELParserFactory factory = ELParserUtil.getJbossFactory();
- public static final Image JSF_EL_PROPOSAL_IMAGE =
- JSFModelPlugin.getDefault().getImage(JSFModelPlugin.CA_JSF_EL_IMAGE_PATH);
+ public static final ImageDescriptor JSF_EL_PROPOSAL_IMAGE =
+ JSFModelPlugin.getDefault().getImageDescriptorFromRegistry(JSFModelPlugin.CA_JSF_EL_IMAGE_PATH);
/*
* (non-Javadoc)
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImageForMember(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo)
*/
@Override
- public Image getELProposalImageForMember(MemberInfo memberInfo) {
+ public ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo) {
return JSF_EL_PROPOSAL_IMAGE;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -23,6 +23,7 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.swt.graphics.Image;
@@ -64,14 +65,14 @@
*
*/
public class JSF2CCAttrsELCompletionEngine extends AbstractELCompletionEngine<IVariable> {
- private static final Image JSF2_EL_CC_ATTRS_PROPOSAL_IMAGE = JSFModelPlugin.getDefault().getImage(JSFModelPlugin.CA_JSF_MESSAGES_IMAGE_PATH);
+ private static final ImageDescriptor JSF2_EL_CC_ATTRS_PROPOSAL_IMAGE = JSFModelPlugin.getDefault().getImageDescriptorFromRegistry(JSFModelPlugin.CA_JSF_MESSAGES_IMAGE_PATH);
/*
* (non-Javadoc)
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImageForMember(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo)
*/
@Override
- public Image getELProposalImageForMember(MemberInfo memberInfo) {
+ public ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo) {
return JSF2_EL_CC_ATTRS_PROPOSAL_IMAGE;
}
@@ -226,7 +227,7 @@
if(varName.startsWith(operand.getText())) {
TextProposal proposal = new TextProposal();
proposal.setReplacementString(varName.substring(operand.getLength()));
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
proposals.add(proposal);
}
}
@@ -250,13 +251,13 @@
TextProposal proposal = new TextProposal();
proposal.setReplacementString(varName.substring(operand.getLength()));
proposal.setLabel(varName);
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
proposals.add(proposal);
} else if(returnEqualedVariablesOnly) {
TextProposal proposal = new TextProposal();
proposal.setReplacementString(varName);
proposal.setLabel(varName);
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
proposals.add(proposal);
}
segment.getVariables().add(var);
@@ -453,7 +454,7 @@
TextProposal kbProposal = new TextProposal();
kbProposal.setReplacementString(proposal);
kbProposal.setLabel(proposal);
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
kbProposals.add(kbProposal);
@@ -464,7 +465,7 @@
TextProposal kbProposal = new TextProposal();
kbProposal.setReplacementString(proposal.substring(filter.length()));
kbProposal.setLabel(proposal);
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
kbProposals.add(kbProposal);
}
@@ -505,7 +506,7 @@
TextProposal kbProposal = new TextProposal();
kbProposal.setReplacementString(proposal);
kbProposal.setLabel(proposal);
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
kbProposals.add(kbProposal);
@@ -522,7 +523,7 @@
kbProposal.setReplacementString(replacementString);
kbProposal.setLabel(proposal);
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
kbProposals.add(kbProposal);
}
@@ -547,14 +548,14 @@
TextProposal proposal = new TextProposal();
proposal.setReplacementString("['" + key + "']"); //$NON-NLS-1$ //$NON-NLS-2$
proposal.setLabel("['" + key + "']");
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
kbProposals.add(proposal);
} else {
TextProposal proposal = new TextProposal();
proposal.setReplacementString(key);
proposal.setLabel(key);
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
kbProposals.add(proposal);
}
@@ -705,4 +706,4 @@
}
return null;
}
-}
+}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFELCompletionEngine.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFELCompletionEngine.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -19,7 +19,7 @@
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
import org.jboss.tools.common.el.core.parser.ELParserFactory;
@@ -40,7 +40,7 @@
*/
public class JSFELCompletionEngine extends AbstractELCompletionEngine<JSFELCompletionEngine.IJSFVariable> {
- private static final Image JSF_EL_PROPOSAL_IMAGE = JSFModelPlugin.getDefault().getImage(JSFModelPlugin.CA_JSF_EL_IMAGE_PATH);
+ private static final ImageDescriptor JSF_EL_PROPOSAL_IMAGE = JSFModelPlugin.getDefault().getImageDescriptorFromRegistry(JSFModelPlugin.CA_JSF_EL_IMAGE_PATH);
private static ELParserFactory factory = ELParserUtil.getDefaultFactory();
/*
@@ -48,7 +48,7 @@
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImageForMember(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo)
*/
@Override
- public Image getELProposalImageForMember(MemberInfo memberInfo) {
+ public ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo) {
return JSF_EL_PROPOSAL_IMAGE;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -23,7 +23,6 @@
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.Signature;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
import org.jboss.tools.common.el.core.resolver.ELContext;
@@ -31,7 +30,6 @@
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.ArtificialTypeInfo;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jst.web.kb.PageContextFactory;
import org.jboss.tools.jst.web.kb.internal.XmlContextImpl;
@@ -42,16 +40,7 @@
import org.jboss.tools.jst.web.kb.taglib.TagLibraryManager;
public class JSFFuncsELCompletionEngine extends JSFELCompletionEngine {
- private static final Image JSF_EL_PROPOSAL_IMAGE = JSFModelPlugin.getDefault().getImage(JSFModelPlugin.CA_JSF_EL_IMAGE_PATH);
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImage()
- */
- public Image getELProposalImage() {
- return JSF_EL_PROPOSAL_IMAGE;
- }
-
public JSFFuncsELCompletionEngine() {}
/*
@@ -142,10 +131,6 @@
return result;
}
- protected void setImage(TextProposal kbProposal) {
- kbProposal.setImage(getELProposalImage());
- }
-
static class Variable implements IJSFVariable {
IFile f;
String name;
@@ -164,6 +149,7 @@
this.funcResolvedMethod = null;
}
+ @Override
public String getName() {
return name;
}
@@ -253,9 +239,10 @@
return result;
}
+ @Override
public IMember getSourceMember() {
getKeys(); // Initialize source member
return funcSourceMember;
}
}
-}
+}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -20,9 +20,9 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine;
import org.jboss.tools.common.el.core.ca.MessagesELTextProposal;
import org.jboss.tools.common.el.core.model.ELArgumentInvocation;
@@ -64,14 +64,14 @@
import org.w3c.dom.Node;
public class JSFMessageELCompletionEngine extends AbstractELCompletionEngine<IVariable> {
- private static final Image JSF_EL_MESSAGES_PROPOSAL_IMAGE = JSFModelPlugin.getDefault().getImage(JSFModelPlugin.CA_JSF_MESSAGES_IMAGE_PATH);
+ private static final ImageDescriptor JSF_EL_MESSAGES_PROPOSAL_IMAGE = JSFModelPlugin.getDefault().getImageDescriptorFromRegistry(JSFModelPlugin.CA_JSF_MESSAGES_IMAGE_PATH);
/*
* (non-Javadoc)
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImageForMember(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo)
*/
@Override
- public Image getELProposalImageForMember(MemberInfo memberInfo) {
+ public ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo) {
return JSF_EL_MESSAGES_PROPOSAL_IMAGE;
}
@@ -262,7 +262,7 @@
if(varName.startsWith(operand.getText())) {
MessagesELTextProposal proposal = new MessagesELTextProposal();
proposal.setReplacementString(varName.substring(operand.getLength()));
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
List<XModelObject> objects = new ArrayList<XModelObject>();
@@ -307,7 +307,7 @@
MessagesELTextProposal proposal = new MessagesELTextProposal();
proposal.setReplacementString(varName.substring(operand.getLength()));
proposal.setLabel(varName);
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
List<XModelObject> objects = new ArrayList<XModelObject>();
IModelNature n = EclipseResourceUtil.getModelNature(var.f.getProject());
XModel model = n != null ? n.getModel() : null;
@@ -335,7 +335,7 @@
TextProposal proposal = new TextProposal();
proposal.setReplacementString(varName);
proposal.setLabel(varName);
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
proposals.add(proposal);
}
resolution.getLastSegment().getVariables().add(var);
@@ -637,7 +637,7 @@
kbProposal.setLabel(proposal);
}
kbProposal.setAlternateMatch(proposal);
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
List<XModelObject> objects = new ArrayList<XModelObject>();
String locale = getPageLocale(mbr.f, currentOffset);
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2012-07-23 22:33:19 UTC (rev 42679)
@@ -57,7 +57,8 @@
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.jst.standard.schemas;bundle-version="1.2.0",
org.eclipse.wst.standard.schemas;bundle-version="1.0.300",
- org.jboss.tools.common.el.ui
+ org.jboss.tools.common.el.ui,
+ org.jboss.tools.common.ui
Bundle-Version: 3.4.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -18,11 +18,6 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.jface.fieldassist.IContentProposal;
import org.eclipse.jface.fieldassist.IContentProposalProvider;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.sse.ui.internal.contentassist.IRelevanceCompletionProposal;
import org.eclipse.wst.sse.ui.internal.util.Sorter;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.jboss.tools.common.el.core.model.ELInstance;
@@ -33,18 +28,16 @@
import org.jboss.tools.common.el.core.parser.ELParserUtil;
import org.jboss.tools.common.el.core.resolver.ELResolver;
import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager;
-import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.jsp.contentassist.computers.AbstractXmlCompletionProposalComputer.TextRegion;
import org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.messages.JstUIMessages;
import org.jboss.tools.jst.jsp.outline.ValueHelper;
import org.jboss.tools.jst.jsp.util.Constants;
import org.jboss.tools.jst.web.kb.IPageContext;
import org.jboss.tools.jst.web.kb.KbQuery;
-import org.jboss.tools.jst.web.kb.PageProcessor;
import org.jboss.tools.jst.web.kb.KbQuery.Type;
+import org.jboss.tools.jst.web.kb.PageProcessor;
import org.w3c.dom.Node;
/**
@@ -115,8 +108,6 @@
if(proposals != null) for (TextProposal textProposal: proposals) {
String displayString = textProposal.getReplacementString();
int cursorPosition = /*replacementOffset + */ textProposal.getReplacementString().length();
-
- Image image = textProposal.getImage();
String relacementString = textProposal.getReplacementString();
if(textProposal.getStart() >= 0 && textProposal.getEnd() >= 0) {
int b = textProposal.getStart();
@@ -145,8 +136,6 @@
}
String matchString = "#{" + prefix.getText(); //$NON-NLS-1$
String query = matchString;
- if (query == null)
- query = ""; //$NON-NLS-1$
String stringQuery = matchString;
int beginChangeOffset = prefix.getStartOffset() + prefix.getOffset();
@@ -155,7 +144,6 @@
TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, pageContext);
if(proposals != null) for (TextProposal textProposal: proposals) {
- int replacementOffset = beginChangeOffset;
int replacementLength = prefix.getLength();
String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
int cursorPosition = /*replacementOffset + */ textProposal.getReplacementString().length();
@@ -164,8 +152,6 @@
textProposal.setReplacementString(textProposal.getReplacementString() + "}"); //$NON-NLS-1$
}
- Image image = textProposal.getImage();
-
// IContextInformation contextInformation = null;
// String additionalProposalInfo = textProposal.getContextInfo();
// int relevance = textProposal.getRelevance() + 10000;
@@ -285,8 +271,6 @@
return null;
}
- String matchString = text.substring(0, inValueOffset);
-
ELParser p = ELParserUtil.getJbossFactory().createParser();
ELModel model = p.parse(text);
@@ -348,5 +332,4 @@
result1[result.length] = v;
return result1;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -53,6 +53,7 @@
import org.jboss.tools.common.el.core.resolver.ELResolver;
import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager;
import org.jboss.tools.common.text.TextProposal;
+import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
import org.jboss.tools.jst.jsp.contentassist.AutoELContentAssistantProposal;
@@ -275,7 +276,7 @@
replacementString += String.valueOf(quoteChar);
}
- Image image = textProposal.getImage();
+ Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
// JBIDE-512, JBIDE-2541 related changes ===>>>
// String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
@@ -416,7 +417,7 @@
}
}
- Image image = textProposal.getImage();
+ Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
// JBIDE-512, JBIDE-2541 related changes ===>>>
// String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
@@ -510,7 +511,7 @@
replacementString += String.valueOf(quoteChar);
}
- Image image = textProposal.getImage();
+ Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
// JBIDE-512, JBIDE-2541 related changes ===>>>
// String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -44,6 +44,7 @@
import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
import org.jboss.tools.jst.web.kb.IPageContext;
import org.jboss.tools.jst.web.kb.KbQuery;
@@ -139,7 +140,7 @@
int replacementOffset = contentAssistRequest.getReplacementBeginPosition();
int replacementLength = contentAssistRequest.getReplacementLength();
int cursorPosition = getCursorPositionForProposedText(replacementString);
- Image image = textProposal.getImage();
+ Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
if (image == null) {
image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE);
}
@@ -285,7 +286,7 @@
replacementString = textProposal.getReplacementString();
}
int cursorPosition = getCursorPositionForProposedText(replacementString);
- Image image = textProposal.getImage();
+ Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
String displayString = textProposal.getLabel() == null ?
replacementString :
textProposal.getLabel();
@@ -414,7 +415,7 @@
int replacementOffset = getOffset() - query.length();
int replacementLength = query.length();
int cursorPosition = getCursorPositionForProposedText(replacementString);
- Image image = textProposal.getImage();
+ Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
if (image == null) {
image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -183,6 +183,10 @@
}
}
+ public static ImageDescriptor getImageDescriptor(Class<?> baseClass, String imageName) {
+ return ImageDescriptor.createFromFile(baseClass, imageName);
+ }
+
public static Image getImage(Class<?> baseClass, String imageName) {
ImageRegistry registry = getDefault().getImageRegistry();
Image result = registry.get(imageName);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ActionProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ActionProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ActionProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -18,7 +18,6 @@
import java.util.TreeSet;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -33,7 +32,7 @@
*/
public class ActionProposalType extends ModelProposalType {
- private static final String IMAGE_NAME = "JSFActionProposal.gif"; //$NON-NLS-1$
+ private static final ImageDescriptor IMAGE = WebKbPlugin.getImageDescriptor(WebKbPlugin.class, "JSFActionProposal.gif"); //$NON-NLS-1$
/*
* (non-Javadoc)
@@ -68,7 +67,7 @@
proposal.setLabel(text);
proposal.setReplacementString(text);
proposal.setPosition(text.length());
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
proposals.add(proposal);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/CSSClassProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/CSSClassProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/CSSClassProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -15,6 +15,7 @@
import java.util.Set;
import java.util.TreeSet;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.ICSSContainerSupport;
import org.jboss.tools.jst.web.kb.IPageContext;
@@ -34,7 +35,7 @@
*
*/
public class CSSClassProposalType extends CustomProposalType {
- private static final String IMAGE_NAME = "EnumerationProposal.gif"; //$NON-NLS-1$
+ private static final ImageDescriptor IMAGE = WebKbPlugin.getImageDescriptor(WebKbPlugin.class, "EnumerationProposal.gif"); //$NON-NLS-1$
static String ID = "cssclass"; //$NON-NLS-1$
static String QUOTE_1 = "'"; //$NON-NLS-1$
@@ -120,7 +121,7 @@
}
return styleNames;
}
-
+
@Override
public TextProposal[] getProposals(KbQuery query) {
// Do not use getValue() because it trims the string and removes opening quote char, but all the characters
@@ -134,7 +135,7 @@
b = (b == -1 ? v.lastIndexOf('\t') : b);
b = (b == -1 ? predicateLength : b + 1);
int e = v.length();
-
+
String prefix = v.substring(b);
List<TextProposal> proposals = new ArrayList<TextProposal>();
@@ -146,7 +147,7 @@
proposal.setPosition(b + text.length() - predicateLength);
proposal.setStart(b - predicateLength);
proposal.setEnd(e - predicateLength);
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
proposals.add(proposal);
}
@@ -154,5 +155,4 @@
return proposals.toArray(new TextProposal[0]);
}
-
-}
+}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ConverterIDProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ConverterIDProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ConverterIDProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -17,7 +17,6 @@
import java.util.TreeSet;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.KbQuery;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
@@ -30,20 +29,20 @@
*/
public class ConverterIDProposalType extends ModelProposalType {
- private static final String IMAGE_NAME = "EnumerationProposal.gif"; //$NON-NLS-1$
+ private static final ImageDescriptor IMAGE = WebKbPlugin.getImageDescriptor(WebKbPlugin.class, "EnumerationProposal.gif"); //$NON-NLS-1$
public ConverterIDProposalType() {}
@Override
public TextProposal[] getProposals(KbQuery query) {
String v = query.getValue();
-
+
List<Object> list = provider.getList(xModel, getListID(), v, new Properties());
Set<String> idList = new TreeSet<String>();
if(list != null) {
for (Object o: list) idList.add(o.toString());
}
-
+
List<TextProposal> proposals = new ArrayList<TextProposal>();
for (String text: idList) {
if(text.startsWith(v)) {
@@ -51,17 +50,16 @@
proposal.setLabel(text);
proposal.setReplacementString(text);
proposal.setPosition(text.length());
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
proposals.add(proposal);
}
}
-
+
return proposals.toArray(new TextProposal[0]);
}
protected String getListID() {
return IWebPromptingProvider.JSF_CONVERTER_IDS;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/EnumerationProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/EnumerationProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/EnumerationProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -13,6 +13,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.IPageContext;
import org.jboss.tools.jst.web.kb.KbQuery;
@@ -23,7 +24,7 @@
*/
public class EnumerationProposalType extends CustomProposalType {
- private static final String IMAGE_NAME = "EnumerationProposal.gif"; //$NON-NLS-1$
+ private static final ImageDescriptor IMAGE = WebKbPlugin.getImageDescriptor(WebKbPlugin.class, "EnumerationProposal.gif"); //$NON-NLS-1$
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.internal.taglib.CustomProposalType#getProposals(org.jboss.tools.jst.web.kb.KbQuery)
@@ -41,7 +42,7 @@
proposal.setLabel(text);
proposal.setReplacementString(text);
proposal.setPosition(text.length());
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
proposals.add(proposal);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FaceletsJsfCProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FaceletsJsfCProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FaceletsJsfCProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -15,7 +15,7 @@
import java.util.List;
import java.util.Map;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
import org.jboss.tools.common.text.TextProposal;
@@ -33,7 +33,7 @@
@SuppressWarnings("restriction")
public class FaceletsJsfCProposalType extends CustomProposalType {
- private static Image ICON;
+ private static ImageDescriptor ICON;
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.internal.taglib.CustomProposalType#getProposals(org.jboss.tools.jst.web.kb.KbQuery)
@@ -97,9 +97,9 @@
int position = proposal.getReplacementString().length();
proposal.setPosition(position);
if (ICON == null) {
- ICON = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
+ ICON = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
}
- proposal.setImage(ICON);
+ proposal.setImageDescriptor(ICON);
return proposal;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FacetNameProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FacetNameProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FacetNameProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -16,7 +16,6 @@
import java.util.Set;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.IPageContext;
import org.jboss.tools.jst.web.kb.KbQuery;
@@ -34,7 +33,7 @@
public class FacetNameProposalType extends CustomProposalType {
private static final String IMAGE_NAME = "EnumerationProposal.gif"; //$NON-NLS-1$
- private static Image ICON;
+ private static ImageDescriptor ICON;
private IPageContext context;
@@ -87,9 +86,9 @@
proposal.setReplacementString(facetName);
proposal.setPosition(facetName.length());
if(ICON==null) {
- ICON = ImageDescriptor.createFromFile(WebKbPlugin.class, IMAGE_NAME).createImage();
+ ICON = ImageDescriptor.createFromFile(WebKbPlugin.class, IMAGE_NAME);
}
- proposal.setImage(ICON);
+ proposal.setImageDescriptor(ICON);
proposals.add(proposal);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/IDProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/IDProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/IDProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -17,7 +17,6 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.sse.core.StructuredModelManager;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
@@ -32,7 +31,7 @@
@SuppressWarnings("restriction")
public class IDProposalType extends CustomProposalType {
- private static final String IMAGE_NAME = "EnumerationProposal.gif"; //$NON-NLS-1$
+ private static final ImageDescriptor IMAGE = WebKbPlugin.getImageDescriptor(WebKbPlugin.class, "EnumerationProposal.gif"); //$NON-NLS-1$
static String ID = "id"; //$NON-NLS-1$
static String QUOTE_1 = "'"; //$NON-NLS-1$
@@ -92,7 +91,7 @@
proposal.setPosition(b + text.length());
proposal.setStart(b);
proposal.setEnd(e);
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
proposals.add(proposal);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourceBundleNameProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourceBundleNameProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourceBundleNameProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -17,7 +17,6 @@
import java.util.TreeSet;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.KbQuery;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
@@ -28,7 +27,7 @@
*/
public class ResourceBundleNameProposalType extends ModelProposalType {
- private static final String IMAGE_NAME = "MessageBundleProposal.gif"; //$NON-NLS-1$
+ private static final ImageDescriptor IMAGE = WebKbPlugin.getImageDescriptor(WebKbPlugin.class, "MessageBundleProposal.gif"); //$NON-NLS-1$
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.internal.taglib.CustomProposalType#getProposals(org.jboss.tools.jst.web.kb.KbQuery)
@@ -52,7 +51,7 @@
proposal.setLabel(text);
proposal.setReplacementString(text);
proposal.setPosition(text.length());
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
proposals.add(proposal);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourcePathProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourcePathProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourcePathProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -23,7 +23,6 @@
import org.eclipse.core.resources.IResourceVisitor;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
@@ -37,7 +36,7 @@
*/
public class ResourcePathProposalType extends ModelProposalType {
- private static final String IMAGE_NAME = "ResourcePathProposal.gif"; //$NON-NLS-1$
+ private static final ImageDescriptor IMAGE = WebKbPlugin.getImageDescriptor(WebKbPlugin.class, "ResourcePathProposal.gif"); //$NON-NLS-1$
private static Set<String> GRAPHIC_FILE_EXTENSIONS = new HashSet<String>();
private static Set<String> PAGE_FILE_EXTENSIONS = new HashSet<String>();
private static Set<String> CSS_FILE_EXTENSIONS = new HashSet<String>();
@@ -126,7 +125,7 @@
}
proposal.setReplacementString(replacementString);
proposal.setPosition(replacementString.length());
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
if(newValue == value) {
proposals.add(proposal);
}
@@ -149,7 +148,7 @@
proposal.setAutoActivationContentAssistantAfterApplication(false);
proposal.setReplacementString(replacementString);
proposal.setPosition(replacementString.length());
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
proposals.add(proposal);
}
return proposals.toArray(new TextProposal[0]);
@@ -202,6 +201,7 @@
* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.internal.taglib.ModelProposalType#isReadyToUse()
*/
+ @Override
protected boolean isReadyToUse() {
return webRootResource!=null;
}
@@ -315,6 +315,7 @@
return extensions == null || extensions.isEmpty() || extensions.contains(ext);
}
+ @Override
public boolean visit(IResource resource) throws CoreException {
if(resource instanceof IFile) {
IFile file = (IFile)resource;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -21,10 +21,10 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine;
import org.jboss.tools.common.el.core.ca.MessagesELTextProposal;
import org.jboss.tools.common.el.core.model.ELArgumentInvocation;
@@ -71,10 +71,10 @@
*/
public final class SeamELCompletionEngine extends AbstractELCompletionEngine<ISeamContextVariable> {
- private static final Image SEAM_EL_PROPOSAL_IMAGE =
- SeamCorePlugin.getDefault().getImage(SeamCorePlugin.CA_SEAM_EL_IMAGE_PATH);
- private static final Image SEAM_MESSAGES_PROPOSAL_IMAGE =
- SeamCorePlugin.getDefault().getImage(SeamCorePlugin.CA_SEAM_MESSAGES_IMAGE_PATH);
+ private static final ImageDescriptor SEAM_EL_PROPOSAL_IMAGE =
+ SeamCorePlugin.getDefault().getImageDescriptorFromRegistry(SeamCorePlugin.CA_SEAM_EL_IMAGE_PATH);
+ private static final ImageDescriptor SEAM_MESSAGES_PROPOSAL_IMAGE =
+ SeamCorePlugin.getDefault().getImageDescriptorFromRegistry(SeamCorePlugin.CA_SEAM_MESSAGES_IMAGE_PATH);
private static ELParserFactory factory = ELParserUtil.getJbossFactory();
@@ -89,7 +89,7 @@
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImageForMember(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo)
*/
@Override
- public Image getELProposalImageForMember(MemberInfo memberInfo) {
+ public ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo) {
return SEAM_EL_PROPOSAL_IMAGE;
}
@@ -176,9 +176,9 @@
@Override
protected void setImage(TextProposal proposal, ISeamContextVariable var) {
if (isSeamMessagesComponentVariable((ISeamContextVariable)var)) {
- proposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE);
+ proposal.setImageDescriptor(SEAM_MESSAGES_PROPOSAL_IMAGE);
} else {
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
}
}
@@ -190,7 +190,7 @@
@Override
protected void setImage(TextProposal kbProposal, TypeInfoCollector.MemberPresentation proposal) {
if (proposal.getMember() instanceof MessagesInfo) {
- kbProposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE);
+ kbProposal.setImageDescriptor(SEAM_MESSAGES_PROPOSAL_IMAGE);
} else {
super.setImage(kbProposal, proposal);
}
@@ -366,7 +366,7 @@
kbProposal.setLabel(proposal);
}
kbProposal.setAlternateMatch(proposal);
- kbProposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE);
+ kbProposal.setImageDescriptor(SEAM_MESSAGES_PROPOSAL_IMAGE);
Map<String, List<XModelObject>> properties = mbr.getPropertiesMap();
List<XModelObject> ps = properties.get(proposal);
More information about the jbosstools-commits
mailing list