Author: mareshkau Date: 2008-04-17 09:40:44 -0400 (Thu, 17 Apr 2008) New Revision: 7573 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/SourceEditorPageContext.java Log: JBIDE-2065 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 2008-04-17 13:23:51 UTC (rev 7572) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPTextEditor.java 2008-04-17 13:40:44 UTC (rev 7573) @@ -197,7 +197,7 @@ public IVisualContext getPageContext() { if (pageContext == null) { - pageContext = new SourceEditorPageContext(parentEditor.getVisualEditor().getController().getPageContext()); + pageContext = new SourceEditorPageContext(parentEditor); } // JBIDE-2046 Runnable runnable = new Runnable() { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java 2008-04-17 13:23:51 UTC (rev 7572) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java 2008-04-17 13:40:44 UTC (rev 7573) @@ -53,8 +53,12 @@ */ private IVisualContext pageContext; - public SourceEditorPageContext(IVisualContext pageContext) { - setPageContext(pageContext); + public SourceEditorPageContext(JSPMultiPageEditor externalEditor) { + + if((externalEditor!=null)&& (externalEditor.getVisualEditor()!=null) + &&(externalEditor.getVisualEditor().getController()!=null)) + + setPageContext(externalEditor.getVisualEditor().getController().getPageContext()); } public void clearAll() { @@ -217,8 +221,12 @@ } public List<TaglibData> getIncludeTaglibs() { - - return getPageContext().getIncludeTaglibs(); + if(getPageContext()!=null) { + + return getPageContext().getIncludeTaglibs(); + } else { + return new ArrayList<TaglibData>(); + } } }