refactor: simplify CSS location getters

Author: rdeltour

src/main/java/com/adobe/epubcheck/css/CSSHandler.java

@@ -19,8 +19,8 @@
 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.core.references.URLChecker;
 import org.w3c.epubcheck.core.references.Reference;
+import org.w3c.epubcheck.core.references.URLChecker;
 
 import com.adobe.epubcheck.api.EPUBLocation;
 import com.adobe.epubcheck.api.Report;
@@ -82,6 +82,13 @@ private EPUBLocation getCorrectedEPUBLocation(int lineNumber, int columnNumber,
     return EPUBLocation.of(context).at(lineNumber, columnNumber).context(details);
   }
 
+  private EPUBLocation getCorrectedEPUBLocation(CssConstruct construct)
+  {
+    int line = correctedLineNumber(construct.getLocation().getLine());
+    int col = correctedColumnNumber(line, construct.getLocation().getColumn());
+    return EPUBLocation.of(context).at(line, col).context(construct.toCssString());
+  }
+
   private int correctedLineNumber(int lineNumber)
   {
     return startingLineNumber + lineNumber;
@@ -274,21 +281,15 @@ public void declaration(CssDeclaration declaration)
         String value = cns.toCssString();
         if (value != null && value.equalsIgnoreCase("fixed"))
         {
-          report.message(MessageId.CSS_006,
-              getCorrectedEPUBLocation(declaration.getLocation().getLine(),
-                  declaration.getLocation().getColumn(), declaration.toCssString()));
+          report.message(MessageId.CSS_006, getCorrectedEPUBLocation(declaration));
         }
       }
     }
     if (version == EPUBVersion.VERSION_3)
     {
       if (propertyName.equals("direction") || propertyName.equals("unicode-bidi"))
       {
-        report
-            .message(MessageId.CSS_001,
-                getCorrectedEPUBLocation(declaration.getLocation().getLine(),
-                    declaration.getLocation().getColumn(), declaration.toCssString()),
-                propertyName);
+        report.message(MessageId.CSS_001, getCorrectedEPUBLocation(declaration), propertyName);
       }
     }
 
@@ -340,10 +341,8 @@ else if (version == EPUBVersion.VERSION_3)
                 }
                 if (!blessed)
                 {
-                  report.message(MessageId.CSS_007,
-                      getCorrectedEPUBLocation(declaration.getLocation().getLine(),
-                          declaration.getLocation().getColumn(), declaration.toCssString()),
-                      fontURL, fontMimeType);
+                  report.message(MessageId.CSS_007, getCorrectedEPUBLocation(declaration), fontURL,
+                      fontMimeType);
                 }
               }