Author: vrubezhny Date: 2008-12-03 14:13:19 -0500 (Wed, 03 Dec 2008) New Revision: 12260 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JspEditorPlugin.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPActiveContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbImageFileResource.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdActionResource.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBeanPropertyResource.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBundleNameResource.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBundlePropertyResource.java Log: JBIDE-3133 New icons for proposals in JSF/Seam Code Assist. The icons support and a set of common icons are added to the JSF CA. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JspEditorPlugin.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JspEditorPlugin.java 2008-12-03 19:05:51 UTC (rev 12259) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JspEditorPlugin.java 2008-12-03 19:13:19 UTC (rev 12260) @@ -13,6 +13,7 @@ import java.io.File; import java.io.IOException; import java.net.URL; +import java.util.HashMap; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; @@ -23,10 +24,14 @@ import org.eclipse.jdt.ui.text.JavaTextTools; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ImageRegistry; +import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jst.jsp.ui.internal.JSPUIPlugin; +import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.plugin.AbstractUIPlugin; import org.jboss.tools.common.log.BaseUIPlugin; import org.jboss.tools.common.log.IPluginLog; import org.jboss.tools.common.text.xml.XmlEditorPlugin; @@ -44,6 +49,15 @@ public static final String RESOURCES_PATH = "/resources"; + // A Map to save a descriptor for each image + private HashMap fImageDescRegistry = null; + + public static final String CA_JSF_ACTION_IMAGE_PATH = "images/ca/icons_JSF_Actions.gif"; + public static final String CA_JSF_EL_IMAGE_PATH = "images/ca/icons_JSF_EL.gif"; + public static final String CA_RESOURCES_IMAGE_PATH = "images/ca/icons_Resource_path.gif"; + public static final String CA_JSF_MESSAGES_IMAGE_PATH = "images/ca/icons_Message_Bundles.gif"; + + /** * The constructor. */ @@ -165,4 +179,105 @@ } return (url == null) ? null : url.getPath(); } + + /** + * Creates an image from the given resource and adds the image to the + * image registry. + * + * @param resource + * @return Image + */ + private Image createImage(String resource) { + ImageDescriptor desc = getImageDescriptorFromRegistry(resource); + Image image = null; + + if (desc != null) { + image = desc.createImage(); + // dont add the missing image descriptor image to the image + // registry + if (!desc.equals(ImageDescriptor.getMissingImageDescriptor())) { + getImageRegistry().put(resource, image); + } + } + return image; + } + + /** + * Creates an image descriptor from the given imageFilePath and adds the + * image descriptor to the image descriptor registry. If an image + * descriptor could not be created, the default "missing" image descriptor + * is returned but not added to the image descriptor registry. + * + * @param imageFilePath + * @return ImageDescriptor image descriptor for imageFilePath or default + * "missing" image descriptor if resource could not be found + */ + private ImageDescriptor createImageDescriptor(String imageFilePath) { + ImageDescriptor imageDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, imageFilePath); + if (imageDescriptor != null) { + getImageDescriptorRegistry().put(imageFilePath, imageDescriptor); + } + else { + imageDescriptor = ImageDescriptor.getMissingImageDescriptor(); + } + + return imageDescriptor; + } + + /** + * Retrieves the image associated with resource from the image registry. + * If the image cannot be retrieved, attempt to find and load the image at + * the location specified in resource. + * + * @param resource + * the image to retrieve + * @return Image the image associated with resource or null if one could + * not be found + */ + public Image getImage(String resource) { + Image image = getImageRegistry().get(resource); + if (image == null) { + // create an image + image = createImage(resource); + } + return image; + } + + /** + * Retrieves the image descriptor associated with resource from the image + * descriptor registry. If the image descriptor cannot be retrieved, + * attempt to find and load the image descriptor at the location specified + * in resource. + * + * @param resource + * the image descriptor to retrieve + * @return ImageDescriptor the image descriptor assocated with resource or + * the default "missing" image descriptor if one could not be + * found + */ + public ImageDescriptor getImageDescriptorFromRegistry(String resource) { + ImageDescriptor imageDescriptor = null; + Object o = getImageDescriptorRegistry().get(resource); + if (o == null) { + // create a descriptor + imageDescriptor = createImageDescriptor(resource); + } + else { + imageDescriptor = (ImageDescriptor) o; + } + return imageDescriptor; + } + + /** + * Returns the image descriptor registry for this plugin. + * + * @return HashMap - image descriptor registry for this plugin + */ + private HashMap getImageDescriptorRegistry() { + if (fImageDescRegistry == null) { + fImageDescRegistry = new HashMap(); + } + return fImageDescRegistry; + } + } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java 2008-12-03 19:05:51 UTC (rev 12259) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java 2008-12-03 19:13:19 UTC (rev 12260) @@ -300,7 +300,8 @@ } String proposedInfo = getAdditionalInfo(parentDecl, childType); for (int i = 0; i < childStrings.length; i++) { - CustomCompletionProposal textProposal = new AutoContentAssistantProposal(childStrings[i].indexOf("=")>-1, childStrings[i], begin, length, childStrings[i].length(), XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ENUM), childStrings[i], null, proposedInfo, XMLRelevanceConstants.R_TAG_INSERTION); + Image image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ENUM); + CustomCompletionProposal textProposal = new AutoContentAssistantProposal(childStrings[i].indexOf("=")>-1, childStrings[i], begin, length, childStrings[i].length(), image, childStrings[i], null, proposedInfo, XMLRelevanceConstants.R_TAG_INSERTION); contentAssistRequest.addProposal(textProposal); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-12-03 19:05:51 UTC (rev 12259) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-12-03 19:13:19 UTC (rev 12260) @@ -236,8 +236,14 @@ int replacementBeginPosition = start + kbProposal.getStart(); int replacementLength = kbProposal.getEnd() - kbProposal.getStart(); int cursorPosition = kbProposal.getPosition() + cursorPositionDelta; + + // JBIDE-3133: New icons for proposals in JSF/Seam Code Assist + Image image = kbProposal.hasImage() ? kbProposal.getImage() : + JspEditorPlugin.getDefault().getImage(JspEditorPlugin.CA_JSF_EL_IMAGE_PATH); + AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(kbProposal.autoActivationContentAssistantAfterApplication(), replacementString, - replacementBeginPosition, replacementLength, cursorPosition, SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE), + replacementBeginPosition, replacementLength, cursorPosition, + image, label, null, kbProposal.getContextInfo(), relevance); contentAssistRequest.addProposal(proposal); continue; @@ -265,8 +271,14 @@ } int cursorPosition = kbProposal.getPosition() + cursorPositionDelta; + + // JBIDE-3133: New icons for proposals in JSF/Seam Code Assist + Image image = kbProposal.hasImage() ? kbProposal.getImage() : + JspEditorPlugin.getDefault().getImage(JspEditorPlugin.CA_JSF_EL_IMAGE_PATH); + AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(kbProposal.autoActivationContentAssistantAfterApplication(), replacementString, - replacementBeginPosition, replacementLength, cursorPosition, SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE), + replacementBeginPosition, replacementLength, cursorPosition, + image, label, null, kbProposal.getContextInfo(), relevance); contentAssistRequest.addProposal(proposal); } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPActiveContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPActiveContentAssistProcessor.java 2008-12-03 19:05:51 UTC (rev 12259) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPActiveContentAssistProcessor.java 2008-12-03 19:13:19 UTC (rev 12260) @@ -14,6 +14,7 @@ import java.util.Iterator; import java.util.List; +import org.eclipse.swt.graphics.Image; import org.eclipse.wst.sse.core.utils.StringUtils; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest; @@ -40,7 +41,6 @@ * @author Igels */ public class JSPActiveContentAssistProcessor extends JSPBaseContentAssistProcessor { - private WtpKbConnector wtpKbConnector; private boolean isFacelets = false; @@ -161,8 +161,15 @@ String replacementString = replacementStringBuffer.toString(); int cursorPosition = kbProposal.getPosition() + cursorPositionDelta; + + // JBIDE-3133: New icons for proposals in JSF/Seam Code Assist + Image image = kbProposal.hasImage() ? + kbProposal.getImage() : + SharedXMLEditorPluginImageHelper + .getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE); + AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(kbProposal.autoActivationContentAssistantAfterApplication(), replacementString, - replacementBeginPosition, replacementLength, cursorPosition, SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE), + replacementBeginPosition, replacementLength, cursorPosition, image, kbProposal.getLabel(), null, kbProposal.getContextInfo(), relevance); contentAssistRequest.addProposal(proposal); @@ -231,11 +238,16 @@ if ('#' == displayString.charAt(0) || '$' == displayString.charAt(0)) displayString = elStartChar + displayString.substring(1); + // JBIDE-3133: New icons for proposals in JSF/Seam Code Assist + Image image = kbProposal.hasImage() ? + kbProposal.getImage() : + JspEditorPlugin.getDefault().getImage(JspEditorPlugin.CA_JSF_EL_IMAGE_PATH); + AutoContentAssistantProposal proposal = new AutoContentAssistantProposal( kbProposal.autoActivationContentAssistantAfterApplication(), replacementString, replacementBeginPosition, replacementLength, cursorPosition, - SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE), + image, displayString, null, kbProposal.getContextInfo(), relevance); contentAssistRequest.addProposal(proposal); } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java 2008-12-03 19:05:51 UTC (rev 12259) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogCellEditorContentAssistProcessor.java 2008-12-03 19:13:19 UTC (rev 12260) @@ -22,6 +22,7 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContextInformation; +import org.eclipse.swt.graphics.Image; import org.eclipse.wst.xml.ui.internal.contentassist.XMLRelevanceConstants; import org.eclipse.wst.xml.ui.internal.util.SharedXMLEditorPluginImageHelper; import org.jboss.tools.common.kb.KbException; @@ -123,10 +124,17 @@ int replacementLength = kbProposal.getEnd() - kbProposal.getStart(); int cursorPositionDelta = 0; int cursorPosition = kbProposal.getPosition() + cursorPositionDelta; + + Image image = kbProposal.hasImage() ? + kbProposal.getImage() : + SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE); + AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(kbProposal.autoActivationContentAssistantAfterApplication(), replacementString, - replacementBeginPosition, replacementLength, cursorPosition, SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE), + replacementBeginPosition, replacementLength, cursorPosition, + image, kbProposal.getLabel(), null, kbProposal.getContextInfo(), relevance); - proposalsList.add(proposal); + + proposalsList.add(proposal); } else { StringBuffer replacementStringBuffer = new StringBuffer(kbProposal.getReplacementString()); int replacementBeginPosition = 0; @@ -134,9 +142,16 @@ int cursorPositionDelta = 0; String replacementString = replacementStringBuffer.toString(); int cursorPosition = kbProposal.getPosition() + cursorPositionDelta; + + Image image = kbProposal.hasImage() ? + kbProposal.getImage() : + SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE); + AutoContentAssistantProposal proposal = new AutoContentAssistantProposal(kbProposal.autoActivationContentAssistantAfterApplication(), replacementString, - replacementBeginPosition, replacementLength, cursorPosition, SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE), + replacementBeginPosition, replacementLength, cursorPosition, + image, kbProposal.getLabel(), null, kbProposal.getContextInfo(), relevance); + proposalsList.add(proposal); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbImageFileResource.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbImageFileResource.java 2008-12-03 19:05:51 UTC (rev 12259) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbImageFileResource.java 2008-12-03 19:13:19 UTC (rev 12260) @@ -126,6 +126,7 @@ } proposal.setReplacementString(replacementString); proposal.setPosition(replacementString.length()); + proposal.setImage(JspEditorPlugin.getDefault().getImage(JspEditorPlugin.CA_RESOURCES_IMAGE_PATH)); proposals.add(proposal); } return proposals; Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdActionResource.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdActionResource.java 2008-12-03 19:05:51 UTC (rev 12259) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdActionResource.java 2008-12-03 19:13:19 UTC (rev 12260) @@ -23,6 +23,7 @@ import org.jboss.tools.common.kb.KbDinamicResource; import org.jboss.tools.common.kb.KbProposal; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; +import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.web.project.list.IWebPromptingProvider; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; @@ -68,6 +69,7 @@ proposal.setLabel(text); proposal.setReplacementString(text); proposal.setPosition(text.length()); + proposal.setImage(JspEditorPlugin.getDefault().getImage(JspEditorPlugin.CA_JSF_ACTION_IMAGE_PATH)); proposals.add(proposal); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBeanPropertyResource.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBeanPropertyResource.java 2008-12-03 19:05:51 UTC (rev 12259) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBeanPropertyResource.java 2008-12-03 19:13:19 UTC (rev 12260) @@ -19,6 +19,7 @@ import java.util.Set; import java.util.TreeSet; +import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorInput; import org.jboss.tools.common.el.core.model.ELExpression; import org.jboss.tools.common.el.core.model.ELInstance; @@ -41,7 +42,6 @@ * @author Jeremy */ public class WTPKbdBeanPropertyResource extends WTPKbAbstractModelResource { - public static String SUPPORTED_ID = WebPromptingProvider.JSF_BEAN_PROPERTIES; public Properties type = new Properties(); protected String query; @@ -96,7 +96,8 @@ Iterator<String> it = sorted.iterator(); while(it.hasNext()) { String text = it.next(); - process(proposals, "", "", -1, query.length() - "".length(), query.length(), text, restQuery); + process(proposals, "", "", -1, query.length() - "".length(), query.length(), text, restQuery, + JspEditorPlugin.getDefault().getImage(JspEditorPlugin.CA_JSF_EL_IMAGE_PATH)); } } catch (Exception x) { JspEditorPlugin.getPluginLog().logError(x); @@ -125,7 +126,7 @@ return BEAN_PROPERTY_WRAPPERS; } - protected boolean process(Collection<KbProposal> proposals, String prefix, String suffix, int start, int cursor, int end, String text, String query) { + protected boolean process(Collection<KbProposal> proposals, String prefix, String suffix, int start, int cursor, int end, String text, String query, Image image) { if ((prefix + text).toLowerCase().startsWith((prefix + query).toLowerCase())) { KbProposal proposal = new KbProposal(); proposal.setLabel(prefix + text + suffix); @@ -134,6 +135,7 @@ proposal.setPosition(cursor); proposal.setPostProcessing(postProcessing); proposal.setRelevance(getKbProposalRelevance()); + proposal.setImage(image); return true; } else { return false; @@ -211,7 +213,6 @@ proposal.setReplacementString("#{" + proposal.getReplacementString() + "}"); proposal.setLabel("#{" + proposal.getLabel() + "}"); - // JBIDE-2334: JSPAciveContentAssistProcessor (a class which calls this method) // is to process opening and closing EL charachers /* Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBundleNameResource.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBundleNameResource.java 2008-12-03 19:05:51 UTC (rev 12259) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBundleNameResource.java 2008-12-03 19:13:19 UTC (rev 12260) @@ -22,6 +22,7 @@ import org.jboss.tools.common.kb.KbDinamicResource; import org.jboss.tools.common.kb.KbProposal; import org.jboss.tools.common.model.XModel; +import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; /** @@ -59,6 +60,7 @@ proposal.setLabel(text); proposal.setReplacementString(text); proposal.setPosition(text.length()); + proposal.setImage(JspEditorPlugin.getDefault().getImage(JspEditorPlugin.CA_JSF_MESSAGES_IMAGE_PATH)); proposals.add(proposal); } } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBundlePropertyResource.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBundlePropertyResource.java 2008-12-03 19:05:51 UTC (rev 12259) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBundlePropertyResource.java 2008-12-03 19:13:19 UTC (rev 12260) @@ -136,7 +136,8 @@ Iterator it = sorted.iterator(); while(it.hasNext()) { String text = (String)it.next(); - process(proposals, "", "", -1, query.length() - "".length(), query.length(), text, restQuery); + process(proposals, "", "", -1, query.length() - "".length(), query.length(), text, restQuery, + JspEditorPlugin.getDefault().getImage(JspEditorPlugin.CA_JSF_MESSAGES_IMAGE_PATH)); } } catch (Exception x) { JspEditorPlugin.getPluginLog().logError("Error in executing query " + query, x);