[jbosstools-commits] JBoss Tools SVN: r24836 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca.
Author: vrubezhny
Date: 2010-09-09 10:22:55 -0400 (Thu, 09 Sep 2010)
New Revision: 24836
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java
Log:
JBIDE-2704: Code completion of annotations in beans.xml
CDI Model integrity check is added
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 2010-09-09
13:59:02 UTC (rev 24835)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java 2010-09-09
14:22:55 UTC (rev 24836)
@@ -14,6 +14,8 @@
import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
+import org.jboss.tools.cdi.core.CDICoreNature;
+import org.jboss.tools.cdi.core.CDIUtil;
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;
@@ -76,6 +78,11 @@
if (project == null)
return;
+
+ // The following code is made due to make sure that the CDI Model and Project is
up-to-date
+ CDICoreNature nature = CDIUtil.getCDINatureWithProgress(project);
+ if (nature == null)
+ return;
KbQuery kbQuery = createKbQuery(Type.TAG_BODY, query, query, prefix, uri);
TextProposal[] proposals = BeansXmlProcessor.getInstance().getProposals(kbQuery,
project);