[jbosstools-commits] JBoss Tools SVN: r33576 - in trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test: src/org/jboss/tools/jst/jsp/test and 1 other directory.

Author: dgolovin Date: 2011-08-03 20:58:39 -0400 (Wed, 03 Aug 2011) New Revision: 33576 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java Log: added utility methods to to validation inside the main thread Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF 2011-08-04 00:54:46 UTC (rev 33575) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF 2011-08-04 00:58:39 UTC (rev 33576) @@ -18,7 +18,9 @@ org.jboss.tools.jst.web;bundle-version="3.2.0", org.eclipse.ui.ide;bundle-version="3.7.0", org.jboss.tools.common.model.ui, - org.jboss.tools.jst.web.kb + org.jboss.tools.jst.web.kb, + org.eclipse.wst.validation;bundle-version="1.2.300", + org.eclipse.wst.common.frameworks;bundle-version="1.2.100" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.jboss.tools.jst.jsp.test, Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2011-08-04 00:54:46 UTC (rev 33575) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2011-08-04 00:58:39 UTC (rev 33576) @@ -1,6 +1,18 @@ package org.jboss.tools.jst.jsp.test; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.wst.validation.ValidationFramework; +import org.eclipse.wst.validation.internal.ValManager; +import org.eclipse.wst.validation.internal.operations.EnabledValidatorsOperation; +import org.eclipse.wst.validation.internal.operations.ValidatorSubsetOperation; +import org.eclipse.wst.validation.internal.operations.WorkbenchReporter; +import org.eclipse.wst.validation.internal.plugin.ValidationPlugin; import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; import org.jboss.tools.test.util.JobUtils; @@ -14,6 +26,63 @@ * TestUtil.waitForValidation(project); * @throws CoreException */ + public static void _waitForValidation(IProject project) throws CoreException{ + + project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); + ValidationFramework.getDefault().suspendAllValidation(false); + try { + new EnabledValidatorsOperation(project,false){ + public void run(IProgressMonitor progressMonitor) throws OperationCanceledException { + try { + // In order to check whether or not the monitor has been canceled, the monitor must not be null. + if (progressMonitor == null)return; + IProject project = getProject(); + if (ValidationFramework.getDefault().isSuspended(project))return; + if (ValManager.getDefault().isDisabled(project))return; + + if (!areValidatorsEnabled()) { + // save some processing time... + return; + } + + final WorkbenchReporter reporter = new WorkbenchReporter(getProject(), progressMonitor) { + public void addMessage(org.eclipse.wst.validation.internal.provisional.core.IValidator validator, org.eclipse.wst.validation.internal.provisional.core.IMessage message) { + super.addMessage(validator, message); + System.out.println(message); + }; + }; + + try { + // Periodically check if the user has canceled the operation + checkCanceled(reporter); + preValidate(reporter); + validate(reporter); + } catch (CoreException e) { + ValidationPlugin.getPlugin().handleException(e); + } + } finally { + } + } + }.run(new NullProgressMonitor()); + } finally { + ValidationFramework.getDefault().suspendAllValidation(true); + } + } + + public static void validate(IResource resource) throws CoreException { + validate(resource.getProject(), new IResource[] {resource}); + } + + public static void validate(IProject project, IResource[] resource) throws CoreException { + project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); + ValidationFramework.getDefault().suspendAllValidation(false); + try { + new ValidatorSubsetOperation(project,"java",resource,false).run(new NullProgressMonitor()); + } finally { + ValidationFramework.getDefault().suspendAllValidation(true); + } + } + public static void waitForValidation() throws CoreException{ for (int i = 0; i < 50; i++) { if(ValidatorManager.getStatus().equals(ValidatorManager.SLEEPING)) {