Attachment 162108 Details for Bug 107138 – Fix Patch with JUnits

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

[patch] Fix Patch with JUnits

107138.txt (text/plain), 2.51 KB, created by Ian Tewksbury

on 2010-03-15 17:04:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Tewksbury

Created: 2010-03-15 17:04:34 EDT

Size: 2.51 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.jsp.ui.tests
>Index: src/org/eclipse/jst/jsp/ui/tests/contentassist/TestJSPContentAssistComputers.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/tests/org.eclipse.jst.jsp.ui.tests/src/org/eclipse/jst/jsp/ui/tests/contentassist/TestJSPContentAssistComputers.java,v
>retrieving revision 1.3
>diff -u -r1.3 TestJSPContentAssistComputers.java
>--- src/org/eclipse/jst/jsp/ui/tests/contentassist/TestJSPContentAssistComputers.java	12 Mar 2010 17:02:33 -0000	1.3
>+++ src/org/eclipse/jst/jsp/ui/tests/contentassist/TestJSPContentAssistComputers.java	15 Mar 2010 21:01:45 -0000
>@@ -175,6 +175,12 @@
> 		runProposalTest("test1.jsp", 41, 15, expectedProposalCounts);
> 	}
> 	
>+	public void testHTMLTagAttributeValueProposals() throws Exception {
>+		//default, jsp, jsp java, default
>+		int[] expectedProposalCounts = new int[] {15, 2, 0, 0, 13, 15};
>+		runProposalTest("test3.jsp", 8, 10, expectedProposalCounts);
>+	}
>+	
> 	/**
> 	 * <p>Run a proposal test by opening the given file and invoking content assist for
> 	 * each expected proposal count at the given line number and line character
>#P org.eclipse.wst.html.core
>Index: src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java,v
>retrieving revision 1.6
>diff -u -r1.6 HTMLModelQueryImpl.java
>--- src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java	10 Apr 2007 18:31:49 -0000	1.6
>+++ src/org/eclipse/wst/html/core/internal/modelquery/HTMLModelQueryImpl.java	15 Mar 2010 21:01:46 -0000
>@@ -85,12 +85,16 @@
> 		// Now, the time to check exclusion.
> 		Vector content = new Vector(candidates.size());
> 		for (int i = 0; i < candidates.size(); i++) {
>-			CMElementDeclaration candidate = (CMElementDeclaration) candidates.elementAt(i);
>-			if (candidate == null)
>-				continue;
>-			if (isExcluded(candidate, element))
>-				continue;
>-			content.add(candidate);
>+			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;

Flags:

nsand.dev: iplog+

Actions: View | Diff

Attachments on bug 107138: 150268 | 151343 | 153604 | 162108 | 162110