[464935] Discontinue fast validation re-use.
diff --git a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/PivotResourceValidator.java b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/PivotResourceValidator.java
index c6dc31a..a3fb09b 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/PivotResourceValidator.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src/org/eclipse/ocl/xtext/base/utilities/PivotResourceValidator.java
@@ -92,6 +92,7 @@
}
protected void performValidation(IAcceptor<Issue> acceptor, Resource asResource, CancelIndicator monitor) {
+// System.out.println(Thread.currentThread().getName() + " performValidation " + NameUtil.debugSimpleName(asResource));
Diagnostician diagnostician = getDiagnostician();
Map<Object, Object> context = LabelUtil.createDefaultContext(diagnostician);
List<Resource> resources = asResource.getResourceSet().getResources();
@@ -123,6 +124,7 @@
}
protected void removeValidationDiagnostics(List<Resource.Diagnostic> diagnostics) {
+// System.out.println(Thread.currentThread().getName() + " removeValidationDiagnostics ");
for (int i = diagnostics.size()-1; i >= 0; i--) {
Resource.Diagnostic diagnostic = diagnostics.get(i);
if (diagnostic instanceof ValidationDiagnostic) {
@@ -132,6 +134,7 @@
}
protected void reuseValidation(IAcceptor<Issue> acceptor, Resource asResource, CancelIndicator monitor) {
+// System.out.println(Thread.currentThread().getName() + " reuseValidation " + NameUtil.debugSimpleName(asResource));
ResourceSet resourceSet = asResource.getResourceSet();
if (resourceSet != null) {
for (Resource pResource : resourceSet.getResources()) {
@@ -153,7 +156,7 @@
// FIXME BUG 389675 Remove duplication with respect to inherited method
@Override
public List<Issue> validate(Resource resource, final CheckMode mode, CancelIndicator mon) {
-// System.out.println(Thread.currentThread().getName() + " validate start " + PivotUtil.debugSimpleName(resource));
+// System.out.println(Thread.currentThread().getName() + " validate start " + NameUtil.debugSimpleName(resource));
// System.out.println(new Date() + " Validate " + mode + " : " + csResource.getURI() + " on " + Thread.currentThread().getName());
final CancelIndicator monitor = mon == null ? CancelIndicator.NullImpl : mon;
resolveProxies(resource, monitor);
@@ -238,15 +241,15 @@
if (cs2as != null) {
Resource asResource = cs2as.getASResource();
IAcceptor<Issue> acceptor = createAcceptor(result);
- if (mode.shouldCheck(CheckType.EXPENSIVE)) {
+// if (mode.shouldCheck(CheckType.EXPENSIVE)) {
performValidation(acceptor, asResource, monitor);
- }
- else {
- reuseValidation(acceptor, asResource, monitor);
- }
+// }
+// else {
+// reuseValidation(acceptor, asResource, monitor);
+// }
}
}
-// System.out.println(Thread.currentThread().getName() + " validate end " + PivotUtil.debugSimpleName(resource));
+// System.out.println(Thread.currentThread().getName() + " validate end " + NameUtil.debugSimpleName(resource));
return result;
}
