Author: dgolovin Date: 2011-07-18 20:06:28 -0400 (Mon, 18 Jul 2011) New Revision: 33033 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java Log: Partial fix for JBIDE-8359 VisualEditor throws exception and stays open for file from project that is being closed JSPMultipageEditorPart should call setEditorPart on JSP Source editor Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2011-07-18 23:56:36 UTC (rev 33032) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2011-07-19 00:06:28 UTC (rev 33033) @@ -429,62 +429,32 @@ protected void createPages() { - // Sergey Vasilyev - /* - * TODO to author of this class VPE work on linux! this check not need - * in future - */ createPagesForVPE(); loadSelectedTab(); - // if (selectedPageIndex == sourceIndex) { - // visualEditor.setVisualMode(IVisualEditor.SOURCE_MODE); - // // switchOutlineToJSPEditor(); - // } - // if (selectedPageIndex == 2) { - // setActivePage(0); - // pageChange(0); - // if (visualEditor != null) - // visualEditor.maximizeSource(); - // selectedPageIndex=0; - // } else if (selectedPageIndex == 1) { - // setActivePage(0); - // pageChange(0); - // if (visualEditor != null) - // visualEditor.maximizeVisual(); - // selectedPageIndex=0; - // } else { - // selectedPageIndex=0; - // setActivePage(selectedPageIndex); - // pageChange(selectedPageIndex); - // } switch (selectedPageIndex) { - - case 0: { - // source/visual mode - setActivePage(selectedPageIndex); - pageChange(selectedPageIndex); - break; + case 0: { + // source/visual mode + setActivePage(selectedPageIndex); + pageChange(selectedPageIndex); + break; + } case 1: { + // source mode + setActivePage(selectedPageIndex); + pageChange(selectedPageIndex); + break; + } case 2: { + // preview mode + setActivePage(selectedPageIndex); + pageChange(selectedPageIndex); + break; + } default: { + // by default we sets source/visual mode + setActivePage(0); + pageChange(0); + break; + } } - case 1: { - // source mode - setActivePage(selectedPageIndex); - pageChange(selectedPageIndex); - break; - } - case 2: { - // preview mode - setActivePage(selectedPageIndex); - pageChange(selectedPageIndex); - break; - } - default: { - // by default we sets source/visual mode - setActivePage(0); - pageChange(0); - break; - } - } IFile f = getFile(); if (f != null && f.exists()) { @@ -500,6 +470,8 @@ * Create Source Editor and BundleMap */ sourceEditor = new JSPTextEditor(this); + sourceEditor.setEditorPart(this); + /* * Create Bundle Map here but Initialize it in the VpeController * or here if there is only the source part.