w3c
diff --git a/‎OCFCheckerCopy.java
Copy file name to clipboard
-566Lines changed: 0 additions & 566 deletions b/‎OCFCheckerCopy.java
Copy file name to clipboard
-566Lines changed: 0 additions & 566 deletions
diff --git a/‎XRefChecker_copy.java
Copy file name to clipboard
-608Lines changed: 0 additions & 608 deletions b/‎XRefChecker_copy.java
Copy file name to clipboard
-608Lines changed: 0 additions & 608 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/api/EpubCheck.java
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/main/java/com/adobe/epubcheck/api/EpubCheck.java
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/java/com/adobe/epubcheck/css/CSSHandler.java
Copy file name to clipboard
+10-12Lines changed: 10 additions & 12 deletions b/‎src/main/java/com/adobe/epubcheck/css/CSSHandler.java
Copy file name to clipboard
+10-12Lines changed: 10 additions & 12 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/dict/SearchKeyMapHandler.java
Copy file name to clipboard
+3-5Lines changed: 3 additions & 5 deletions b/‎src/main/java/com/adobe/epubcheck/dict/SearchKeyMapHandler.java
Copy file name to clipboard
+3-5Lines changed: 3 additions & 5 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/dtbook/DTBookHandler.java
Copy file name to clipboard
+13-9Lines changed: 13 additions & 9 deletions b/‎src/main/java/com/adobe/epubcheck/dtbook/DTBookHandler.java
Copy file name to clipboard
+13-9Lines changed: 13 additions & 9 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions b/‎src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/messages/MessageId.java
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎src/main/java/com/adobe/epubcheck/messages/MessageId.java
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/nav/NavHandler.java
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions b/‎src/main/java/com/adobe/epubcheck/nav/NavHandler.java
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/ncx/NCXHandler.java
Copy file name to clipboard
+3-4Lines changed: 3 additions & 4 deletions b/‎src/main/java/com/adobe/epubcheck/ncx/NCXHandler.java
Copy file name to clipboard
+3-4Lines changed: 3 additions & 4 deletions
@@ -32,7 +32,7 @@
 
 import org.w3c.epubcheck.constants.MIMEType;
 import org.w3c.epubcheck.core.Checker;
-import org.w3c.epubcheck.url.URLUtils;
+import org.w3c.epubcheck.util.url.URLUtils;
 
 import com.adobe.epubcheck.messages.MessageId;
 import com.adobe.epubcheck.ocf.OCFChecker;
 
@@ -19,16 +19,15 @@
 import org.idpf.epubcheck.util.css.CssGrammar.CssSelector;
 import org.idpf.epubcheck.util.css.CssGrammar.CssURI;
 import org.idpf.epubcheck.util.css.CssLocation;
-import org.w3c.epubcheck.url.URLChecker;
+import org.w3c.epubcheck.core.references.URLChecker;
+import org.w3c.epubcheck.core.references.Reference;
 
 import com.adobe.epubcheck.api.EPUBLocation;
 import com.adobe.epubcheck.api.Report;
 import com.adobe.epubcheck.messages.MessageId;
 import com.adobe.epubcheck.opf.OPFChecker;
 import com.adobe.epubcheck.opf.OPFChecker30;
 import com.adobe.epubcheck.opf.ValidationContext;
-import com.adobe.epubcheck.opf.XRefChecker;
-import com.adobe.epubcheck.opf.XRefChecker.Type;
 import com.adobe.epubcheck.util.EPUBVersion;
 import com.adobe.epubcheck.util.FeatureEnum;
 import com.adobe.epubcheck.vocab.PackageVocabs;
