Changeset 5370 for CMDIValidator/trunk/cmdi-validator-tool/src/main/java/eu/clarin/cmdi/validator/tool/CMDIValidatorTool.java

Timestamp:

06/18/14 23:13:07 (10 years ago)

Author:

Oliver Schonefeld

Message:

• refactor and remove sub-optimal plugin mechanism in favor of extentions

File:

• CMDIValidator/trunk/cmdi-validator-tool/src/main/java/eu/clarin/cmdi/validator/tool/CMDIValidatorTool.java (modified) (4 diffs)

CMDIValidator/trunk/cmdi-validator-tool/src/main/java/eu/clarin/cmdi/validator/tool/CMDIValidatorTool.java

@@ -5 +5 @@
 import java.io.File;
 import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
@@ -25 +23 @@
 import org.slf4j.LoggerFactory;
 
-import eu.clarin.cmdi.validator.CMDIValidationPluginFactory;
 import eu.clarin.cmdi.validator.CMDIValidator;
 import eu.clarin.cmdi.validator.CMDIValidatorEngine;
@@ -36 +33 @@
 import eu.clarin.cmdi.validator.CMDIValidatorResult.Message;
 import eu.clarin.cmdi.validator.CMDIValidatorResult.Severity;
-import eu.clarin.cmdi.validator.plugins.CheckPidPluginFactory;
+import eu.clarin.cmdi.validator.extensions.CheckHandlesExtension;
 
 
@@ -181 +178 @@
                 }
 
-                List<CMDIValidationPluginFactory> pluginFactories =
-                        new ArrayList<CMDIValidationPluginFactory>();
-                if (checkPids) {
-                    logger.info("performing PID checking");
-                    pluginFactories.add(new CheckPidPluginFactory());
-                }
-
                 final CMDIValidatorFactory factory =
                         CMDIValidatorFactory.newInstance(schemaCacheDir,
                                 schematronFile,
-                                disableSchematron,
-                                pluginFactories);
+                                disableSchematron);
+
+                if (checkPids) {
+                    logger.info("performing PID checking");
+                    factory.registerExtension(
+                            new CheckHandlesExtension(threadCount, true));
+                }
+
 
                 /*