Do Schema parsing in the Schema object rather than the Validator

1 files changed, 2 insertions, 22 deletions

diff --git a/src/main/java/com/c2kernel/persistency/outcome/SchemaValidator.java b/src/main/java/com/c2kernel/persistency/outcome/SchemaValidator.java
index be8564b..fea38b6 100644
--- a/src/main/java/com/c2kernel/persistency/outcome/SchemaValidator.java
+++ b/src/main/java/com/c2kernel/persistency/outcome/SchemaValidator.java
@@ -1,10 +1,6 @@
 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.InputSource;

 

 

 /**************************************************************************

@@ -20,32 +16,16 @@ import org.xml.sax.InputSource;
 

 public class SchemaValidator extends OutcomeValidator {

 

-    org.exolab.castor.xml.schema.Schema castorSchema;

-    /**

-     *

-     */

-

     public SchemaValidator() {

 

     }

 

-    public org.exolab.castor.xml.schema.Schema getSOM() {

-        return castorSchema;

-    }

-

-    /**

-     *

-     */

-

     @Override

 	public synchronized String validate(String outcome) {

         errors = new StringBuffer();

+        Schema schema = new Schema(outcome);

         try {

-            InputSource schemaSource = new InputSource(new StringReader(outcome));

-            SchemaReader mySchemaReader = new SchemaReader(schemaSource);

-            mySchemaReader.setErrorHandler(this);

-            mySchemaReader.setValidation(true);

-            castorSchema = mySchemaReader.read();

+            schema.parse(this);

         } catch (IOException e) {

             errors.append(e.getMessage());

         }