@@ -42,7 +41,6 @@
 public class CSSHandler implements CssContentHandler, CssErrorHandler
 {
   final ValidationContext context;
-  final XRefChecker xrefChecker;
   final Report report;
   final EPUBVersion version;
   int startingLineNumber = 0; // append to line info from css parser
@@ -69,7 +67,6 @@ public class CSSHandler implements CssContentHandler, CssErrorHandler
   public CSSHandler(ValidationContext context)
   {
     this.context = context;
-    this.xrefChecker = context.xrefChecker.orNull();
     this.report = context.report;
     this.version = context.version;
     this.urlChecker = new URLChecker(context);
@@ -159,7 +156,7 @@ else if (uriOrString.getType() == CssConstruct.Type.STRING)
         }
         if (uri != null)
         {
-          resolveAndRegister(uri, line, col, atRule.toCssString(), Type.GENERIC);
+          resolveAndRegister(uri, line, col, atRule.toCssString(), Reference.Type.GENERIC);
         }
       }
     }
@@ -322,10 +319,10 @@ else if (propertyName.equals("src"))
           if (construct.getType() == CssConstruct.Type.URI)
           {
             URL fontURL = parsedURLs.get(((CssURI) construct).toUriString());
-            if (fontURL != null)
+            if (fontURL != null && context.resourceRegistry.isPresent())
             {
               // check font mimetypes
-              String fontMimeType = xrefChecker.getMimeType(fontURL);
+              String fontMimeType = context.getMimeType(fontURL);
               if (fontMimeType != null)
               {
                 boolean blessed = true;
@@ -367,12 +364,13 @@ private void registerURIs(List<CssConstruct> constructs, int line, int col)
       if (construct.getType() == CssConstruct.Type.URI)
       {
         resolveAndRegister(((CssURI) construct).toUriString(), line, col, construct.toCssString(),
-            inFontFace ? Type.FONT : Type.GENERIC);
+            inFontFace ? Reference.Type.FONT : Reference.Type.GENERIC);
       }
     }
   }
 
