sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 16:58:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[xtext][validation] Propagate cancellation

Browse source 
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=454776

Change-Id: I74f53817f1e8fc6498af4b62f93fb26b2e9e4a88
This commit is contained in:
Sebastian Zarnekow 2014-12-10 18:30:05 +01:00
parent 21c5de639b
commit 298342c6ad
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
plugins/org.eclipse.xtext/src/org/eclipse/xtext/validation/CompositeEValidator.java
View file

@ -13,6 +13,7 @@ import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.emf.common.util.BasicDiagnostic;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.DiagnosticChain;
@ -21,6 +22,7 @@ import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EValidator;
import org.eclipse.emf.ecore.util.EObjectValidator;
import org.eclipse.xtext.service.OperationCanceledError;
import com.google.common.collect.Lists;
import com.google.inject.Inject;
@ -111,6 +113,12 @@ public class CompositeEValidator implements EValidator {
try {
result &= val.getDelegate().validate(eObject, diagnostics, context);
}
catch (OperationCanceledException e) {
throw e;
}
catch (OperationCanceledError e) {
throw e;
}
catch (Exception e) {
logger.error("Error executing EValidator", e);
diagnostics.add(createExceptionDiagnostic("Error executing EValidator", eObject, e));
@ -126,6 +134,12 @@ public class CompositeEValidator implements EValidator {
try {
result &= val.getDelegate().validate(eClass, eObject, diagnostics, context);
}
catch (OperationCanceledException e) {
throw e;
}
catch (OperationCanceledError e) {
throw e;
}
catch (Exception e) {
logger.error("Error executing EValidator", e);
diagnostics.add(createExceptionDiagnostic("Error executing EValidator", eClass, e));
@ -141,6 +155,12 @@ public class CompositeEValidator implements EValidator {
try {
result &= val.getDelegate().validate(eDataType, value, diagnostics, context);
}
catch (OperationCanceledException e) {
throw e;
}
catch (OperationCanceledError e) {
throw e;
}
catch (Exception e) {
logger.error("Error executing EValidator", e);
diagnostics.add(createExceptionDiagnostic("Error executing EValidator", eDataType, e));