From 1e67b454efd84a88877205917038da13a47a2f6b Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 9 Nov 2012 09:51:18 +0100 Subject: Create proper constructor for Schema. --- .../c2kernel/persistency/outcome/OutcomeValidator.java | 6 +++--- .../java/com/c2kernel/persistency/outcome/Schema.java | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/c2kernel/persistency') diff --git a/src/main/java/com/c2kernel/persistency/outcome/OutcomeValidator.java b/src/main/java/com/c2kernel/persistency/outcome/OutcomeValidator.java index 73f5706..3355387 100644 --- a/src/main/java/com/c2kernel/persistency/outcome/OutcomeValidator.java +++ b/src/main/java/com/c2kernel/persistency/outcome/OutcomeValidator.java @@ -51,9 +51,9 @@ public class OutcomeValidator implements ErrorHandler, XMLErrorHandler { SymbolTable sym = new SymbolTable(); public static OutcomeValidator getValidator(Schema schema) throws InvalidDataException { - String schemaId = schema.docType+"_"+schema.docVersion; - - if (schemaId.equals("Schema_0")) + + if (schema.docType.equals("Schema") && + schema.docVersion==0) return schemaValid; return new OutcomeValidator(schema); diff --git a/src/main/java/com/c2kernel/persistency/outcome/Schema.java b/src/main/java/com/c2kernel/persistency/outcome/Schema.java index 73969f2..ee1797c 100644 --- a/src/main/java/com/c2kernel/persistency/outcome/Schema.java +++ b/src/main/java/com/c2kernel/persistency/outcome/Schema.java @@ -15,4 +15,19 @@ public class Schema { public int docVersion; public boolean breakApart; public String schema; + + /** + * @param docType + * @param docVersion + * @param breakApart + * @param schema + */ + public Schema(String docType, int docVersion, boolean breakApart, + String schema) { + super(); + this.docType = docType; + this.docVersion = docVersion; + this.breakApart = breakApart; + this.schema = schema; + } } -- cgit v1.2.3