Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfullbright2012-03-21 16:27:22 -0400
committerpfullbright2012-03-21 16:27:22 -0400
commit206b9030bb3c9c8e334b087690fa17156c740130 (patch)
tree07d2a18d78c60e3d8f0f58de0e172de4537ee6b0
parent61592dcd419834c8b79e6ae66192ff2fc0feab0d (diff)
downloadwebtools.dali-206b9030bb3c9c8e334b087690fa17156c740130.tar.gz
webtools.dali-206b9030bb3c9c8e334b087690fa17156c740130.tar.xz
webtools.dali-206b9030bb3c9c8e334b087690fa17156c740130.zip
moved cancellation check first
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java
index 72ff2b3578..5869fee34f 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java
@@ -129,6 +129,10 @@ public class GenericPackage
// **************** validation ********************************************
public void validate(List<IMessage> messages, IReporter reporter) {
+ if (reporter.isCancelled()) {
+ throw new ValidationCancelledException();
+ }
+
if (getJaxbProject().getSchemaLibrary().getSchema(getNamespace()) == null) {
messages.add(
DefaultValidationMessages.buildMessage(
@@ -137,9 +141,7 @@ public class GenericPackage
new String[] {getNamespace(), this.name},
this));
}
- if (reporter.isCancelled()) {
- throw new ValidationCancelledException();
- }
+
if (this.packageInfo != null) {
this.packageInfo.validate(messages, reporter);
}

Back to the top