[jbosstools-commits] JBoss Tools SVN: r42775 - in trunk: jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers and 1 other directory.

Author: akazakov Date: 2012-07-27 19:56:03 -0400 (Fri, 27 Jul 2012) New Revision: 42775 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java Log: https://issues.jboss.org/browse/JBIDE-12353 Deadlock when invoking code completion 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-27 23:41:51 UTC (rev 42774) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java 2012-07-27 23:56:03 UTC (rev 42775) @@ -106,7 +106,7 @@ int replacementLength = matchString.length(); int cursorPosition = getCursorPositionForProposedText(replacementString); Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor()); - if (image == null) { + if (textProposal.getImageDescriptor() == null) { image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC); } 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-27 23:41:51 UTC (rev 42774) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2012-07-27 23:56:03 UTC (rev 42775) @@ -141,7 +141,7 @@ int replacementLength = contentAssistRequest.getReplacementLength(); int cursorPosition = getCursorPositionForProposedText(replacementString); Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor()); - if (image == null) { + if (textProposal.getImageDescriptor() == null) { image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE); } @@ -416,7 +416,7 @@ int replacementLength = query.length(); int cursorPosition = getCursorPositionForProposedText(replacementString); Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor()); - if (image == null) { + if(textProposal.getImageDescriptor()==null) { image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC); }