Do Schema parsing in the Schema object rather than the Validator

1 files changed, 24 insertions, 0 deletions

diff --git a/src/main/java/com/c2kernel/persistency/outcome/Schema.java b/src/main/java/com/c2kernel/persistency/outcome/Schema.java
index ee1797c..0538233 100644
--- a/src/main/java/com/c2kernel/persistency/outcome/Schema.java
+++ b/src/main/java/com/c2kernel/persistency/outcome/Schema.java
@@ -1,5 +1,12 @@
 package com.c2kernel.persistency.outcome;

 

+import java.io.IOException;

+import java.io.StringReader;

+

+import org.exolab.castor.xml.schema.reader.SchemaReader;

+import org.xml.sax.ErrorHandler;

+import org.xml.sax.InputSource;

+

 /**

  * @author Andrew Branson

  *

@@ -15,6 +22,7 @@ public class Schema {
 	public int docVersion;

 	public boolean breakApart;

 	public String schema;

+	public org.exolab.castor.xml.schema.Schema som;

 	

 	/**

 	 * @param docType

@@ -30,4 +38,20 @@ public class Schema {
 		this.breakApart = breakApart;

 		this.schema = schema;

 	}

+	

+	public Schema(String schema) {

+		this.schema = schema;

 	}

+	

+	public org.exolab.castor.xml.schema.Schema parse(ErrorHandler errorHandler) throws IOException {

+		InputSource schemaSource = new InputSource(new StringReader(schema));

+        SchemaReader mySchemaReader = new SchemaReader(schemaSource);

+        if (errorHandler!= null) {

+        	mySchemaReader.setErrorHandler(errorHandler);

+        	mySchemaReader.setValidation(true);

+        }

+        som = mySchemaReader.read();

+        return som;

+	}

+	

+}