Changeset 5402 for CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/extensions/CheckHandlesExtension.java

Timestamp:

06/27/14 23:41:03 (10 years ago)

Author:

Oliver Schonefeld

Message:

• some more re-factoring and renaming

File:

• CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/extensions/CheckHandlesExtension.java (modified) (10 diffs)

CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/extensions/CheckHandlesExtension.java

@@ -31 +31 @@
 import eu.clarin.cmdi.validator.CMDIValidatorExtension;
 import eu.clarin.cmdi.validator.CMDIValidatorInitException;
-import eu.clarin.cmdi.validator.CMDIValidatorWriteableResult;
+import eu.clarin.cmdi.validator.CMDIWriteableValidationReport;
 import eu.clarin.cmdi.validator.utils.HandleResolver;
-import eu.clarin.cmdi.validator.utils.SaxonLocationUtils;
+import eu.clarin.cmdi.validator.utils.LocationUtils;
 
 public class CheckHandlesExtension extends CMDIValidatorExtension {
@@ -79 +79 @@
 
     @Override
-    public void validate(XdmNode document, CMDIValidatorWriteableResult result)
+    public void validate(final XdmNode document,
+            final CMDIWriteableValidationReport report)
             throws CMDIValidatorException {
         try {
@@ -86 +87 @@
             for (XdmItem item : selector) {
                 String handle = null;
-                final int line   = SaxonLocationUtils.getLineNumber(item);
-                final int column = SaxonLocationUtils.getColumnNumber(item);
+                final int line   = LocationUtils.getLineNumber(item);
+                final int column = LocationUtils.getColumnNumber(item);
                 final String h = item.getStringValue();
                 if (h != null) {
@@ -95 +96 @@
                     } else {
                         if (!handle.equals(h)) {
-                            result.reportWarning(line, column, "handle '" + h +
+                            report.reportWarning(line, column, "handle '" + h +
                                     "' contains leading or tailing spaces " +
                                     "within <ResourceRef> element");
@@ -103 +104 @@
 
                 if (handle != null) {
-                    checkHandleURISyntax(handle, result, line, column);
-                } else {
-                    result.reportError(line, column,
+                    checkHandleURISyntax(report, handle, line, column);
+                } else {
+                    report.reportError(line, column,
                             "invalid handle (<ResourceRef> was empty)");
                 }
@@ -115 +116 @@
 
 
-    private void checkHandleURISyntax(String handle,
-            CMDIValidatorWriteableResult result, int line, int column)
-            throws CMDIValidatorException {
+    private void checkHandleURISyntax(
+            final CMDIWriteableValidationReport report, final String handle,
+            final int line, final int column) throws CMDIValidatorException {
         try {
             final URI uri = new URI(handle);
@@ -128 +129 @@
                     final URI actionableURI =
                             new URI(HDL_PROXY_HTTP, HDL_PROXY_HOST, path, null);
-                    checkHandleResolves(actionableURI, result, line, column);
+                    checkHandleResolves(report, actionableURI, line, column);
                 } catch (URISyntaxException e) {
                     /* should not happen */
@@ -136 +137 @@
             } else if (URN_SCHEME.equals(uri.getScheme())) {
                 if (resolveHandles) {
-                    result.reportInfo(line, column, "PID '" + handle +
+                    report.reportInfo(line, column, "PID '" + handle +
                             "' skipped, because URN resolving is not supported");
                 } else {
-                    result.reportInfo(line, column, "PID '" + handle +
+                    report.reportInfo(line, column, "PID '" + handle +
                             "' skipped, because URN sytax checking is not supported");
                 }
@@ -146 +147 @@
                 if (uri.getHost() != null) {
                     if (!HDL_PROXY_HOST.equalsIgnoreCase(uri.getHost())) {
-                        result.reportError(line, column,
+                        report.reportError(line, column,
                                 "The URI of PID '" + handle +
                                 "' contains an unexpected host part of '" +
                                 uri.getHost() + "'");
                     }
-                    checkHandleResolves(uri, result, line, column);
-                } else {
-                    result.reportError(line, column, "The URI of PID '" +
+                    checkHandleResolves(report, uri, line, column);
+                } else {
+                    report.reportError(line, column, "The URI of PID '" +
                             handle + "' is missing the host part");
                 }
             } else {
                 if (uri.getScheme() != null) {
-                    result.reportError(line, column,
+                    report.reportError(line, column,
                             "The URI of PID '" + handle +
                             "' contains an unexpected schema part of '" +
                             uri.getScheme() + "'");
                 } else {
-                    result.reportError(line, column, "The URI of PID '" +
+                    report.reportError(line, column, "The URI of PID '" +
                             handle + "' is missing a proper schema part");
                 }
             }
         } catch (URISyntaxException e) {
-            result.reportError(line, column, "PID '" + handle +
+            report.reportError(line, column, "PID '" + handle +
                     "' is not a well-formed URI: " + e.getMessage());
         }
@@ -174 +175 @@
 
 
-    private void checkHandleResolves(URI uri,
-            CMDIValidatorWriteableResult result, int line, int column)
-            throws CMDIValidatorException {
+    private void checkHandleResolves(
+            final CMDIWriteableValidationReport result, final URI uri,
+            final int line, final int column) throws CMDIValidatorException {
         if (resolver != null) {
             try {