[129977] commited for NA
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
index d8ea6d5..63ab19c 100644
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
@@ -50,6 +50,7 @@
import org.eclipse.wst.validation.internal.ProjectConfiguration;
import org.eclipse.wst.validation.internal.ValidationRegistryReader;
import org.eclipse.wst.validation.internal.ValidationSelectionHandlerRegistryReader;
+import org.eclipse.wst.validation.internal.operations.ManualIncrementalValidatorsOperation;
import org.eclipse.wst.validation.internal.operations.ManualValidatorsOperation;
import org.eclipse.wst.validation.internal.operations.ValidatorManager;
import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
@@ -619,12 +620,12 @@
new Status(IStatus.CANCEL, "org.eclipse.wst.validation", 0, "OK", null);
ManualValidatorsOperation validOp = null;
- validOp = new ManualValidatorsOperation(project, resources);
-// if (resources == null) {
-// validOp = new ManualValidatorsOperation(project);
-// } else {
-// validOp = new ManualEnabledIncrementalValidatorsOperation(resources, project,false);
-// }
+ //validOp = new ManualValidatorsOperation(project, resources);
+ if (resources == null) {
+ validOp = new ManualValidatorsOperation(project);
+ } else {
+ validOp = new ManualIncrementalValidatorsOperation(project, resources);
+ }
if (validOp.isNecessary(monitor)) {
validOp.run(monitor);
//ResourcesPlugin.getWorkspace().run(validOp, monitor);
@@ -872,4 +873,4 @@
return fileList;
}
-}
\ No newline at end of file
+}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualIncrementalValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualIncrementalValidatorsOperation.java
new file mode 100644
index 0000000..e837ccb
--- /dev/null
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualIncrementalValidatorsOperation.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2001, 2004 IBM Corporation 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:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.validation.internal.operations;
+
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.validation.internal.FilterUtil;
+
+
+/**
+ *
+ * This operation is not intended to be subclassed outside of the validation framework.
+ */
+public class ManualIncrementalValidatorsOperation extends ManualValidatorsOperation {
+
+ public ManualIncrementalValidatorsOperation(IProject project) {
+ super( project );
+ }
+ public ManualIncrementalValidatorsOperation(IProject project, Object[] changedResources) {
+ super( project, changedResources );
+ setFileDeltas( FilterUtil.getFileDeltas(getEnabledValidators(), changedResources, false) );
+ }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualValidatorsOperation.java
index 0dab81d..6acd3ac 100644
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualValidatorsOperation.java
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ManualValidatorsOperation.java
@@ -33,6 +33,7 @@
setEnabledValidators(ValidatorManager.getManager().getManualEnabledValidators(project));
}
public ManualValidatorsOperation(IProject project, Object[] changedResources) {
- super(project, DEFAULT_FORCE, RegistryConstants.ATT_RULE_GROUP_DEFAULT, changedResources, false);
+ super(project, shouldForce(changedResources), RegistryConstants.ATT_RULE_GROUP_DEFAULT, false);
+ setEnabledValidators(ValidatorManager.getManager().getManualEnabledValidators(project));
}
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java
index 4116c73..905d130 100644
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java
@@ -833,7 +833,15 @@
vmd = (ValidatorMetaData) iterator.next();
try {
if( vmd.getValidator() instanceof IValidatorJob ){
- jobValidators.add( vmd );
+ try {
+ delta = getFileDeltas(reporter.getProgressMonitor(), vmd);
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
+ boolean willRun = (isForce() || isValidationNecessary(vmd, delta));
+ if( willRun ){
+ jobValidators.add( vmd );
+ }
}else{
validators.add( vmd );
}
