Author: akazakov Date: 2007-08-22 10:16:00 -0400 (Wed, 22 Aug 2007) New Revision: 3274 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java Log: http://jira.jboss.com/jira/browse/JBIDE-817 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java 2007-08-22 13:54:47 UTC (rev 3273) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java 2007-08-22 14:16:00 UTC (rev 3274) @@ -153,7 +153,13 @@ private char[] autoActivChars; public char[] getCompletionProposalAutoActivationCharacters() { + char[] superAutoActivChars = super.getCompletionProposalAutoActivationCharacters(); + if(superAutoActivChars==null) { + return superAutoActivChars; + } + if(autoActivChars==null) { + autoActivChars = superAutoActivChars; IPreferenceStore store = JSPUIPlugin.getDefault().getPreferenceStore(); if(store.isDefault(JSPUIPreferenceNames.AUTO_PROPOSE_CODE)) { String superDefaultChars = store.getDefaultString(JSPUIPreferenceNames.AUTO_PROPOSE_CODE); @@ -165,8 +171,6 @@ } autoActivChars = new char[redhatDefaultChars.length()]; redhatDefaultChars.getChars(0, redhatDefaultChars.length(), autoActivChars, 0); - } else { - autoActivChars = super.getCompletionProposalAutoActivationCharacters(); } } return autoActivChars;