Author: scabanovich
Date: 2009-07-30 11:09:08 -0400 (Thu, 30 Jul 2009)
New Revision: 16902
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4683
Improved handling processors and page contexts.
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2009-07-30
14:49:22 UTC (rev 16901)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2009-07-30
15:09:08 UTC (rev 16902)
@@ -80,6 +80,7 @@
processor = (JspContentAssistProcessor)context.get("processor");
//$NON-NLS-1$
if(processor == null) {
processor = valueHelper.createContentAssistProcessor();
+ context.put("processor", processor); //$NON-NLS-1$
}
if(pageContext == null) {
pageContext = valueHelper.createPageContext(processor, offset);
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-07-30
14:49:22 UTC (rev 16901)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2009-07-30
15:09:08 UTC (rev 16902)
@@ -145,7 +145,7 @@
* @param context The context object instance
* @return
*/
- protected ITagLibrary[] getTagLibraries(IPageContext context) {
+ public ITagLibrary[] getTagLibraries(IPageContext context) {
Map<String, INameSpace> nameSpaces = context.getNameSpaces(getOffset());
if (nameSpaces == null || nameSpaces.isEmpty())
return EMPTY_LIBRARIES;
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-07-30
14:49:22 UTC (rev 16901)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2009-07-30
15:09:08 UTC (rev 16902)
@@ -783,11 +783,12 @@
return query.getPrefix();
}
});
+ ((JspContextImpl)pageContext).setLibraries(processor.getTagLibraries(pageContext));
}
}
public void initContext(Properties context) {
- if(context != null) {
+ if(context != null && processor != null) {
context.put("processor", processor); //$NON-NLS-1$
context.put("pageContext", pageContext); //$NON-NLS-1$
}