diff options
5 files changed, 8 insertions, 102 deletions
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledIncrementalValidatorsOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledIncrementalValidatorsOperation.java index e48dc8454..7fcd3f428 100644 --- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledIncrementalValidatorsOperation.java +++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/EnabledIncrementalValidatorsOperation.java @@ -91,21 +91,6 @@ public class EnabledIncrementalValidatorsOperation extends EnabledValidatorsOper * and all other validators will run in the main thread. If async is false, all validators will * run in the main thread. */ - public EnabledIncrementalValidatorsOperation(IProject project, IResourceDelta delta, boolean async, int buildKind) { - this(project, delta, RegistryConstants.ATT_RULE_GROUP_DEFAULT, async,buildKind); - } - - /** - * IProject must exist and be open. - * - * If delta is null, a full validation of the project using only the incremental validators is - * performed. If delta is not null, all enabled incremental validators that validate resources - * in the delta will validate those resources. - * - * If async is true, all thread-safe validators will run in the background validation thread, - * and all other validators will run in the main thread. If async is false, all validators will - * run in the main thread. - */ public EnabledIncrementalValidatorsOperation(IProject project, IWorkbenchContext context, IResourceDelta delta, boolean async) { this(project,context, delta, RegistryConstants.ATT_RULE_GROUP_DEFAULT, async); } @@ -176,42 +161,6 @@ public class EnabledIncrementalValidatorsOperation extends EnabledValidatorsOper } setDelta(delta); } - - /** - * IProject must exist and be open. - * - * If delta is null, a full validation of the project using only the incremental validators is - * performed. If delta is not null, all enabled incremental validators that validate resources - * in the delta will validate those resources. - * - * If async is true, all thread-safe validators will run in the background validation thread, - * and all other validators will run in the main thread. If async is false, all validators will - * run in the main thread. - * - * The build kind is used for validators query the build type and take appropriate action - */ - public EnabledIncrementalValidatorsOperation(IProject project, IResourceDelta delta, int ruleGroup, boolean async, int buildKind) { - super(project, ruleGroup, shouldForce(delta), async); - try { - ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project); - setEnabledValidators(InternalValidatorManager.wrapInSet(prjp.getEnabledIncrementalValidators(true))); - setBuildKind(buildKind); - } catch (InvocationTargetException exc) { - Logger logger = ValidationPlugin.getPlugin().getMsgLogger(); - if (logger.isLoggingLevel(Level.SEVERE)) { - LogEntry entry = ValidationPlugin.getLogEntry(); - entry.setSourceID("EnabledIncrementalVAlidatorsOperation(IProject<" + project.getName() + ">, IResourceDelta, int, boolean)"); //$NON-NLS-1$ //$NON-NLS-2$ - entry.setTargetException(exc); - logger.write(Level.SEVERE, exc); - - if (exc.getTargetException() != null) { - entry.setTargetException(exc); - logger.write(Level.SEVERE, exc); - } - } - } - setDelta(delta); - } /** * IProject must exist, be open, and contain all of the resources in changedResources. If some diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java index 55def9037..cf2ea0a56 100644 --- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java +++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java @@ -177,7 +177,7 @@ public class ValidationBuilder extends IncrementalProjectBuilder { // and a null delta, and validation should run in that case. if (!doFullBuild && delta == null) { if (isReferencedProjectInDelta(referenced)) { - performFullBuildForReferencedProjectChanged(monitor, prjp,kind); + performFullBuildForReferencedProjectChanged(monitor, prjp); } else { String[] msgParms = new String[]{project.getName()}; monitor.subTask(ResourceHandler.getExternalizedMessage(ResourceConstants.VBF_STATUS_NULL_DELTA, msgParms)); @@ -192,7 +192,7 @@ public class ValidationBuilder extends IncrementalProjectBuilder { return referenced; } if (doFullBuild) { - performFullBuild(monitor, prjp, kind); + performFullBuild(monitor, prjp); } else { if (doAutoBuild && !prjp.isAutoValidate()) { executionMap |= 0x8; @@ -200,12 +200,12 @@ public class ValidationBuilder extends IncrementalProjectBuilder { } if (delta.getAffectedChildren().length == 0) { if (isReferencedProjectInDelta(referenced)) - performFullBuildForReferencedProjectChanged(monitor, prjp,kind); + performFullBuildForReferencedProjectChanged(monitor, prjp); else executionMap |= 0x10; return referenced; } - EnabledIncrementalValidatorsOperation operation = new EnabledIncrementalValidatorsOperation(project, delta, prjp.runAsync(),kind); + EnabledIncrementalValidatorsOperation operation = new EnabledIncrementalValidatorsOperation(project, delta, prjp.runAsync()); operation.run(monitor); } return referenced; @@ -246,28 +246,14 @@ public class ValidationBuilder extends IncrementalProjectBuilder { * @param monitor * @param prjp */ - private void performFullBuildForReferencedProjectChanged(IProgressMonitor monitor, ProjectConfiguration prjp, int buildKind) throws InvocationTargetException { - performFullBuild(monitor, prjp, true,buildKind); + private void performFullBuildForReferencedProjectChanged(IProgressMonitor monitor, ProjectConfiguration prjp) throws InvocationTargetException { + performFullBuild(monitor, prjp, true); } private void performFullBuild(IProgressMonitor monitor, ProjectConfiguration prjp) throws InvocationTargetException { performFullBuild(monitor, prjp, false); } - - private void performFullBuild(IProgressMonitor monitor, ProjectConfiguration prjp, int buildKind) throws InvocationTargetException { - performFullBuild(monitor, prjp, false, buildKind); - } - private void performFullBuild(IProgressMonitor monitor, ProjectConfiguration prjp, boolean onlyDependentValidators, int buildKind) throws InvocationTargetException { - ValidatorMetaData[] enabledValidators = prjp.getEnabledFullBuildValidators(true, onlyDependentValidators); - if ((enabledValidators != null) && (enabledValidators.length > 0)) { - Set enabledValidatorsSet = InternalValidatorManager.wrapInSet(enabledValidators); - EnabledValidatorsOperation op = new EnabledValidatorsOperation(getProject(), enabledValidatorsSet, prjp.runAsync()); - op.setBuildKind(buildKind); - op.run(monitor); - } - } - private void performFullBuild(IProgressMonitor monitor, ProjectConfiguration prjp, boolean onlyDependentValidators) throws InvocationTargetException { ValidatorMetaData[] enabledValidators = prjp.getEnabledFullBuildValidators(true, onlyDependentValidators); if ((enabledValidators != null) && (enabledValidators.length > 0)) { 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 23d8ffc24..c437ef1af 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 @@ -95,7 +95,6 @@ public abstract class ValidationOperation implements IWorkspaceRunnable, IHeadle // option was triggered. This value is cached so that validation can be run // either from a builder, or from a menu item. (The Operation interface // doesn't allow any parameter on execute except the IProgressMonitor.) - protected int buildKind = 0; private Set _enabledValidators = null; private boolean _force = DEFAULT_FORCE; // force this operation to run even // if it doesn't need to? @@ -903,7 +902,6 @@ public abstract class ValidationOperation implements IWorkspaceRunnable, IHeadle try { context = vmd.getHelper(getProject()); initValidateContext(delta); - validator = vmd.getValidator(); } catch (InstantiationException exc) { // Remove the vmd from the reader's list @@ -936,15 +934,13 @@ public abstract class ValidationOperation implements IWorkspaceRunnable, IHeadle private void initValidateContext(IFileDelta[] delta) { if (context instanceof WorkbenchContext) { - ((WorkbenchContext)context).setBuildKind(getBuildKind()); ((WorkbenchContext)context).setValidationFileURIs(new ArrayList()); for(int i = 0; i < delta.length; i++) { IFileDelta file = delta[i]; if(file.getDeltaType() != IFileDelta.DELETED ) { ((WorkbenchContext)context).getValidationFileURIs().add(file.getFileName()); } - } - + } } } @@ -1456,12 +1452,4 @@ public abstract class ValidationOperation implements IWorkspaceRunnable, IHeadle public void setContext(IWorkbenchContext context) { this.context = context; } - - public int getBuildKind() { - return buildKind; - } - - public void setBuildKind(int buildKind) { - this.buildKind = buildKind; - } }
\ No newline at end of file diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchContext.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchContext.java index 4071d283b..58b281fec 100644 --- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchContext.java +++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchContext.java @@ -47,7 +47,6 @@ public class WorkbenchContext implements IWorkbenchContext { // private static final IContainer[] NO_CONTAINERS = new IContainer[0]; public static final String VALIDATION_MARKER = "com.ibm.etools.validation.problemmarker"; //$NON-NLS-1$ public static final String VALIDATION_MARKER_OWNER = "owner"; //$NON-NLS-1$ - public int buildKind = 0; public WorkbenchContext() { super(); @@ -788,12 +787,4 @@ public class WorkbenchContext implements IWorkbenchContext { public void setValidationFileURIs(List validationFileURIs) { this.validationFileURIs = validationFileURIs; } - - public int getBuildKind() { - return buildKind; - } - - public void setBuildKind(int kind) { - buildKind = kind; - } }
\ No newline at end of file diff --git a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.java b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.java index 5187db0f7..135a80fa1 100644 --- a/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.java +++ b/plugins/org.eclipse.wst.validation/validate_core/org/eclipse/wst/validation/internal/provisional/core/IValidationContext.java @@ -80,13 +80,5 @@ public interface IValidationContext { */ public String[] getURIs(); - - /** - * @return - The int value of the build kind that is being performed currently by the - * workbench so validators can react accordingly. Validator do have the requirement - * to know the build kind to perform actions specific to the validator. Default value - * returned is 0. - */ - - public int getBuildKind(); + }
\ No newline at end of file |