Author: yzhishko Date: 2010-02-19 14:34:11 -0500 (Fri, 19 Feb 2010) New Revision: 20397 Modified: branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java branches/jbosstools-3.1.0.RC2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java Log: Modified: branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java =================================================================== --- branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java 2010-02-19 19:28:11 UTC (rev 20396) +++ branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java 2010-02-19 19:34:11 UTC (rev 20397) @@ -147,12 +147,21 @@ @Override protected void setUp() throws Exception { super.setUp(); + boolean isCheck = true; + String isCheckString = System.getProperty("org.jboss.tools.vpe.ENABLE_PROJECT_NATURES_CHECKER"); //$NON-NLS-1$ + if (isCheckString != null) { + isCheck = Boolean.parseBoolean(isCheckString); + } + if (isCheck == false) { + System.setProperty("org.jboss.tools.vpe.ENABLE_PROJECT_NATURES_CHECKER", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + } JspEditorPlugin.getDefault().getPreferenceStore().setValue(IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, true); } @Override protected void tearDown() throws Exception { JspEditorPlugin.getDefault().getPreferenceStore().setValue(IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, false); + System.setProperty("org.jboss.tools.vpe.ENABLE_PROJECT_NATURES_CHECKER", "false"); //$NON-NLS-1$ //$NON-NLS-2$ super.tearDown(); } Modified: branches/jbosstools-3.1.0.RC2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java =================================================================== --- branches/jbosstools-3.1.0.RC2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-02-19 19:28:11 UTC (rev 20396) +++ branches/jbosstools-3.1.0.RC2/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-02-19 19:34:11 UTC (rev 20397) @@ -1009,12 +1009,19 @@ } public void partOpened(IWorkbenchPart part) { - if (JspEditorPlugin.getDefault().getPreferenceStore(). - getBoolean(IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE)) { - try { - checkNaturesFromPart(part); - } catch (CoreException e) { - VpePlugin.getPluginLog().logError(e); + boolean isCheck = true; + String isCheckString = System.getProperty("org.jboss.tools.vpe.ENABLE_PROJECT_NATURES_CHECKER"); //$NON-NLS-1$ + if (isCheckString != null) { + isCheck = Boolean.parseBoolean(isCheckString); + } + if (isCheck) { + if (JspEditorPlugin.getDefault().getPreferenceStore(). + getBoolean(IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE)) { + try { + checkNaturesFromPart(part); + } catch (CoreException e) { + VpePlugin.getPluginLog().logError(e); + } } } }