-  private void resolveAndRegister(String uriString, int line, int col, String cssContext, Type type)
+  private void resolveAndRegister(String uriString, int line, int col, String cssContext,
+      Reference.Type type)
   {
     if (uriString != null && uriString.trim().length() > 0)
     {
@@ -386,9 +384,9 @@ private void resolveAndRegister(String uriString, int line, int col, String cssC
         URL url = urlChecker.checkURL(uriString, getCorrectedEPUBLocation(line, col, cssContext));
         parsedURLs.put(uriString, url);
 
-        if (url != null)
+        if (url != null && context.referenceRegistry.isPresent())
         {
-          xrefChecker.registerReference(url, type, getCorrectedEPUBLocation(line, col, cssContext));
+          context.referenceRegistry.get().registerReference(url, type, getCorrectedEPUBLocation(line, col, cssContext));
           if (context.isRemote(url))
           {
             detectedProperties.add(ITEM_PROPERTIES.REMOTE_RESOURCES);
 
@@ -1,7 +1,8 @@
 package com.adobe.epubcheck.dict;
 
+import org.w3c.epubcheck.core.references.Reference;
+
 import com.adobe.epubcheck.opf.ValidationContext;
-import com.adobe.epubcheck.opf.XRefChecker.Type;
 import com.adobe.epubcheck.xml.handlers.XMLHandler;
 import com.adobe.epubcheck.xml.model.XMLElement;
 
@@ -39,10 +40,7 @@ else if ("match".equals(name))
   private void processRef()
   {
     URL ref = checkURL(currentElement().getAttribute("href"));
-    if (ref != null && context.xrefChecker.isPresent())
-    {
-      context.xrefChecker.get().registerReference(ref, Type.SEARCH_KEY, location());
-    }
+    registerReference(ref, Reference.Type.SEARCH_KEY);
   }
 
 }
@@ -22,9 +22,10 @@
 
 package com.adobe.epubcheck.dtbook;
 
+import org.w3c.epubcheck.core.references.Reference;
+
 import com.adobe.epubcheck.messages.MessageId;
 import com.adobe.epubcheck.opf.ValidationContext;
-import com.adobe.epubcheck.opf.XRefChecker;
 import com.adobe.epubcheck.util.FeatureEnum;
 import com.adobe.epubcheck.util.URISchemes;
 import com.adobe.epubcheck.xml.handlers.XMLHandler;
@@ -34,12 +35,10 @@
 
 public class DTBookHandler extends XMLHandler
 {
-  private final XRefChecker xrefChecker;
 
   public DTBookHandler(ValidationContext context)
   {
     super(context);
-    this.xrefChecker = context.xrefChecker.get();
   }
 
   @Override
@@ -51,11 +50,15 @@ public void startElement()
     if (ns.equals("https://www.daisy.org/z3986/2005/dtbook/"))
     {
       // Register IDs
-      xrefChecker.registerID(e.getAttribute("id"), XRefChecker.Type.GENERIC, location());
+      if (context.resourceRegistry.isPresent())
+      {
+        context.resourceRegistry.get().registerID(e.getAttribute("id"), Reference.Type.GENERIC,
+            location().url);
+      }
 
       // Check cross-references (link@href | a@href | img@src)
       URL url = null;
-      XRefChecker.Type type = XRefChecker.Type.GENERIC;
+      Reference.Type type = Reference.Type.GENERIC;
       /*
        * This section checks to see if the references used are registered
        * schema-types and whether they point to external resources. The
@@ -68,8 +71,9 @@ public void startElement()
 
         if (url != null && "true".equals(e.getAttribute("external")))
         {
-          //FIXME 2022 check that external attribute is set for remote URLs
-          if (context.isRemote(url)) {
+          // FIXME 2022 check that external attribute is set for remote URLs
+          if (context.isRemote(url))
+          {
             report.info(path, FeatureEnum.REFERENCE, url.toString());
             if (!URISchemes.contains(url.scheme()))
             {
@@ -86,12 +90,12 @@ else if (name.equals("link"))
       else if (name.equals("img"))
       {
         url = checkURL(e.getAttribute("src"));
-        type = XRefChecker.Type.IMAGE;
+        type = Reference.Type.IMAGE;
       }
 
       if (url != null)
       {
-        xrefChecker.registerReference(url, type, location());
+        registerReference(url, type);
         if (context.isRemote(url))
         {
           report.info(path, FeatureEnum.REFERENCE, url.toString());
 
@@ -144,8 +144,8 @@ private void initialize()
     severities.put(MessageId.HTM_058, Severity.ERROR);
 
     // Media
-    severities.put(MessageId.MED_001, Severity.ERROR);
-    severities.put(MessageId.MED_002, Severity.ERROR);
+    severities.put(MessageId.MED_001, Severity.SUPPRESSED);
+    severities.put(MessageId.MED_002, Severity.SUPPRESSED);
     severities.put(MessageId.MED_003, Severity.ERROR);
     severities.put(MessageId.MED_004, Severity.ERROR);
     severities.put(MessageId.MED_005, Severity.ERROR);
@@ -205,7 +205,7 @@ private void initialize()
     severities.put(MessageId.OPF_010, Severity.ERROR);
     severities.put(MessageId.OPF_011, Severity.ERROR);
     severities.put(MessageId.OPF_012, Severity.ERROR);
-    severities.put(MessageId.OPF_013, Severity.ERROR);
+    severities.put(MessageId.OPF_013, Severity.WARNING);
     severities.put(MessageId.OPF_014, Severity.ERROR);
     severities.put(MessageId.OPF_015, Severity.ERROR);
     severities.put(MessageId.OPF_016, Severity.ERROR);
@@ -348,6 +348,7 @@ private void initialize()
     severities.put(MessageId.RSC_029, Severity.ERROR);
     severities.put(MessageId.RSC_030, Severity.ERROR);
     severities.put(MessageId.RSC_031, Severity.WARNING);
+    severities.put(MessageId.RSC_032, Severity.ERROR);
 
     // Scripting
     severities.put(MessageId.SCP_001, Severity.SUPPRESSED); // checking scripts is out of scope
 
@@ -342,6 +342,7 @@ public enum MessageId implements Comparable<MessageId>
   RSC_029("RSC-029"),
   RSC_030("RSC-030"),
   RSC_031("RSC-031"),
+  RSC_032("RSC-032"),
 
   // Messages relating to scripting
   SCP_001("SCP-001"),
 
@@ -3,9 +3,10 @@
 import java.util.EnumSet;
 import java.util.Set;
 
+import org.w3c.epubcheck.core.references.Reference;
+
 import com.adobe.epubcheck.messages.MessageId;
 import com.adobe.epubcheck.opf.ValidationContext;
-import com.adobe.epubcheck.opf.XRefChecker;
 import com.adobe.epubcheck.ops.OPSHandler30;
 import com.adobe.epubcheck.util.EpubConstants;
 import com.adobe.epubcheck.util.FeatureEnum;
@@ -78,12 +79,11 @@ public void startElement()
         // cross-reference checker, to be able to check that they are in reading
         // order
         // after all the Content Documents have been parsed
-        else if ((NavType.TOC__PAGE_LIST.contains(currentNavType)) && xrefChecker.isPresent())
+        else if (NavType.TOC__PAGE_LIST.contains(currentNavType))
         {
-          xrefChecker.get().registerReference(url,
-              (currentNavType == NavType.TOC) ? XRefChecker.Type.NAV_TOC_LINK
-                  : XRefChecker.Type.NAV_PAGELIST_LINK,
-              location());
+          registerReference(url,
+              (currentNavType == NavType.TOC) ? Reference.Type.NAV_TOC_LINK
+                  : Reference.Type.NAV_PAGELIST_LINK);
         }
       }
     }
 
@@ -22,9 +22,10 @@
 
 package com.adobe.epubcheck.ncx;
 
+import org.w3c.epubcheck.core.references.Reference;
+
 import com.adobe.epubcheck.messages.MessageId;
 import com.adobe.epubcheck.opf.ValidationContext;
-import com.adobe.epubcheck.opf.XRefChecker;
 import com.adobe.epubcheck.util.FeatureEnum;
 import com.adobe.epubcheck.xml.handlers.XMLHandler;
 import com.adobe.epubcheck.xml.model.XMLElement;
@@ -33,14 +34,12 @@
 
 public class NCXHandler extends XMLHandler
 {
-  private final XRefChecker xrefChecker;
   private static final String TEXT = "text"; 
   String uid;
 
   public NCXHandler(ValidationContext context)
   {
     super(context);
-    this.xrefChecker = context.xrefChecker.get();
   }
 
   @Override
@@ -76,7 +75,7 @@ public void startElement()
           {
             report.info(path, FeatureEnum.REFERENCE, srcURL.toString());
           }
-          xrefChecker.registerReference(srcURL, XRefChecker.Type.HYPERLINK, location());
+          registerReference(srcURL, Reference.Type.HYPERLINK);
         }
       }
       else if ("meta".equals(name))
Original file line number	Diff line number	Diff line change
`@@ -19,16 +19,15 @@`
`19`	`19`	`import org.idpf.epubcheck.util.css.CssGrammar.CssSelector;`
`20`	`20`	`import org.idpf.epubcheck.util.css.CssGrammar.CssURI;`
`21`	`21`	`import org.idpf.epubcheck.util.css.CssLocation;`
`22`		`-import org.w3c.epubcheck.url.URLChecker;`
	`22`	`+import org.w3c.epubcheck.core.references.URLChecker;`
	`23`	`+import org.w3c.epubcheck.core.references.Reference;`
`23`	`24`
`24`	`25`	`import com.adobe.epubcheck.api.EPUBLocation;`
`25`	`26`	`import com.adobe.epubcheck.api.Report;`
`26`	`27`	`import com.adobe.epubcheck.messages.MessageId;`
`27`	`28`	`import com.adobe.epubcheck.opf.OPFChecker;`
`28`	`29`	`import com.adobe.epubcheck.opf.OPFChecker30;`
`29`	`30`	`import com.adobe.epubcheck.opf.ValidationContext;`
`30`		`-import com.adobe.epubcheck.opf.XRefChecker;`
`31`		`-import com.adobe.epubcheck.opf.XRefChecker.Type;`
`32`	`31`	`import com.adobe.epubcheck.util.EPUBVersion;`
`33`	`32`	`import com.adobe.epubcheck.util.FeatureEnum;`
`34`	`33`	`import com.adobe.epubcheck.vocab.PackageVocabs;`
`@@ -42,7 +41,6 @@`
`42`	`41`	`public class CSSHandler implements CssContentHandler, CssErrorHandler`
`43`	`42`	`{`
`44`	`43`	`final ValidationContext context;`
`45`		`- final XRefChecker xrefChecker;`
`46`	`44`	`final Report report;`
`47`	`45`	`final EPUBVersion version;`
`48`	`46`	`int startingLineNumber = 0; // append to line info from css parser`
`@@ -69,7 +67,6 @@ public class CSSHandler implements CssContentHandler, CssErrorHandler`
`69`	`67`	`public CSSHandler(ValidationContext context)`
`70`	`68`	`{`
`71`	`69`	`this.context = context;`
`72`		`- this.xrefChecker = context.xrefChecker.orNull();`
`73`	`70`	`this.report = context.report;`
`74`	`71`	`this.version = context.version;`
`75`	`72`	`this.urlChecker = new URLChecker(context);`
`@@ -159,7 +156,7 @@ else if (uriOrString.getType() == CssConstruct.Type.STRING)`
`159`	`156`	`}`
`160`	`157`	`if (uri != null)`
`161`	`158`	`{`
`162`		`- resolveAndRegister(uri, line, col, atRule.toCssString(), Type.GENERIC);`
	`159`	`+ resolveAndRegister(uri, line, col, atRule.toCssString(), Reference.Type.GENERIC);`
`163`	`160`	`}`
`164`	`161`	`}`
`165`	`162`	`}`
`@@ -322,10 +319,10 @@ else if (propertyName.equals("src"))`
`322`	`319`	`if (construct.getType() == CssConstruct.Type.URI)`
`323`	`320`	`{`
`324`	`321`	`URL fontURL = parsedURLs.get(((CssURI) construct).toUriString());`
`325`		`- if (fontURL != null)`
	`322`	`+ if (fontURL != null && context.resourceRegistry.isPresent())`
`326`	`323`	`{`
`327`	`324`	`// check font mimetypes`
`328`		`- String fontMimeType = xrefChecker.getMimeType(fontURL);`
	`325`	`+ String fontMimeType = context.getMimeType(fontURL);`
`329`	`326`	`if (fontMimeType != null)`
`330`	`327`	`{`
`331`	`328`	`boolean blessed = true;`
`@@ -367,12 +364,13 @@ private void registerURIs(List<CssConstruct> constructs, int line, int col)`
`367`	`364`	`if (construct.getType() == CssConstruct.Type.URI)`
`368`	`365`	`{`
`369`	`366`	`resolveAndRegister(((CssURI) construct).toUriString(), line, col, construct.toCssString(),`
`370`		`- inFontFace ? Type.FONT : Type.GENERIC);`
	`367`	`+ inFontFace ? Reference.Type.FONT : Reference.Type.GENERIC);`
`371`	`368`	`}`
`372`	`369`	`}`
`373`	`370`	`}`
`374`	`371`
`375`		`- private void resolveAndRegister(String uriString, int line, int col, String cssContext, Type type)`
	`372`	`+ private void resolveAndRegister(String uriString, int line, int col, String cssContext,`
	`373`	`+ Reference.Type type)`
`376`	`374`	`{`
`377`	`375`	`if (uriString != null && uriString.trim().length() > 0)`
`378`	`376`	`{`
`@@ -386,9 +384,9 @@ private void resolveAndRegister(String uriString, int line, int col, String cssC`
`386`	`384`	`URL url = urlChecker.checkURL(uriString, getCorrectedEPUBLocation(line, col, cssContext));`
`387`	`385`	`parsedURLs.put(uriString, url);`
`388`	`386`
`389`		`- if (url != null)`
	`387`	`+ if (url != null && context.referenceRegistry.isPresent())`
`390`	`388`	`{`
`391`		`- xrefChecker.registerReference(url, type, getCorrectedEPUBLocation(line, col, cssContext));`
	`389`	`+ context.referenceRegistry.get().registerReference(url, type, getCorrectedEPUBLocation(line, col, cssContext));`
`392`	`390`	`if (context.isRemote(url))`
`393`	`391`	`{`
`394`	`392`	`detectedProperties.add(ITEM_PROPERTIES.REMOTE_RESOURCES);`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`package com.adobe.epubcheck.dict;`
`2`	`2`
	`3`	`+import org.w3c.epubcheck.core.references.Reference;`
	`4`	`+`
`3`	`5`	`import com.adobe.epubcheck.opf.ValidationContext;`
`4`		`-import com.adobe.epubcheck.opf.XRefChecker.Type;`
`5`	`6`	`import com.adobe.epubcheck.xml.handlers.XMLHandler;`
`6`	`7`	`import com.adobe.epubcheck.xml.model.XMLElement;`
`7`	`8`
`@@ -39,10 +40,7 @@ else if ("match".equals(name))`
`39`	`40`	`private void processRef()`
`40`	`41`	`{`
`41`	`42`	`URL ref = checkURL(currentElement().getAttribute("href"));`
`42`		`- if (ref != null && context.xrefChecker.isPresent())`
`43`		`- {`
`44`		`- context.xrefChecker.get().registerReference(ref, Type.SEARCH_KEY, location());`
`45`		`- }`
	`43`	`+ registerReference(ref, Reference.Type.SEARCH_KEY);`
`46`	`44`	`}`
`47`	`45`
`48`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,10 @@`
`22`	`22`
`23`	`23`	`package com.adobe.epubcheck.ncx;`
`24`	`24`
	`25`	`+import org.w3c.epubcheck.core.references.Reference;`
	`26`	`+`
`25`	`27`	`import com.adobe.epubcheck.messages.MessageId;`
`26`	`28`	`import com.adobe.epubcheck.opf.ValidationContext;`
`27`		`-import com.adobe.epubcheck.opf.XRefChecker;`
`28`	`29`	`import com.adobe.epubcheck.util.FeatureEnum;`
`29`	`30`	`import com.adobe.epubcheck.xml.handlers.XMLHandler;`
`30`	`31`	`import com.adobe.epubcheck.xml.model.XMLElement;`
`@@ -33,14 +34,12 @@`
`33`	`34`
`34`	`35`	`public class NCXHandler extends XMLHandler`
`35`	`36`	`{`
`36`		`- private final XRefChecker xrefChecker;`
`37`	`37`	`private static final String TEXT = "text";`
`38`	`38`	`String uid;`
`39`	`39`
`40`	`40`	`public NCXHandler(ValidationContext context)`
`41`	`41`	`{`
`42`	`42`	`super(context);`
`43`		`- this.xrefChecker = context.xrefChecker.get();`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`@Override`
`@@ -76,7 +75,7 @@ public void startElement()`
`76`	`75`	`{`
`77`	`76`	`report.info(path, FeatureEnum.REFERENCE, srcURL.toString());`
`78`	`77`	`}`
`79`		`- xrefChecker.registerReference(srcURL, XRefChecker.Type.HYPERLINK, location());`
	`78`	`+ registerReference(srcURL, Reference.Type.HYPERLINK);`
`80`	`79`	`}`
`81`	`80`	`}`
`82`	`81`	`else if ("meta".equals(name))`