JBIDE-19446 Completion proposal computers implementations should chec…

…k content type before doing other computations
jbosstools · Jun 3, 2015 · 6ee80a8 · 6ee80a8
1 parent 4169d60
commit 6ee80a8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/...c/org/jboss/tools/batch/ui/internal/contentassist/BatchJobCompletionProposalComputer.java b/...c/org/jboss/tools/batch/ui/internal/contentassist/BatchJobCompletionProposalComputer.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package org.jboss.tools.batch.ui.internal.contentassist;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -67,9 +68,13 @@ public class BatchJobCompletionProposalComputer extends AbstractXMLModelQueryCom
 	IBatchProject bp;
 	IProgressMonitor monitor;
 
+	@SuppressWarnings("rawtypes")
 	@Override
 	public List computeCompletionProposals(CompletionProposalInvocationContext context, IProgressMonitor monitor) {
 		this.monitor = monitor;
+		if(context.getDocument() != null && context.getDocument().get().indexOf("<job ") < 0) {
+			return new ArrayList();
+		}
 		return super.computeCompletionProposals(context, monitor);
 	}
 

diff --git a/....jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java b/....jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java
@@ -10,7 +10,12 @@
  ******************************************************************************/
 package org.jboss.tools.cdi.ui.ca;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.text.contentassist.IContextInformation;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
@@ -32,13 +37,26 @@
 import org.jboss.tools.jst.web.ui.internal.editor.contentassist.computers.XmlTagCompletionProposalComputer;
 import org.jboss.tools.jst.web.kb.KbQuery;
 import org.jboss.tools.jst.web.kb.KbQuery.Type;
+import org.jboss.tools.jst.web.kb.PageContextFactory;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
 
 
 @SuppressWarnings("restriction")
 public class BeansXmlCompletionProposalComputer extends XmlTagCompletionProposalComputer {
 
+	@Override
+	@SuppressWarnings("rawtypes")
+	public List computeCompletionProposals(
+			CompletionProposalInvocationContext context,
+			IProgressMonitor monitor) {
+		IFile file = PageContextFactory.getResource(context.getDocument());
+		if(file == null || !"beans.xml".equalsIgnoreCase(file.getName())) {
+			return new ArrayList();
+		}		
+		return super.computeCompletionProposals(context, monitor);
+	}
+
 	@Override
 	protected void addTagInsertionProposals(
 			ContentAssistRequest contentAssistRequest, int childPosition,