[jbosstools-commits] JBoss Tools SVN: r20044 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe and 3 other directories.

Author: yzhishko Date: 2010-02-01 07:27:09 -0500 (Mon, 01 Feb 2010) New Revision: 20044 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties Log: https://jira.jboss.org/jira/browse/JBIDE-5762 - fixed Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2010-02-01 11:49:49 UTC (rev 20043) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2010-02-01 12:27:09 UTC (rev 20044) @@ -19,6 +19,7 @@ static final String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL = "Show Resource Bundles Usage as EL Expressions"; //$NON-NLS-1$ static final String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT = "Ask for tag attributes during tag insert"; //$NON-NLS-1$ static final String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR = "Ask for confirmation when closing Selection Bar"; //$NON-NLS-1$ + static final String IGNORE_VPE_WARNINGS = "Ignore Visual Editor warnings"; //$NON-NLS-1$ static final String DEFAULT_VPE_TAB = "Default VPE Tab"; //$NON-NLS-1$ static final String VISUAL_SOURCE_EDITORS_SPLITTING = "Visual/Source Editors Splitting"; //$NON-NLS-1$ static final String VISUAL_SOURCE_EDITORS_WEIGHTS = "Size of Visual Editor Pane 0-100%"; //$NON-NLS-1$ Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2010-02-01 11:49:49 UTC (rev 20043) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2010-02-01 12:27:09 UTC (rev 20044) @@ -29,6 +29,7 @@ defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, false); defaultPreferences.putBoolean(IVpePreferencesPage.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, true); defaultPreferences.putBoolean(IVpePreferencesPage.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, true); + defaultPreferences.putBoolean(IVpePreferencesPage.IGNORE_VPE_WARNINGS, false); defaultPreferences.put(IVpePreferencesPage.DEFAULT_VPE_TAB, IVpePreferencesPage.DEFAULT_VPE_TAB_VISUAL_SOURCE_VALUE); defaultPreferences.put(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING, IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE); defaultPreferences.putInt(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_WEIGHTS, IVpePreferencesPage.DEFAULT_VISUAL_SOURCE_EDITORS_WEIGHTS); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2010-02-01 11:49:49 UTC (rev 20043) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2010-02-01 12:27:09 UTC (rev 20044) @@ -55,10 +55,8 @@ */ public void stop(BundleContext context) throws Exception { ProjectNaturesChecker naturesChecker = ProjectNaturesChecker.getInstance(); - if (naturesChecker != null) { - naturesChecker.dispose(); - naturesChecker = null; - } + naturesChecker.dispose(); + naturesChecker = null; super.stop(context); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-02-01 11:49:49 UTC (rev 20043) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-02-01 12:27:09 UTC (rev 20044) @@ -1009,13 +1009,10 @@ } public void partOpened(IWorkbenchPart part) { - if (part == multiPageEditor) { + if (!JspEditorPlugin.getDefault().getPreferenceStore(). + getBoolean(IVpePreferencesPage.IGNORE_VPE_WARNINGS)) { try { - IEditorInput editorInput = multiPageEditor.getEditorInput(); - if (editorInput instanceof IFileEditorInput) { - naturesChecker = ProjectNaturesChecker.getInstance(); - naturesChecker.checkNatures(((IFileEditorInput)editorInput).getFile().getProject()); - } + checkNaturesFromPart(part); } catch (CoreException e) { VpePlugin.getPluginLog().logError(e); } @@ -1239,4 +1236,14 @@ } } + private void checkNaturesFromPart(IWorkbenchPart part) throws CoreException{ + if (part == multiPageEditor) { + IEditorInput editorInput = multiPageEditor.getEditorInput(); + if (editorInput instanceof IFileEditorInput) { + naturesChecker = ProjectNaturesChecker.getInstance(); + naturesChecker.checkNatures(((IFileEditorInput)editorInput).getFile().getProject()); + } + } + } + } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2010-02-01 11:49:49 UTC (rev 20043) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2010-02-01 12:27:09 UTC (rev 20044) @@ -50,12 +50,12 @@ SPLITTING_HORIZ_LEFT_SOURCE_VALUE }, { VpeUIMessages.SPLITTING_HORIZ_LEFT_VISUAL, SPLITTING_HORIZ_LEFT_VISUAL_VALUE } }; - + private Composite pageContainer; private Group visualAppearanceGroup; private Group confirmationGroup; private Group tabsGroup; - + public VpePreferencesPage() { super(); setPreferenceStore(getPreferenceStore()); @@ -70,59 +70,60 @@ public String getTitle() { return VpeUIMessages.GENERAL_TAB_TITLE; } - + @Override protected Control createContents(Composite parent) { - + pageContainer = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(); - layout.numColumns = 1; - layout.marginHeight = 10; - layout.marginWidth = 10; - layout.horizontalSpacing = 10; - layout.verticalSpacing = 10; - GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1); - pageContainer.setLayout(layout); - pageContainer.setLayoutData(gd); - - visualAppearanceGroup = new Group(pageContainer, SWT.SHADOW_ETCHED_IN); - visualAppearanceGroup.setText(VpeUIMessages.VISUAL_APPEARANCE_GROUP_TITLE); + GridLayout layout = new GridLayout(); + layout.numColumns = 1; + layout.marginHeight = 10; + layout.marginWidth = 10; + layout.horizontalSpacing = 10; + layout.verticalSpacing = 10; + GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1); + pageContainer.setLayout(layout); + pageContainer.setLayoutData(gd); + + visualAppearanceGroup = new Group(pageContainer, SWT.SHADOW_ETCHED_IN); + visualAppearanceGroup + .setText(VpeUIMessages.VISUAL_APPEARANCE_GROUP_TITLE); layout = new GridLayout(); layout.marginHeight = 10; - layout.marginWidth = 10; - layout.horizontalSpacing = 10; - layout.verticalSpacing = 10; + layout.marginWidth = 10; + layout.horizontalSpacing = 10; + layout.verticalSpacing = 10; visualAppearanceGroup.setLayout(layout); gd = new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1); visualAppearanceGroup.setLayoutData(gd); - + confirmationGroup = new Group(pageContainer, SWT.SHADOW_ETCHED_IN); confirmationGroup.setText(VpeUIMessages.CONFIRMATION_GROUP_TITLE); layout = new GridLayout(); layout.marginHeight = 10; - layout.marginWidth = 10; - layout.horizontalSpacing = 10; - layout.verticalSpacing = 10; + layout.marginWidth = 10; + layout.horizontalSpacing = 10; + layout.verticalSpacing = 10; confirmationGroup.setLayout(layout); gd = new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1); confirmationGroup.setLayoutData(gd); - + tabsGroup = new Group(pageContainer, SWT.SHADOW_ETCHED_IN); tabsGroup.setText(VpeUIMessages.TABS_GROUP_TITLE); layout = new GridLayout(); layout.marginHeight = 10; - layout.marginWidth = 10; + layout.marginWidth = 10; tabsGroup.setLayout(layout); gd = new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1); tabsGroup.setLayoutData(gd); - + createFieldEditors(); initialize(); - checkState(); - + checkState(); + return pageContainer; } - + @Override protected Composite getFieldEditorParent() { return pageContainer; @@ -131,7 +132,8 @@ @Override protected void createFieldEditors() { addField(new BooleanFieldEditor(SHOW_BORDER_FOR_UNKNOWN_TAGS, - VpeUIMessages.SHOW_BORDER_FOR_UNKNOWN_TAGS, visualAppearanceGroup)); + VpeUIMessages.SHOW_BORDER_FOR_UNKNOWN_TAGS, + visualAppearanceGroup)); addField(new BooleanFieldEditor(SHOW_NON_VISUAL_TAGS, VpeUIMessages.SHOW_NON_VISUAL_TAGS, visualAppearanceGroup)); addField(new BooleanFieldEditor(SHOW_SELECTION_TAG_BAR, @@ -139,15 +141,23 @@ addField(new BooleanFieldEditor(SHOW_TEXT_FORMATTING, VpeUIMessages.SHOW_TEXT_FORMATTING, visualAppearanceGroup)); addField(new BooleanFieldEditor(SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, - VpeUIMessages.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, visualAppearanceGroup)); + VpeUIMessages.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, + visualAppearanceGroup)); addField(new BooleanFieldEditor(ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, - VpeUIMessages.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, confirmationGroup)); - addField(new BooleanFieldEditor(ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, - VpeUIMessages.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, confirmationGroup)); + VpeUIMessages.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, + confirmationGroup)); + addField(new BooleanFieldEditor( + ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, + VpeUIMessages.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, + confirmationGroup)); + addField(new BooleanFieldEditor(IGNORE_VPE_WARNINGS, + VpeUIMessages.IGNORE_VPE_WARNINGS, confirmationGroup)); addField(new VpeComboFieldEditor(DEFAULT_VPE_TAB, - VpeUIMessages.DEFAULT_VPE_TAB, DEFAULT_VPE_TAB_COMBO_BOX_VALUES, tabsGroup)); + VpeUIMessages.DEFAULT_VPE_TAB, + DEFAULT_VPE_TAB_COMBO_BOX_VALUES, tabsGroup)); addField(new VpeComboFieldEditor(VISUAL_SOURCE_EDITORS_SPLITTING, - VpeUIMessages.VISUAL_SOURCE_EDITORS_SPLITTING, SPLITTING_COMBO_BOX_VALUES, tabsGroup)); + VpeUIMessages.VISUAL_SOURCE_EDITORS_SPLITTING, + SPLITTING_COMBO_BOX_VALUES, tabsGroup)); addField(new SliderFieldEditor(VISUAL_SOURCE_EDITORS_WEIGHTS, VpeUIMessages.VISUAL_SOURCE_EDITORS_WEIGHTS, tabsGroup)); } @@ -155,11 +165,14 @@ @Override public boolean performOk() { super.performOk(); - IEditorReference[] editors = VpePlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getEditorReferences(); + IEditorReference[] editors = VpePlugin.getDefault().getWorkbench() + .getActiveWorkbenchWindow().getActivePage() + .getEditorReferences(); for (IEditorReference editor : editors) { IEditorPart editorPart = editor.getEditor(false); - if ((editorPart != null) && (editorPart instanceof JSPMultiPageEditor)) { - JSPMultiPageEditor mpe = (JSPMultiPageEditor)editorPart; + if ((editorPart != null) + && (editorPart instanceof JSPMultiPageEditor)) { + JSPMultiPageEditor mpe = (JSPMultiPageEditor) editorPart; IVisualEditor visualEditor = (mpe).getVisualEditor(); if (visualEditor instanceof VpeEditorPart) { VpeEditorPart vep = (VpeEditorPart) visualEditor; @@ -168,16 +181,16 @@ */ vep.updatePartAccordingToPreferences(); /* - * Change selected tab - * Commented to fix https://jira.jboss.org/jira/browse/JBIDE-4941 - * Do not update VPE splitting, weights, tabs for current page, - * only for newly opened. + * Change selected tab Commented to fix + * https://jira.jboss.org/jira/browse/JBIDE-4941 Do not + * update VPE splitting, weights, tabs for current page, + * only for newly opened. */ -// mpe.updatePartAccordingToPreferences(); + // mpe.updatePartAccordingToPreferences(); } } } - + return true; } @@ -185,5 +198,5 @@ public IPreferenceStore getPreferenceStore() { return JspEditorPlugin.getDefault().getPreferenceStore(); } - + } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-02-01 11:49:49 UTC (rev 20043) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-02-01 12:27:09 UTC (rev 20044) @@ -129,6 +129,7 @@ public static String SHOW_BUNDLES_AS_MESSAGES; public static String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT; public static String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR; + public static String IGNORE_VPE_WARNINGS; public static String DEFAULT_VPE_TAB; public static String VISUAL_SOURCE_EDITORS_SPLITTING; public static String VISUAL_SOURCE_EDITORS_WEIGHTS; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-02-01 11:49:49 UTC (rev 20043) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-02-01 12:27:09 UTC (rev 20044) @@ -112,6 +112,7 @@ SHOW_BUNDLES_AS_MESSAGES=Show bundle's messages explicitly ASK_TAG_ATTRIBUTES_ON_TAG_INSERT=Ask for tag attributes during tag insert ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR=Ask for confirmation when closing Selection Bar +IGNORE_VPE_WARNINGS=Ignore Visual Editor warnings DEFAULT_VPE_TAB=Select the default active editor's tab VISUAL_SOURCE_EDITORS_SPLITTING=Visual/Source editors splitting VISUAL_SOURCE_EDITORS_WEIGHTS=Size of the Visual Editor pane (0-100%)