Author: snjeza Date: 2009-07-03 20:43:15 -0400 (Fri, 03 Jul 2009) New Revision: 16382 Added: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ExcludeResourceHandler.java trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/IncludeResourceHandler.java trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ResourceExcludedExpressionFactoryTester.java Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.properties trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.xml trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/Messages.java trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/XStudioVerificationPlugin.java trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/messages.properties Log: https://jira.jboss.org/jira/browse/JBIDE-4487 Turn off validation by a per folder basis Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF 2009-07-03 20:55:55 UTC (rev 16381) +++ trunk/common/plugins/org.jboss.tools.common.verification.ui/META-INF/MANIFEST.MF 2009-07-04 00:43:15 UTC (rev 16382) @@ -23,6 +23,11 @@ org.eclipse.ui.workbench, org.eclipse.jdt.ui, org.jboss.tools.common.verification, - org.jboss.tools.common.model.ui + org.jboss.tools.common.model.ui, + org.eclipse.core.expressions, + org.eclipse.core.commands, + org.eclipse.jface, + org.eclipse.wst.common.project.facet.core, + org.eclipse.wst.validation Bundle-Version: 2.0.0 Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.properties 2009-07-03 20:55:55 UTC (rev 16381) +++ trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.properties 2009-07-04 00:43:15 UTC (rev 16382) @@ -8,3 +8,8 @@ actionSets.verificationActions.verifyAll.label=Verify All actionSets.verificationActions.verify.label=Verify PreferencePage_Verification=Verification + +command.name.ExcludeValidation = Exclude Validation +command.name.IncludeValidation = Include Validation +command.label.ExcludeValidation = Exclude Validation +command.label.IncludeValidation = Include Validation \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.xml 2009-07-03 20:55:55 UTC (rev 16381) +++ trunk/common/plugins/org.jboss.tools.common.verification.ui/plugin.xml 2009-07-04 00:43:15 UTC (rev 16382) @@ -47,4 +47,57 @@ <xclass id="org.jboss.tools.common.verification.ui.vrules.wizard.config.VRulesConfigurationWizard" class="org.jboss.tools.common.verification.ui.vrules.wizard.config.VRulesConfigurationWizard"/> </extension> + + <extension point="org.eclipse.ui.commands"> + <command + name="%command.name.ExcludeValidation" + id="org.jboss.tools.common.verification.ui.actions.ExcludeValidationCommand" + defaultHandler="org.jboss.tools.common.verification.ui.actions.ExcludeResourceHandler"/> + </extension> + <extension point="org.eclipse.ui.commands"> + <command + name="%command.name.IncludeValidation" + id="org.jboss.tools.common.verification.ui.actions.IncludeValidationCommand" + defaultHandler="org.jboss.tools.common.verification.ui.actions.IncludeResourceHandler"/> + </extension> + <extension point="org.eclipse.core.expressions.propertyTesters"> + <propertyTester + namespace="org.jboss.tools.verification.ui" + properties="resourceExcluded,resourceIncluded" + type="org.eclipse.core.runtime.IAdaptable" + class="org.jboss.tools.common.verification.ui.actions.ResourceExcludedExpressionFactoryTester" + id="org.jboss.tools.common.verification.ui.actions.ResourceExcludedExpressionFactoryTester"> + </propertyTester> + </extension> + <extension point="org.eclipse.ui.menus"> + <menuContribution + locationURI="popup:org.eclipse.ui.popup.any?after=additions"> + <command + commandId="org.jboss.tools.common.verification.ui.actions.ExcludeValidationCommand" + label="%command.label.ExcludeValidation"> + <visibleWhen> + <with variable="selection"> + <count value="1"/> + <iterate> + <instanceof value="org.eclipse.core.runtime.IAdaptable"/> + <test property="org.jboss.tools.verification.ui.resourceIncluded" value="true" forcePluginActivation="true"/> + </iterate> + </with> + </visibleWhen> + </command> + <command + commandId="org.jboss.tools.common.verification.ui.actions.IncludeValidationCommand" + label="%command.label.IncludeValidation"> + <visibleWhen> + <with variable="selection"> + <count value="1"/> + <iterate> + <instanceof value="org.eclipse.core.runtime.IAdaptable"/> + <test property="org.jboss.tools.verification.ui.resourceExcluded" value="true" forcePluginActivation="true"/> + </iterate> + </with> + </visibleWhen> + </command> + </menuContribution> + </extension> </plugin> \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/Messages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/Messages.java 2009-07-03 20:55:55 UTC (rev 16381) +++ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/Messages.java 2009-07-04 00:43:15 UTC (rev 16382) @@ -4,6 +4,10 @@ public class Messages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.common.verification.ui.messages"; //$NON-NLS-1$ + public static String ExcludeResourceHandler_Are_you_sure_you_want_to_exclude_all_V2_validators; + public static String ExcludeResourceHandler_Exclude_validation; + public static String IncludeResourceHandler_Are_you_sure_you_want_to_include_all_V2_validators; + public static String IncludeResourceHandler_Include_Validation; public static String SignificanceView_Any; public static String SignificanceView_GreaterThanN; public static String SignificanceView_OnlyTen; Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/XStudioVerificationPlugin.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/XStudioVerificationPlugin.java 2009-07-03 20:55:55 UTC (rev 16381) +++ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/XStudioVerificationPlugin.java 2009-07-04 00:43:15 UTC (rev 16382) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.verification.ui; +import org.eclipse.core.runtime.QualifiedName; import org.jboss.tools.common.log.BaseUIPlugin; import org.jboss.tools.common.log.IPluginLog; import org.jboss.tools.common.model.plugin.IModelPlugin; @@ -18,6 +19,10 @@ // The shared instance private static XStudioVerificationPlugin plugin; + + public final static String PLUGIN_ID = "org.jboss.tools.common.verification.ui"; //$NON-NLS-1$ + + public static final QualifiedName RESOURCE_EXCLUDED = new QualifiedName(PLUGIN_ID, "resourceExcluded"); //$NON-NLS-1$ public XStudioVerificationPlugin() { super(); Added: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ExcludeResourceHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ExcludeResourceHandler.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ExcludeResourceHandler.java 2009-07-04 00:43:15 UTC (rev 16382) @@ -0,0 +1,133 @@ +/************************************************************************************* + * Copyright (c) 2008-2009 JBoss by Red Hat and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.common.verification.ui.actions; + +import java.util.Iterator; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.handlers.HandlerUtil; +import org.eclipse.wst.validation.MutableProjectSettings; +import org.eclipse.wst.validation.ValidationFramework; +import org.eclipse.wst.validation.Validator; +import org.eclipse.wst.validation.internal.ValManager; +import org.eclipse.wst.validation.internal.ValPrefManagerProject; +import org.eclipse.wst.validation.internal.ValidatorMutable; +import org.eclipse.wst.validation.internal.ValManager.UseProjectPreferences; +import org.eclipse.wst.validation.internal.model.FilterGroup; +import org.eclipse.wst.validation.internal.model.FilterRule; +import org.eclipse.wst.validation.internal.model.ProjectPreferences; +import org.jboss.tools.common.verification.ui.Messages; +import org.jboss.tools.common.verification.ui.XStudioVerificationPlugin; + +/** +* @author snjeza +* +*/ +public class ExcludeResourceHandler extends AbstractHandler { + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands + * .ExecutionEvent) + */ + public Object execute(ExecutionEvent event) throws ExecutionException { + ISelection selection = HandlerUtil.getCurrentSelection(event); + if (selection instanceof IStructuredSelection) { + Iterator iter = ((IStructuredSelection) selection).iterator(); + while (iter.hasNext()) { + Object element = iter.next(); + if (!(element instanceof IAdaptable)) { + continue; + } + IResource resource = (IResource) ((IAdaptable) element) + .getAdapter(IResource.class); + if (resource != null) { + excludeResource(resource); + } + } + } + return null; + } + + private void excludeResource(IResource resource) { + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + Shell shell = window.getShell(); + boolean exclude = MessageDialog.openQuestion(shell, Messages.ExcludeResourceHandler_Exclude_validation, NLS.bind(Messages.ExcludeResourceHandler_Are_you_sure_you_want_to_exclude_all_V2_validators,resource.getName())); + if (!exclude) { + return; + } + if (resource.getType() == IResource.PROJECT) { + ValidationFramework.getDefault().disableValidation(resource); + } else { + IProject project = resource.getProject(); + MutableProjectSettings projectSettings = ValidationFramework.getDefault().getProjectSettings(project); + projectSettings.setOverride(true); + Validator[] validators = ValManager.getDefault().getValidatorsConfiguredForProject(project, UseProjectPreferences.MustUse); + ValidatorMutable[] changedValidator = new ValidatorMutable[validators.length]; + for (int i = 0; i < validators.length; i++) { + ValidatorMutable validator = new ValidatorMutable(validators[i]); + changedValidator[i] = validator; + if (validator.isV2Validator()) { + FilterGroup[] groups = validator.getGroups(); + FilterGroup excludeGroup = null; + for (int j = 0; j < groups.length; j++) { + if (groups[j].isExclude()) { + excludeGroup = groups[j]; + break; + } + } + if (excludeGroup == null) { + excludeGroup = FilterGroup.create(true, new FilterRule[0]); + validator.add(excludeGroup); + } + String pattern = resource.getProjectRelativePath().toString(); + int type = -1; + if (resource.getType() == IResource.FILE) { + type = FilterRule.File.FileTypeFile; + } else if (resource.getType() == IResource.FOLDER) { + type = FilterRule.File.FileTypeFolder; + } + if (type != -1) { + FilterRule rule = FilterRule.createFile(pattern, true, type); + FilterGroup newGroup = FilterGroup.addRule(excludeGroup, rule); + validator.replaceFilterGroup(excludeGroup, newGroup); + + } + } + } + ValidationFramework.getDefault().applyChanges(projectSettings, true); + ProjectPreferences pp = new ProjectPreferences(project, projectSettings.getOverride(), projectSettings.getSuspend(), null); + ValPrefManagerProject vpm = new ValPrefManagerProject(project); + vpm.savePreferences(pp, changedValidator); + } + try { + resource.setPersistentProperty(XStudioVerificationPlugin.RESOURCE_EXCLUDED, "true"); //$NON-NLS-1$ + } catch (CoreException ignore) { + ignore.printStackTrace(); + } + } + +} Added: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/IncludeResourceHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/IncludeResourceHandler.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/IncludeResourceHandler.java 2009-07-04 00:43:15 UTC (rev 16382) @@ -0,0 +1,123 @@ +/************************************************************************************* + * Copyright (c) 2008-2009 JBoss by Red Hat and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.common.verification.ui.actions; + +import java.util.Iterator; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.handlers.HandlerUtil; +import org.eclipse.wst.validation.MutableProjectSettings; +import org.eclipse.wst.validation.ValidationFramework; +import org.eclipse.wst.validation.Validator; +import org.eclipse.wst.validation.internal.ExtensionConstants; +import org.eclipse.wst.validation.internal.ValManager; +import org.eclipse.wst.validation.internal.ValPrefManagerProject; +import org.eclipse.wst.validation.internal.ValidatorMutable; +import org.eclipse.wst.validation.internal.ValManager.UseProjectPreferences; +import org.eclipse.wst.validation.internal.model.FilterGroup; +import org.eclipse.wst.validation.internal.model.FilterRule; +import org.eclipse.wst.validation.internal.model.ProjectPreferences; +import org.jboss.tools.common.verification.ui.Messages; +import org.jboss.tools.common.verification.ui.XStudioVerificationPlugin; + +/** +* @author snjeza +* +*/ +public class IncludeResourceHandler extends AbstractHandler { + + /* (non-Javadoc) + * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent) + */ + public Object execute(ExecutionEvent event) throws ExecutionException { + ISelection selection = HandlerUtil.getCurrentSelection(event); + if (selection instanceof IStructuredSelection) { + Iterator iter = ((IStructuredSelection)selection).iterator(); + while (iter.hasNext()) { + Object element = iter.next(); + if ( !(element instanceof IAdaptable)) { + continue; + } + IResource resource = (IResource) ((IAdaptable) element).getAdapter(IResource.class); + if (resource != null) { + includeResource(resource); + } + } + } + return null; + } + + private void includeResource(IResource resource) { + IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + Shell shell = window.getShell(); + boolean include = MessageDialog.openQuestion(shell, Messages.IncludeResourceHandler_Include_Validation, NLS.bind(Messages.IncludeResourceHandler_Are_you_sure_you_want_to_include_all_V2_validators,resource.getName())); + if (!include) { + return; + } + if (resource.getType() == IResource.PROJECT) { + ValidationFramework.getDefault().enableValidation(resource); + } else { + IProject project = resource.getProject(); + MutableProjectSettings projectSettings = ValidationFramework.getDefault().getProjectSettings(project); + projectSettings.setOverride(true); + Validator[] validators = ValManager.getDefault().getValidatorsConfiguredForProject(project, UseProjectPreferences.MustUse); + String resourcePattern = resource.getProjectRelativePath().toString(); + ValidatorMutable[] changedValidator = new ValidatorMutable[validators.length]; + for (int i = 0; i < validators.length; i++) { + ValidatorMutable validator = new ValidatorMutable(validators[i]); + changedValidator[i] = validator; + if (validator.isV2Validator()) { + FilterGroup[] groups = validator.getGroups(); + for (int j = 0; j < groups.length; j++) { + if (groups[j].isExclude()) { + FilterGroup group = groups[j]; + FilterRule[] rules = group.getRules(); + for (int k = 0; k < rules.length; k++) { + FilterRule rule = rules[k]; + String pattern = rule.getPattern(); + String type = rule.getType(); + if (ExtensionConstants.Rule.file.equals(type) && pattern != null && pattern.equals(resourcePattern)) { + group.removeRule(group, rule); + FilterGroup newGroup = FilterGroup.removeRule(group, rule); + validator.replaceFilterGroup(group, newGroup); + } + } + } + } + } + } + ValidationFramework.getDefault().applyChanges(projectSettings, true); + ValidationFramework.getDefault().applyChanges(projectSettings, true); + ProjectPreferences pp = new ProjectPreferences(project, projectSettings.getOverride(), projectSettings.getSuspend(), null); + ValPrefManagerProject vpm = new ValPrefManagerProject(project); + vpm.savePreferences(pp, changedValidator); + } + try { + resource.setPersistentProperty(XStudioVerificationPlugin.RESOURCE_EXCLUDED, null); + } catch (CoreException ignore) { + ignore.printStackTrace(); + } + } + +} Added: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ResourceExcludedExpressionFactoryTester.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ResourceExcludedExpressionFactoryTester.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/actions/ResourceExcludedExpressionFactoryTester.java 2009-07-04 00:43:15 UTC (rev 16382) @@ -0,0 +1,65 @@ +/************************************************************************************* + * Copyright (c) 2008-2009 JBoss by Red Hat and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.common.verification.ui.actions; + +import org.eclipse.core.expressions.PropertyTester; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework; +import org.jboss.tools.common.verification.ui.XStudioVerificationPlugin; + +/** +* @author snjeza +* +*/ +public class ResourceExcludedExpressionFactoryTester extends PropertyTester { + + public static final String RESOURCE_EXCLUDED_EXPRESSION_PROPERTY = "resourceExcluded"; //$NON-NLS-1$ + public static final String RESOURCE_INCLUDED_EXPRESSION_PROPERTY = "resourceIncluded"; //$NON-NLS-1$ + /* (non-Javadoc) + * @see org.eclipse.core.expressions.PropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object) + */ + public boolean test(Object element, String property, Object[] args, Object expectedValue) { + if ( !(element instanceof IAdaptable)) { + return false; + } + IResource resource = (IResource) ((IAdaptable) element).getAdapter(IResource.class); + if (resource == null) { + return false; + } + if (resource instanceof IProject) { + return false; + } + IProject project = resource.getProject(); + if (project == null || !project.exists()) { + return false; + } + Object persistentProperty = null; + try { + if (!FacetedProjectFramework.isFacetedProject(project)) { + return false; + } + persistentProperty = resource.getPersistentProperty(XStudioVerificationPlugin.RESOURCE_EXCLUDED); + } catch (CoreException e) { + return false; + } + if (RESOURCE_EXCLUDED_EXPRESSION_PROPERTY.equals(property)){ + return persistentProperty != null; + } + if (RESOURCE_INCLUDED_EXPRESSION_PROPERTY.equals(property)){ + return persistentProperty == null; + } + return false; + } +} + Modified: trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/messages.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/messages.properties 2009-07-03 20:55:55 UTC (rev 16381) +++ trunk/common/plugins/org.jboss.tools.common.verification.ui/src/org/jboss/tools/common/verification/ui/messages.properties 2009-07-04 00:43:15 UTC (rev 16382) @@ -1,5 +1,9 @@ +ExcludeResourceHandler_Are_you_sure_you_want_to_exclude_all_V2_validators=Are you sure you want to exclude all V2 validators for ''{0}'' +ExcludeResourceHandler_Exclude_validation=Exclude Validation +IncludeResourceHandler_Are_you_sure_you_want_to_include_all_V2_validators=Are you sure you want to include all V2 validators for ''{0}'' +IncludeResourceHandler_Include_Validation=Include Validation SignificanceView_Any=any SignificanceView_GreaterThanN=greater than {0} SignificanceView_OnlyTen=only 10 -SignificanceView_VerificationLevelLabel=Verification Level: +SignificanceView_VerificationLevelLabel=Verification Level\: VerifyWizardView_VerifyTask=Verify {0}