w3c
diff --git a/Collapse file: src/main/java/com/adobe/epubcheck/api/EpubCheck.java
‎src/main/java/com/adobe/epubcheck/api/EpubCheck.java‎
Copy file name to clipboard
+8-8Lines changed: 8 additions & 8 deletions b/Collapse file: src/main/java/com/adobe/epubcheck/api/EpubCheck.java
‎src/main/java/com/adobe/epubcheck/api/EpubCheck.java‎
Copy file name to clipboard
+8-8Lines changed: 8 additions & 8 deletions
diff --git a/Collapse file: src/main/java/com/adobe/epubcheck/api/EpubCheckFactory.java
‎src/main/java/com/adobe/epubcheck/api/EpubCheckFactory.java‎
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/Collapse file: src/main/java/com/adobe/epubcheck/api/EpubCheckFactory.java
‎src/main/java/com/adobe/epubcheck/api/EpubCheckFactory.java‎
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/Collapse file: src/main/java/com/adobe/epubcheck/bitmap/BitmapChecker.java
‎src/main/java/com/adobe/epubcheck/bitmap/BitmapChecker.java‎
Copy file name to clipboard
+30-58Lines changed: 30 additions & 58 deletions b/Collapse file: src/main/java/com/adobe/epubcheck/bitmap/BitmapChecker.java
‎src/main/java/com/adobe/epubcheck/bitmap/BitmapChecker.java‎
Copy file name to clipboard
+30-58Lines changed: 30 additions & 58 deletions
diff --git a/Collapse file: src/main/java/com/adobe/epubcheck/bitmap/BitmapCheckerFactory.java
‎src/main/java/com/adobe/epubcheck/bitmap/BitmapCheckerFactory.java‎
Copy file name to clipboard
-41Lines changed: 0 additions & 41 deletions b/Collapse file: src/main/java/com/adobe/epubcheck/bitmap/BitmapCheckerFactory.java
‎src/main/java/com/adobe/epubcheck/bitmap/BitmapCheckerFactory.java‎
Copy file name to clipboard
-41Lines changed: 0 additions & 41 deletions
diff --git a/Collapse file: src/main/java/com/adobe/epubcheck/css/CSSChecker.java
‎src/main/java/com/adobe/epubcheck/css/CSSChecker.java‎
Copy file name to clipboard
+21-23Lines changed: 21 additions & 23 deletions b/Collapse file: src/main/java/com/adobe/epubcheck/css/CSSChecker.java
‎src/main/java/com/adobe/epubcheck/css/CSSChecker.java‎
Copy file name to clipboard
+21-23Lines changed: 21 additions & 23 deletions
@@ -32,13 +32,14 @@
 import java.util.Properties;
 import java.util.zip.ZipFile;
 
+import org.w3c.epubcheck.constants.MIMEType;
+import org.w3c.epubcheck.core.Checker;
+
 import com.adobe.epubcheck.ctc.CheckManager;
 import com.adobe.epubcheck.messages.MessageId;
 import com.adobe.epubcheck.ocf.OCFChecker;
 import com.adobe.epubcheck.ocf.OCFPackage;
 import com.adobe.epubcheck.ocf.OCFZipPackage;
-import com.adobe.epubcheck.opf.DocumentValidator;
-import com.adobe.epubcheck.opf.OPFData;
 import com.adobe.epubcheck.opf.ValidationContext.ValidationContextBuilder;
 import com.adobe.epubcheck.util.DefaultReportImpl;
 import com.adobe.epubcheck.util.EPUBVersion;
@@ -48,7 +49,7 @@
 /**
  * Public interface to epub validator.
  */
