Merge branch '6.7'

FasterXML · Apr 30, 2024 · 7aa010e · 7aa010e
2 parents dbef4a9 + 17a3eb2
commit 7aa010e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -10,6 +10,9 @@ Project: woodstox
 #194: Remove `QNameCreator` compatibility class
 #196: WstxSAXParser error handling when used with JAXB validation
  (reported by @winfriedgerlach)
+
+6.7.0 (not yet released)
+
 #204: Non-conformant `XMLEventFactory.setLocation(null)`
  (fix provided by Stanimir S)
 

diff --git a/src/test/java/wstxtest/evt/TestEventFactoryLocation.java b/src/test/java/wstxtest/evt/TestEventFactoryLocation.java
@@ -61,8 +61,8 @@ private static Matcher<Location> unknownLocation() {
         return locationWithProperties("", "", -1, -1, -1);
     }
 
-    private static Matcher<Location> locationWithProperties(String pubId,
-            String sysId, int charOffset, int row, int col) {
+    private static Matcher<Location> locationWithProperties(final String pubId,
+            final String sysId, final int charOffset, final int row, final int col) {
         return new TypeSafeMatcher<Location>() {
             @Override public void describeTo(Description description) {
                 description.appendText("Location(publicId: ").appendValue(pubId)
@@ -82,7 +82,6 @@ private static Matcher<Location> locationWithProperties(String pubId,
         };
     }
 
-
     static class VolatileLocation implements Location {
         int line;
         int col;
@@ -96,7 +95,4 @@ static class VolatileLocation implements Location {
         @Override public int getColumnNumber() { return col; }
         @Override public int getCharacterOffset() { return -1; }
     }
-
-
 }
-