Author: akazakov Date: 2009-06-29 09:09:42 -0400 (Mon, 29 Jun 2009) New Revision: 16245 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java Log: https://jira.jboss.org/jira/browse/JBIDE-2808 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-29 13:08:01 UTC (rev 16244) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-29 13:09:42 UTC (rev 16245) @@ -62,6 +62,8 @@ private int fDocumentPosition; private ELContext fContext; + protected final static ICompletionProposal[] EMPTY_PROPOSAL_LIST = new ICompletionProposal[0]; + /* * (non-Javadoc) * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int) @@ -71,21 +73,8 @@ int offset) { this.fDocument = (viewer == null ? null : viewer.getDocument()); this.fDocumentPosition = offset; - try { - this.fContext = createContext(); - } catch (Exception e) { - e.printStackTrace(); - return new ICompletionProposal[0]; - } - System.out.println("AbstractXMLContentAssistProcessor: computeCompletionProposals() invoked"); - try { - return super.computeCompletionProposals(viewer, offset); - } catch (Exception e) { - e.printStackTrace(); - return new ICompletionProposal[0]; - } finally { - System.out.println("AbstractXMLContentAssistProcessor: computeCompletionProposals() exited"); - } + this.fContext = createContext(); + return super.computeCompletionProposals(viewer, offset); } /* @@ -98,7 +87,7 @@ this.fDocument = (viewer == null ? null : viewer.getDocument()); this.fDocumentPosition = offset; this.fContext = createContext(); - + return super.computeContextInformation(viewer, offset); } @@ -715,7 +704,7 @@ } } - protected class TextRegion { + protected static class TextRegion { private int startOffset; private int offset; private int length; @@ -787,5 +776,4 @@ return is.getEndPosition(); } - } \ No newline at end of file