-public class EpubCheck implements DocumentValidator
+public class EpubCheck implements Checker
 {
   private static String VERSION = null;
   private static String BUILD_DATE = null;
@@ -199,10 +200,9 @@ public void setLocale(Locale locale)
   /**
    * Validate the file. Return true if no errors or warnings found.
    */
-  public boolean validate()
+  public void check()
   {
-    int validateResult = doValidate();
-    return validateResult == 0;
+    doValidate();
   }
 
   public int doValidate()
@@ -221,7 +221,7 @@ public int doValidate()
       OCFPackage ocf = new OCFZipPackage(zip);
       OCFChecker checker = new OCFChecker(new ValidationContextBuilder()
           .path(epubFile.getAbsolutePath()).ocf(ocf).report(report).profile(profile).build());
-      checker.runChecks();
+      checker.check();
 
       String extension = ResourceUtil.getExtension(epubFile.getName());
       checkExtension(ocf, extension);
@@ -267,7 +267,7 @@ void checkExtension(OCFPackage ocf, String extension)
         }
         else
         {
-          List<String> opfPaths = ocf.getOcfData().getEntries(OPFData.OPF_MIME_TYPE);
+          List<String> opfPaths = ocf.getOcfData().getEntries(MIMEType.PACKAGE_DOC.toString());
           if (!opfPaths.isEmpty()) {
             if(ocf.getOpfData().get(opfPaths.get(0)).getVersion() == EPUBVersion.VERSION_3) {
               report.message(MessageId.PKG_024, EPUBLocation.create(epubFile.getName(), extension));
 
@@ -25,11 +25,11 @@
 import java.io.File;
 import java.io.IOException;
 
-import com.adobe.epubcheck.opf.DocumentValidator;
-import com.adobe.epubcheck.opf.DocumentValidatorFactory;
+import org.w3c.epubcheck.core.Checker;
+
 import com.adobe.epubcheck.opf.ValidationContext;
 
-public class EpubCheckFactory implements DocumentValidatorFactory
+public class EpubCheckFactory
 {
   static private final EpubCheckFactory instance = new EpubCheckFactory();
 
@@ -38,7 +38,7 @@ static public EpubCheckFactory getInstance()
     return instance;
   }
 
-  public DocumentValidator newInstance(ValidationContext context)
+  public Checker newInstance(ValidationContext context)
   {
     if (context.path.startsWith("https://") || context.path.startsWith("https://"))
     {
 
@@ -34,33 +34,27 @@
 import javax.imageio.stream.ImageInputStream;
 
 import com.adobe.epubcheck.api.EPUBLocation;
-import com.adobe.epubcheck.api.Report;
 import com.adobe.epubcheck.messages.MessageId;
 import com.adobe.epubcheck.ocf.OCFPackage;
 import com.adobe.epubcheck.ocf.OCFZipPackage;
-import com.adobe.epubcheck.opf.ContentChecker;
+import com.adobe.epubcheck.opf.PublicationResourceChecker;
+import com.adobe.epubcheck.opf.ValidationContext;
 import com.adobe.epubcheck.util.CheckUtil;
 
-public class BitmapChecker implements ContentChecker
+public class BitmapChecker extends PublicationResourceChecker
 {
-  private final OCFPackage ocf;
-  private final Report report;
-  private final String path;
-  private final String mimeType;
   private static final int HEIGHT_MAX = 2 * 1080;
   private static final int WIDTH_MAX = 2 * 1920;
   private static final long IMAGESIZE_MAX = 4 * 1024 * 1024;
 
-  BitmapChecker(OCFPackage ocf, Report report, String path, String mimeType)
+  public BitmapChecker(ValidationContext context)
   {
-    this.ocf = ocf;
-    this.report = report;
-    this.path = path;
-    this.mimeType = mimeType;
+    super(context);
   }
 
   private void checkHeader(byte[] header)
   {
+    String mimeType = context.mimeType;
     boolean passed;
     if (mimeType.equals("image/jpeg"))
     {
@@ -77,7 +71,7 @@ else if (mimeType.equals("image/gif"))
     }
     if (!passed)
     {
-      report.message(MessageId.OPF_029, EPUBLocation.create(this.ocf.getName()), path, mimeType);
+      report.message(MessageId.OPF_029, EPUBLocation.create(context.ocf.get().getName()), context.path, mimeType);
     }
   }
 
@@ -92,6 +86,7 @@ else if (mimeType.equals("image/gif"))
   public ImageHeuristics getImageSizes(String imgFileName) throws
       IOException
   {
+    OCFPackage ocf = context.ocf.get();
     int pos = imgFileName.lastIndexOf(".");
     if (pos == -1)
     {
@@ -186,7 +181,7 @@ public ImageHeuristics getImageSizes(String imgFileName) throws
       }
   }
 
-  private File getImageFile(OCFPackage ocf, String imgFileName) throws IOException
+  private static File getImageFile(OCFPackage ocf, String imgFileName) throws IOException
   {
     if (ocf.getClass() == OCFZipPackage.class)
     {
@@ -212,7 +207,7 @@ public ImageHeuristics(int width, int height, long length)
     }
   }
 
-  private File getTempImageFile(OCFZipPackage ocf, String imgFileName) throws IOException
+  private static File getTempImageFile(OCFZipPackage ocf, String imgFileName) throws IOException
   {
     File file = null;
     FileOutputStream os = null;
@@ -283,56 +278,33 @@ private void checkImageDimensions(String imageFileName)
     }
   }
 
-  public void runChecks()
+  @Override
+  protected boolean checkContent()
   {
-    if (!ocf.hasEntry(path))
+    try (InputStream in = context.resourceProvider.getInputStream(context.path))
     {
-      report.message(MessageId.RSC_001, EPUBLocation.create(this.ocf.getName()), path);
-    }
-    else if (!ocf.canDecrypt(path))
-    {
-      report.message(MessageId.RSC_004, EPUBLocation.create(this.ocf.getName()), path);
-    }
-    else
-    {
-      InputStream in = null;
-      try
+      if (in == null)
       {
-        in = ocf.getInputStream(path);
-        if (in == null)
-        {
-          report.message(MessageId.RSC_001, EPUBLocation.create(this.ocf.getName()), path);
-        }
-        byte[] header = new byte[4];
-        int rd = CheckUtil.readBytes(in, header, 0, 4);
-        if (rd < 4)
-        {
-          report.message(MessageId.MED_004, EPUBLocation.create(path));
-        }
-        else
-        {
-          checkHeader(header);
-        }
-        checkImageDimensions(path);
+        report.message(MessageId.RSC_001, EPUBLocation.create(context.path));
+        return false;
       }
-      catch (IOException e)
+      byte[] header = new byte[4];
+      int rd = CheckUtil.readBytes(in, header, 0, 4);
+      if (rd < 4)
       {
-        report.message(MessageId.PKG_021, EPUBLocation.create(path, path));
+        report.message(MessageId.MED_004, EPUBLocation.create(context.path));
       }
-      finally
+      else
       {
-        try
-        {
-          if (in != null)
-          {
-            in.close();
-          }
-        }
-        catch (IOException ignored)
-        {
-          // eat it
-        }
+        checkHeader(header);
       }
+      checkImageDimensions(context.path);
+      return true;
     }
-  }
+    catch (IOException e)
+    {
+      report.message(MessageId.PKG_021, EPUBLocation.create(context.path, context.path));
+      return false;
+    }
+   }
 }
@@ -32,17 +32,12 @@
 import org.idpf.epubcheck.util.css.CssSource;
 
 import com.adobe.epubcheck.api.EPUBLocation;
-import com.adobe.epubcheck.api.Report;
 import com.adobe.epubcheck.messages.MessageId;
-import com.adobe.epubcheck.opf.ContentChecker;
+import com.adobe.epubcheck.opf.PublicationResourceChecker;
 import com.adobe.epubcheck.opf.ValidationContext;
 
-public class CSSChecker implements ContentChecker
+public class CSSChecker extends PublicationResourceChecker
 {
-  private final ValidationContext context;
-  private final Report report;
-  private final String path; // css file path when Mode.FILE, host path when
-                             // Mode.STRING
   private final Mode mode;
 
   // Below only used when checking css strings
@@ -75,27 +70,29 @@ public CSSChecker(ValidationContext context, String value, int line, boolean isS
   private CSSChecker(ValidationContext context, Mode mode, String value, int line,
       boolean isStyleAttribute)
   {
-    this.context = context;
-    this.report = context.report;
-    this.path = context.path;
+    super(context);
     this.mode = mode;
     this.value = value;
     this.line = line;
     this.isStyleAttribute = isStyleAttribute;
   }
+  
+  @Override
+  protected boolean checkPublicationBeforeContent()
+  {
+    if (this.mode == Mode.FILE) {
+      return super.checkPublicationBeforeContent();
+    }
+    return true;
+  }
 
-  public void runChecks()
+  @Override
+  protected boolean checkContent()
   {
     CssSource source = null;
 
     try
     {
-      if (this.mode == Mode.FILE && !context.ocf.get().hasEntry(path))
-      {
-        report.message(MessageId.RSC_001, EPUBLocation.create(context.ocf.get().getName()),
-            path);
-        return;
-      }
 
       CSSHandler handler = new CSSHandler(context);
       if (this.mode == Mode.STRING && this.line > -1)
@@ -109,7 +106,7 @@ public void runChecks()
       this.line = -1;
     } catch (Exception e)
     {
-      report.message(MessageId.PKG_008, EPUBLocation.create(path), e.getMessage());
+      report.message(MessageId.PKG_008, EPUBLocation.create(context.path), e.getMessage());
     } finally
     {
       if (source != null)
@@ -127,6 +124,7 @@ public void runChecks()
         }
       }
     }
+    return true;
   }
 
   CssSource getCssSource()
@@ -135,22 +133,22 @@ CssSource getCssSource()
     CssSource source = null;
     if (this.mode == Mode.FILE)
     {
-      source = new CssSource(this.path, context.resourceProvider.getInputStream(this.path));
+      source = new CssSource(context.path, context.resourceProvider.getInputStream(context.path));
       String charset;
       if (source.getInputStream().getBomCharset().isPresent())
       {
         charset = source.getInputStream().getBomCharset().get().toLowerCase(Locale.ROOT);
         if (!charset.equals("utf-8") && !charset.startsWith("utf-16"))
         {
-          report.message(MessageId.CSS_004, EPUBLocation.create(path), charset);
+          report.message(MessageId.CSS_004, EPUBLocation.create(context.path), charset);
         }
       }
       if (source.getInputStream().getCssCharset().isPresent())
       {
         charset = source.getInputStream().getCssCharset().get().toLowerCase(Locale.ROOT);
         if (!charset.equals("utf-8") && !charset.startsWith("utf-16"))
         {
-          report.message(MessageId.CSS_003, EPUBLocation.create(path, ""), charset);
+          report.message(MessageId.CSS_003, EPUBLocation.create(context.path, ""), charset);
         }
       }
     }
@@ -169,13 +167,13 @@ void parseItem(CssSource source, CSSHandler handler)
       }
       else
       {
-        new CssParser(context.locale).parse(new StringReader(this.value), this.path, handler, handler);
+        new CssParser(context.locale).parse(new StringReader(this.value), context.path, handler, handler);
       }
     }
     else
     {
       new CssParser(context.locale)
-          .parseStyleAttribute(new StringReader(this.value), this.path, handler, handler);
+          .parseStyleAttribute(new StringReader(this.value), context.path, handler, handler);
     }
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,11 @@`
`25`	`25`	`import java.io.File;`
`26`	`26`	`import java.io.IOException;`
`27`	`27`
`28`		`-import com.adobe.epubcheck.opf.DocumentValidator;`
`29`		`-import com.adobe.epubcheck.opf.DocumentValidatorFactory;`
	`28`	`+import org.w3c.epubcheck.core.Checker;`
	`29`	`+`
`30`	`30`	`import com.adobe.epubcheck.opf.ValidationContext;`
`31`	`31`
`32`		`-public class EpubCheckFactory implements DocumentValidatorFactory`
	`32`	`+public class EpubCheckFactory`
`33`	`33`	`{`
`34`	`34`	`static private final EpubCheckFactory instance = new EpubCheckFactory();`
`35`	`35`
`@@ -38,7 +38,7 @@ static public EpubCheckFactory getInstance()`
`38`	`38`	`return instance;`
`39`	`39`	`}`
`40`	`40`
`41`		`- public DocumentValidator newInstance(ValidationContext context)`
	`41`	`+ public Checker newInstance(ValidationContext context)`
`42`	`42`	`{`
`43`	`43`	`if (context.path.startsWith("https://") \|\| context.path.startsWith("https://"))`
`44`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,33 +34,27 @@`
`34`	`34`	`import javax.imageio.stream.ImageInputStream;`
`35`	`35`
`36`	`36`	`import com.adobe.epubcheck.api.EPUBLocation;`
`37`		`-import com.adobe.epubcheck.api.Report;`
`38`	`37`	`import com.adobe.epubcheck.messages.MessageId;`
`39`	`38`	`import com.adobe.epubcheck.ocf.OCFPackage;`
`40`	`39`	`import com.adobe.epubcheck.ocf.OCFZipPackage;`
`41`		`-import com.adobe.epubcheck.opf.ContentChecker;`
	`40`	`+import com.adobe.epubcheck.opf.PublicationResourceChecker;`
	`41`	`+import com.adobe.epubcheck.opf.ValidationContext;`
`42`	`42`	`import com.adobe.epubcheck.util.CheckUtil;`
`43`	`43`
`44`		`-public class BitmapChecker implements ContentChecker`
	`44`	`+public class BitmapChecker extends PublicationResourceChecker`
`45`	`45`	`{`
`46`		`- private final OCFPackage ocf;`
`47`		`- private final Report report;`
`48`		`- private final String path;`
`49`		`- private final String mimeType;`
`50`	`46`	`private static final int HEIGHT_MAX = 2 * 1080;`
`51`	`47`	`private static final int WIDTH_MAX = 2 * 1920;`
`52`	`48`	`private static final long IMAGESIZE_MAX = 4 * 1024 * 1024;`
`53`	`49`
`54`		`- BitmapChecker(OCFPackage ocf, Report report, String path, String mimeType)`
	`50`	`+ public BitmapChecker(ValidationContext context)`
`55`	`51`	`{`
`56`		`- this.ocf = ocf;`
`57`		`- this.report = report;`
`58`		`- this.path = path;`
`59`		`- this.mimeType = mimeType;`
	`52`	`+ super(context);`
`60`	`53`	`}`
`61`	`54`
`62`	`55`	`private void checkHeader(byte[] header)`
`63`	`56`	`{`
	`57`	`+ String mimeType = context.mimeType;`
`64`	`58`	`boolean passed;`
`65`	`59`	`if (mimeType.equals("image/jpeg"))`
`66`	`60`	`{`
`@@ -77,7 +71,7 @@ else if (mimeType.equals("image/gif"))`
`77`	`71`	`}`
`78`	`72`	`if (!passed)`
`79`	`73`	`{`
`80`		`- report.message(MessageId.OPF_029, EPUBLocation.create(this.ocf.getName()), path, mimeType);`
	`74`	`+ report.message(MessageId.OPF_029, EPUBLocation.create(context.ocf.get().getName()), context.path, mimeType);`
`81`	`75`	`}`
`82`	`76`	`}`
`83`	`77`
`@@ -92,6 +86,7 @@ else if (mimeType.equals("image/gif"))`
`92`	`86`	`public ImageHeuristics getImageSizes(String imgFileName) throws`
`93`	`87`	`IOException`
`94`	`88`	`{`
	`89`	`+ OCFPackage ocf = context.ocf.get();`
`95`	`90`	`int pos = imgFileName.lastIndexOf(".");`
`96`	`91`	`if (pos == -1)`
`97`	`92`	`{`
`@@ -186,7 +181,7 @@ public ImageHeuristics getImageSizes(String imgFileName) throws`
`186`	`181`	`}`
`187`	`182`	`}`
`188`	`183`
`189`		`- private File getImageFile(OCFPackage ocf, String imgFileName) throws IOException`
	`184`	`+ private static File getImageFile(OCFPackage ocf, String imgFileName) throws IOException`
`190`	`185`	`{`
`191`	`186`	`if (ocf.getClass() == OCFZipPackage.class)`
`192`	`187`	`{`
`@@ -212,7 +207,7 @@ public ImageHeuristics(int width, int height, long length)`
`212`	`207`	`}`
`213`	`208`	`}`
`214`	`209`
`215`		`- private File getTempImageFile(OCFZipPackage ocf, String imgFileName) throws IOException`
	`210`	`+ private static File getTempImageFile(OCFZipPackage ocf, String imgFileName) throws IOException`
`216`	`211`	`{`
`217`	`212`	`File file = null;`
`218`	`213`	`FileOutputStream os = null;`
`@@ -283,56 +278,33 @@ private void checkImageDimensions(String imageFileName)`
`283`	`278`	`}`
`284`	`279`	`}`
`285`	`280`
`286`		`- public void runChecks()`
	`281`	`+ @Override`
	`282`	`+ protected boolean checkContent()`
`287`	`283`	`{`
`288`		`- if (!ocf.hasEntry(path))`
	`284`	`+ try (InputStream in = context.resourceProvider.getInputStream(context.path))`
`289`	`285`	`{`
`290`		`- report.message(MessageId.RSC_001, EPUBLocation.create(this.ocf.getName()), path);`
`291`		`- }`
`292`		`- else if (!ocf.canDecrypt(path))`
`293`		`- {`
`294`		`- report.message(MessageId.RSC_004, EPUBLocation.create(this.ocf.getName()), path);`
`295`		`- }`
`296`		`- else`
`297`		`- {`
`298`		`- InputStream in = null;`
`299`		`- try`
	`286`	`+ if (in == null)`
`300`	`287`	`{`
`301`		`- in = ocf.getInputStream(path);`
`302`		`- if (in == null)`
`303`		`- {`
`304`		`- report.message(MessageId.RSC_001, EPUBLocation.create(this.ocf.getName()), path);`
`305`		`- }`
`306`		`- byte[] header = new byte[4];`
`307`		`- int rd = CheckUtil.readBytes(in, header, 0, 4);`
`308`		`- if (rd < 4)`
`309`		`- {`
`310`		`- report.message(MessageId.MED_004, EPUBLocation.create(path));`
`311`		`- }`
`312`		`- else`
`313`		`- {`
`314`		`- checkHeader(header);`
`315`		`- }`
`316`		`- checkImageDimensions(path);`
	`288`	`+ report.message(MessageId.RSC_001, EPUBLocation.create(context.path));`
	`289`	`+ return false;`
`317`	`290`	`}`
`318`		`- catch (IOException e)`
	`291`	`+ byte[] header = new byte[4];`
	`292`	`+ int rd = CheckUtil.readBytes(in, header, 0, 4);`
	`293`	`+ if (rd < 4)`
`319`	`294`	`{`
`320`		`- report.message(MessageId.PKG_021, EPUBLocation.create(path, path));`
	`295`	`+ report.message(MessageId.MED_004, EPUBLocation.create(context.path));`
`321`	`296`	`}`
`322`		`- finally`
	`297`	`+ else`
`323`	`298`	`{`
`324`		`- try`
`325`		`- {`
`326`		`- if (in != null)`
`327`		`- {`
`328`		`- in.close();`
`329`		`- }`
`330`		`- }`
`331`		`- catch (IOException ignored)`
`332`		`- {`
`333`		`- // eat it`
`334`		`- }`
	`299`	`+ checkHeader(header);`
`335`	`300`	`}`
	`301`	`+ checkImageDimensions(context.path);`
	`302`	`+ return true;`
`336`	`303`	`}`
`337`		`- }`
	`304`	`+ catch (IOException e)`
	`305`	`+ {`
	`306`	`+ report.message(MessageId.PKG_021, EPUBLocation.create(context.path, context.path));`
	`307`	`+ return false;`
	`308`	`+ }`
	`309`	`+ }`
`338`	`310`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,17 +32,12 @@`
`32`	`32`	`import org.idpf.epubcheck.util.css.CssSource;`
`33`	`33`
`34`	`34`	`import com.adobe.epubcheck.api.EPUBLocation;`
`35`		`-import com.adobe.epubcheck.api.Report;`
`36`	`35`	`import com.adobe.epubcheck.messages.MessageId;`
`37`		`-import com.adobe.epubcheck.opf.ContentChecker;`
	`36`	`+import com.adobe.epubcheck.opf.PublicationResourceChecker;`
`38`	`37`	`import com.adobe.epubcheck.opf.ValidationContext;`
`39`	`38`
`40`		`-public class CSSChecker implements ContentChecker`
	`39`	`+public class CSSChecker extends PublicationResourceChecker`
`41`	`40`	`{`
`42`		`- private final ValidationContext context;`
`43`		`- private final Report report;`
`44`		`- private final String path; // css file path when Mode.FILE, host path when`
`45`		`- // Mode.STRING`
`46`	`41`	`private final Mode mode;`
`47`	`42`
`48`	`43`	`// Below only used when checking css strings`
`@@ -75,27 +70,29 @@ public CSSChecker(ValidationContext context, String value, int line, boolean isS`
`75`	`70`	`private CSSChecker(ValidationContext context, Mode mode, String value, int line,`
`76`	`71`	`boolean isStyleAttribute)`
`77`	`72`	`{`
`78`		`- this.context = context;`
`79`		`- this.report = context.report;`
`80`		`- this.path = context.path;`
	`73`	`+ super(context);`
`81`	`74`	`this.mode = mode;`
`82`	`75`	`this.value = value;`
`83`	`76`	`this.line = line;`
`84`	`77`	`this.isStyleAttribute = isStyleAttribute;`
`85`	`78`	`}`
	`79`	`+`
	`80`	`+ @Override`
	`81`	`+ protected boolean checkPublicationBeforeContent()`
	`82`	`+ {`
	`83`	`+ if (this.mode == Mode.FILE) {`
	`84`	`+ return super.checkPublicationBeforeContent();`
	`85`	`+ }`
	`86`	`+ return true;`
	`87`	`+ }`
`86`	`88`
`87`		`- public void runChecks()`
	`89`	`+ @Override`
	`90`	`+ protected boolean checkContent()`
`88`	`91`	`{`
`89`	`92`	`CssSource source = null;`
`90`	`93`
`91`	`94`	`try`
`92`	`95`	`{`
`93`		`- if (this.mode == Mode.FILE && !context.ocf.get().hasEntry(path))`
`94`		`- {`
`95`		`- report.message(MessageId.RSC_001, EPUBLocation.create(context.ocf.get().getName()),`
`96`		`- path);`
`97`		`- return;`
`98`		`- }`
`99`	`96`
`100`	`97`	`CSSHandler handler = new CSSHandler(context);`
`101`	`98`	`if (this.mode == Mode.STRING && this.line > -1)`
`@@ -109,7 +106,7 @@ public void runChecks()`
`109`	`106`	`this.line = -1;`
`110`	`107`	`} catch (Exception e)`
`111`	`108`	`{`
`112`		`- report.message(MessageId.PKG_008, EPUBLocation.create(path), e.getMessage());`
	`109`	`+ report.message(MessageId.PKG_008, EPUBLocation.create(context.path), e.getMessage());`
`113`	`110`	`} finally`
`114`	`111`	`{`
`115`	`112`	`if (source != null)`
`@@ -127,6 +124,7 @@ public void runChecks()`
`127`	`124`	`}`
`128`	`125`	`}`
`129`	`126`	`}`
	`127`	`+ return true;`
`130`	`128`	`}`
`131`	`129`
`132`	`130`	`CssSource getCssSource()`
`@@ -135,22 +133,22 @@ CssSource getCssSource()`
`135`	`133`	`CssSource source = null;`
`136`	`134`	`if (this.mode == Mode.FILE)`
`137`	`135`	`{`
`138`		`- source = new CssSource(this.path, context.resourceProvider.getInputStream(this.path));`
	`136`	`+ source = new CssSource(context.path, context.resourceProvider.getInputStream(context.path));`
`139`	`137`	`String charset;`
`140`	`138`	`if (source.getInputStream().getBomCharset().isPresent())`
`141`	`139`	`{`
`142`	`140`	`charset = source.getInputStream().getBomCharset().get().toLowerCase(Locale.ROOT);`
`143`	`141`	`if (!charset.equals("utf-8") && !charset.startsWith("utf-16"))`
`144`	`142`	`{`
`145`		`- report.message(MessageId.CSS_004, EPUBLocation.create(path), charset);`
	`143`	`+ report.message(MessageId.CSS_004, EPUBLocation.create(context.path), charset);`
`146`	`144`	`}`
`147`	`145`	`}`
`148`	`146`	`if (source.getInputStream().getCssCharset().isPresent())`
`149`	`147`	`{`
`150`	`148`	`charset = source.getInputStream().getCssCharset().get().toLowerCase(Locale.ROOT);`
`151`	`149`	`if (!charset.equals("utf-8") && !charset.startsWith("utf-16"))`
`152`	`150`	`{`
`153`		`- report.message(MessageId.CSS_003, EPUBLocation.create(path, ""), charset);`
	`151`	`+ report.message(MessageId.CSS_003, EPUBLocation.create(context.path, ""), charset);`
`154`	`152`	`}`
`155`	`153`	`}`
`156`	`154`	`}`
`@@ -169,13 +167,13 @@ void parseItem(CssSource source, CSSHandler handler)`
`169`	`167`	`}`
`170`	`168`	`else`
`171`	`169`	`{`
`172`		`- new CssParser(context.locale).parse(new StringReader(this.value), this.path, handler, handler);`
	`170`	`+ new CssParser(context.locale).parse(new StringReader(this.value), context.path, handler, handler);`
`173`	`171`	`}`
`174`	`172`	`}`
`175`	`173`	`else`
`176`	`174`	`{`
`177`	`175`	`new CssParser(context.locale)`
`178`		`- .parseStyleAttribute(new StringReader(this.value), this.path, handler, handler);`
	`176`	`+ .parseStyleAttribute(new StringReader(this.value), context.path, handler, handler);`
`179`	`177`	`}`
`180`	`178`	`}`
`181`	`179`	`}`