Author: snjeza Date: 2008-08-05 19:06:49 -0400 (Tue, 05 Aug 2008) New Revision: 9553 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualEditor.java 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/preferences/VpePreference.java Log: JBIDE-2588 VPE on separate tab w/ lazy initialization Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualEditor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualEditor.java 2008-08-05 17:18:27 UTC (rev 9552) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualEditor.java 2008-08-05 23:06:49 UTC (rev 9553) @@ -15,11 +15,11 @@ public interface IVisualEditor extends ITextEditor, IReusableEditor { public static final int VISUALSOURCE_MODE = 0; - public static final int VISUAL_MODE = 1; - public static final int SOURCE_MODE = 2; + //public static final int VISUAL_MODE = 1; + public static final int SOURCE_MODE = 1; /** PREVIEW_MODE */ - public static final int PREVIEW_MODE = 3; + public static final int PREVIEW_MODE = 2; public void setVisualMode(int mode); public IVisualController getController(); 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 2008-08-05 17:18:27 UTC (rev 9552) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2008-08-05 23:06:49 UTC (rev 9553) @@ -90,6 +90,8 @@ private static final String VISUALSOURCE_TAB_LABEL = "JSPMultiPageEditor.TabLabel.VisualSource"; //$NON-NLS-1$ + private static final String SOURCE_TAB_LABEL = "JSPMultiPageEditor.TabLabel.Source"; //$NON-NLS-1$ + /** PREVIEW_TAB_LABEL */ private static final String PREVIEW_TAB_LABEL = "JSPMultiPageEditor.TabLabel.Preview"; //$NON-NLS-1$ @@ -97,6 +99,8 @@ private static final String PREVIEW_TAB="Preview"; //$NON-NLS-1$ //visual tab private static final String VISUAL_SOURCE_TAB="Visual/Source"; //$NON-NLS-1$ + //source tab + private static final String SOURCE_TAB="Source"; //$NON-NLS-1$ private IVisualEditor visualEditor; @@ -106,6 +110,8 @@ private JSPTextEditor sourceEditor; + private int sourceIndex; + /** composite control for default web-browser */ //private IVisualEditor previewWebBrowser; @@ -149,10 +155,14 @@ if (VISUAL_SOURCE_TAB.equalsIgnoreCase(VpePreference.EDITOR_VIEW_OPTION .getValue())) selectedPageIndex = 0; + else if (SOURCE_TAB + .equalsIgnoreCase(VpePreference.EDITOR_VIEW_OPTION + .getValue())) + selectedPageIndex = 1; else if (PREVIEW_TAB .equalsIgnoreCase(VpePreference.EDITOR_VIEW_OPTION .getValue())) - selectedPageIndex = 1; + selectedPageIndex = 2; else selectedPageIndex = 0; } else { @@ -213,7 +223,10 @@ visualEditor.createVisualEditor(); } visualEditor.setVisualMode(IVisualEditor.VISUALSOURCE_MODE); - }else if (newPageIndex == previewIndex) { + + }else if (newPageIndex == sourceIndex) + visualEditor.setVisualMode(IVisualEditor.SOURCE_MODE); + else if (newPageIndex == previewIndex) { if (visualEditor.getPreviewWebBrowser() == null) { visualEditor.createPreviewBrowser(); } @@ -409,10 +422,16 @@ break; } case 1: { - //preview mode + //source mode setActivePage(selectedPageIndex); pageChange(selectedPageIndex); break; + } + case 2: { + //preview mode + setActivePage(selectedPageIndex); + pageChange(selectedPageIndex); + break; } default: { //by default we sets source/visual mode @@ -447,7 +466,7 @@ setPartName(visualEditor.getTitle()); } catch (PartInitException e) { JspEditorPlugin.getPluginLog().logError(e); - } + }*/ try { sourceIndex = addPage(visualEditor, getEditorInput()); @@ -456,7 +475,7 @@ setPartName(visualEditor.getTitle()); } catch (PartInitException e) { JspEditorPlugin.getPluginLog().logError(e); - }*/ + } // Add tab contain default web-browser try { @@ -501,8 +520,10 @@ } public void gotoMarker(final IMarker marker) { - setActivePage(IVisualEditor.VISUALSOURCE_MODE); - pageChange(IVisualEditor.VISUALSOURCE_MODE); + //setActivePage(IVisualEditor.VISUALSOURCE_MODE); + //pageChange(IVisualEditor.VISUALSOURCE_MODE); + setActivePage(IVisualEditor.SOURCE_MODE); + pageChange(IVisualEditor.SOURCE_MODE); IGotoMarker adapter = (IGotoMarker) sourceEditor .getAdapter(IGotoMarker.class); if (adapter != null) { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreference.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreference.java 2008-08-05 17:18:27 UTC (rev 9552) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreference.java 2008-08-05 23:06:49 UTC (rev 9553) @@ -21,7 +21,7 @@ public static String ATT_USE_ABSOLUTE_POSITION = ""; public static String ATT_ALWAYS_PROMPT_FOR_TAG_ATTRIBUTES_DURING_TAG_INSERT = "always prompt for tag attributes during tag insert"; public static String ATT_OPTION_LIST = "option list"; - public static String ATT_SOURCE_VISUAL_EDITORS_WEIGHTS = "Source-Visual Editors Weights"; + public static String ATT_SOURCE_VISUAL_EDITORS_WEIGHTS = "Size of Visual Editor pane 0-100%"; public static String ATT_SHOW_SELECTION_TAG_BAR = "show selection tag bar"; public static String ATT_ALWAYS_HIDE_SELECTION_BAR_WITHOUT_PROMT="always hide selection bar without prompt"; public static String SHOW_COMMENTS_VALUE;