Attachment #162108 for bug #107138

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 175-180 Link Here

(-)src/org/eclipse/jst/jsp/ui/tests/contentassist/TestJSPContentAssistComputers.java (+6 lines)
175	runProposalTest("test1.jsp", 41, 15, expectedProposalCounts);	175	runProposalTest("test1.jsp", 41, 15, expectedProposalCounts);
176	}	176	}
177		177
		178	public void testHTMLTagAttributeValueProposals() throws Exception {
		179	//default, jsp, jsp java, default
		180	int[] expectedProposalCounts = new int[] {15, 2, 0, 0, 13, 15};
		181	runProposalTest("test3.jsp", 8, 10, expectedProposalCounts);
		182	}
		183
178	/**	184	/**
179	* <p>Run a proposal test by opening the given file and invoking content assist for	185	* <p>Run a proposal test by opening the given file and invoking content assist for
180	* each expected proposal count at the given line number and line character	186	* each expected proposal count at the given line number and line character




		// Now, the time to check exclusion.
		Vector content = new Vector(candidates.size());
		for (int i = 0; i < candidates.size(); i++) {
			if(candidates.elementAt(i) instanceof CMElementDeclaration) {
				CMElementDeclaration candidate = (CMElementDeclaration) candidates.elementAt(i);
				if (candidate == null)
					continue;
				if (isExcluded(candidate, element))
					continue;
				content.add(candidate);
			} else {
				content.toString();
			}
		}

		return content;

Return to bug 107138

Lines 85-96 Link Here

(-)src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java (-6 / +10 lines)
85	// Now, the time to check exclusion.	85	// Now, the time to check exclusion.
86	Vector content = new Vector(candidates.size());	86	Vector content = new Vector(candidates.size());
87	for (int i = 0; i < candidates.size(); i++) {	87	for (int i = 0; i < candidates.size(); i++) {
88	CMElementDeclaration candidate = (CMElementDeclaration) candidates.elementAt(i);	88	if(candidates.elementAt(i) instanceof CMElementDeclaration) {
89	if (candidate == null)	89	CMElementDeclaration candidate = (CMElementDeclaration) candidates.elementAt(i);
90	continue;	90	if (candidate == null)
91	if (isExcluded(candidate, element))	91	continue;
92	continue;	92	if (isExcluded(candidate, element))
93	content.add(candidate);	93	continue;
		94	content.add(candidate);
		95	} else {
		96	content.toString();
		97	}
94	}	98	}
95		99
96	return content;	100	return content;