[329050] Auto activation does not always work in javascript regions in webpages

bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPStructuredContentAssistProcessor.java

diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPStructuredContentAssistProcessor.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPStructuredContentAssistProcessor.java
index aa2b995..0364f77 100644
--- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPStructuredContentAssistProcessor.java
+++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/contentassist/JSPStructuredContentAssistProcessor.java
@@ -31,7 +31,7 @@
 public class JSPStructuredContentAssistProcessor extends StructuredContentAssistProcessor {
 
 	/** auto activation characters */
-	private char[] fCompletionPropoaslAutoActivationCharacters;
+	private char[] fCompletionProposalAutoActivationCharacters;
 	
 	/** property key for determining if auto activation is enabled */
 	private String fAutoActivationEnabledPropertyKey;
@@ -82,7 +82,7 @@
 	 * @see org.eclipse.wst.html.ui.internal.contentassist.HTMLStructuredContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
 	 */
 	public char[] getCompletionProposalAutoActivationCharacters() {
-		return fCompletionPropoaslAutoActivationCharacters;
+		return super.getCompletionProposalAutoActivationCharacters() != null ? super.getCompletionProposalAutoActivationCharacters() : this.fCompletionProposalAutoActivationCharacters;
 	}
 	
 	/**
@@ -106,10 +106,10 @@
 		
 		boolean doAuto = store.getBoolean(fAutoActivationEnabledPropertyKey);
 		if (doAuto) {
-			fCompletionPropoaslAutoActivationCharacters =
+			fCompletionProposalAutoActivationCharacters =
 				store.getString(fAutoActivationCharactersPropertyKey).toCharArray();
 		} else {
-			fCompletionPropoaslAutoActivationCharacters = null;
+			fCompletionProposalAutoActivationCharacters = null;
 		}
 	}
 	

bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLStructuredContentAssistProcessor.java

diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLStructuredContentAssistProcessor.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLStructuredContentAssistProcessor.java
index 034615c..994c111 100644
--- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLStructuredContentAssistProcessor.java
+++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/contentassist/HTMLStructuredContentAssistProcessor.java
@@ -27,7 +27,7 @@
  */
 public class HTMLStructuredContentAssistProcessor extends StructuredContentAssistProcessor {
 	/** the auto activation characters for this processor, set by user preference */
-	private char[] fCompletionPropoaslAutoActivationCharacters;
+	private char[] fCompletionProposalAutoActivationCharacters;
 
 	/** the context information validator for this processor */
 	private IContextInformationValidator fContextInformationValidator;
@@ -60,7 +60,7 @@
 	 * @see org.eclipse.wst.sse.ui.contentassist.StructuredContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
 	 */
 	public char[] getCompletionProposalAutoActivationCharacters() {
-		return this.fCompletionPropoaslAutoActivationCharacters;
+		return super.getCompletionProposalAutoActivationCharacters() != null ? super.getCompletionProposalAutoActivationCharacters() : this.fCompletionProposalAutoActivationCharacters;
 	}
 	
 	/**
@@ -82,10 +82,10 @@
 		boolean doAuto = getPreferenceStore().getBoolean(key);
 		if (doAuto) {
 			key = HTMLUIPreferenceNames.AUTO_PROPOSE_CODE;
-			this.fCompletionPropoaslAutoActivationCharacters = getPreferenceStore().getString(key).toCharArray();
+			this.fCompletionProposalAutoActivationCharacters = getPreferenceStore().getString(key).toCharArray();
 		}
 		else {
-			this.fCompletionPropoaslAutoActivationCharacters = null;
+			this.fCompletionProposalAutoActivationCharacters = null;
 		}
 	}
 }
\ No newline at end of file

bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLStructuredContentAssistProcessor.java

diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLStructuredContentAssistProcessor.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLStructuredContentAssistProcessor.java
index 03b1a38..69d040b 100644
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLStructuredContentAssistProcessor.java
+++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLStructuredContentAssistProcessor.java
@@ -30,7 +30,7 @@
  */
 public class XMLStructuredContentAssistProcessor extends StructuredContentAssistProcessor {
 	/** the auto activation characters for this processor, set by user preference */
-	private char[] fCompletionPropoaslAutoActivationCharacters;
+	private char[] fCompletionProposalAutoActivationCharacters;
 	
 	/** the context information validator for this processor */
 	private IContextInformationValidator fContextInformationValidator;
@@ -63,7 +63,7 @@
 	 * @see org.eclipse.wst.sse.ui.contentassist.StructuredContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
 	 */
 	public char[] getCompletionProposalAutoActivationCharacters() {
-		return this.fCompletionPropoaslAutoActivationCharacters;
+		return super.getCompletionProposalAutoActivationCharacters() != null ? super.getCompletionProposalAutoActivationCharacters() : this.fCompletionProposalAutoActivationCharacters;
 	}
 	
 	/**
@@ -83,10 +83,10 @@
 		boolean doAuto = getPreferenceStore().getBoolean(key);
 		if (doAuto) {
 			key = XMLUIPreferenceNames.AUTO_PROPOSE_CODE;
-			fCompletionPropoaslAutoActivationCharacters = getPreferenceStore().getString(key).toCharArray();
+			fCompletionProposalAutoActivationCharacters = getPreferenceStore().getString(key).toCharArray();
 		}
 		else {
-			fCompletionPropoaslAutoActivationCharacters = null;
+			fCompletionProposalAutoActivationCharacters = null;
 		}
 	}
 }