[247859] Order of the validationStarting/Finishing(null) calls is still wrong (part b)
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 c88a1fe..e7470e3 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
@@ -68,9 +68,6 @@
*/
public static final Object FAMILY_VALIDATION_JOB = new Object();
- /** The job that waits to issue the final clean up. */
- public static final Object FamilyValidationFinishedJob = new Object();
-
public ValidationBuilder() {
}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperationJob.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperationJob.java
deleted file mode 100644
index 48d89ed..0000000
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValOperationJob.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 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;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.model.IValidatorVisitor;
-import org.eclipse.wst.validation.internal.operations.ValidationBuilder;
-
-/**
- * This is used to signal when the entire validation operation is complete. This needs to be done in a job
- * because the operation isn't done, until all the validation jobs have finished.
- * @author karasiuk
- *
- */
-public final class ValOperationJob extends Job {
-
- private final ValOperation _operation;
-
- public ValOperationJob(ValOperation operation){
- super(ValMessages.JobNameMonitor);
- _operation = operation;
- }
-
- @Override
- public boolean belongsTo(Object family) {
- if (family == ValidationBuilder.FamilyValidationFinishedJob){
- return true;
- }
-
- return super.belongsTo(family);
- }
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- boolean ok = true;
- try {
- ValidationFramework.getDefault().join(monitor);
- }
- catch (InterruptedException e){
- ok = false;
- }
- finished(monitor);
- return ok ? Status.OK_STATUS : Status.CANCEL_STATUS;
- }
-
- private void finished(IProgressMonitor monitor){
- IValidatorVisitor visitor = new IValidatorVisitor(){
-
- public void visit(Validator validator, IProject project, ValType valType,
- ValOperation operation, IProgressMonitor monitor) {
-
- validator.validationFinishing(project, operation.getState(), monitor);
- }
-
- };
- ValManager.getDefault().accept(visitor, null, ValType.Build, _operation, monitor);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationResultSummary.java b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationResultSummary.java
index d8edf9b..9e91217 100644
--- a/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationResultSummary.java
+++ b/plugins/org.eclipse.wst.validation/vf2/org/eclipse/wst/validation/internal/ValidationResultSummary.java
@@ -11,7 +11,7 @@
package org.eclipse.wst.validation.internal;
/**
- * An immutable object that holds a summari of the validation.
+ * An immutable object that holds a summary of the validation.
* @author karasiuk
*
*/
