diff --git a/src/main/java/org/verapdf/pd/structure/PDStructElem.java b/src/main/java/org/verapdf/pd/structure/PDStructElem.java index 783fcd25..015dd274 100644 --- a/src/main/java/org/verapdf/pd/structure/PDStructElem.java +++ b/src/main/java/org/verapdf/pd/structure/PDStructElem.java @@ -116,11 +116,11 @@ public StructureType getDefaultStructureType() { } public static StructureType getDefaultStructureType(StructureType structureType) { - return TaggedPDFHelper.getDefaultStructureType(structureType); + return new TaggedPDFHelper().getDefaultStructureType(structureType); } public String getRoleMapToSameNamespaceTag() { - return TaggedPDFHelper.getRoleMapToSameNamespaceTag(getStructureType()); + return new TaggedPDFHelper().getRoleMapToSameNamespaceTag(getStructureType()); } public static StructureType getStructureElementStandardStructureType(PDStructElem pdStructElem) { diff --git a/src/main/java/org/verapdf/tools/TaggedPDFHelper.java b/src/main/java/org/verapdf/tools/TaggedPDFHelper.java index 2eaddf8e..8bc909f2 100644 --- a/src/main/java/org/verapdf/tools/TaggedPDFHelper.java +++ b/src/main/java/org/verapdf/tools/TaggedPDFHelper.java @@ -165,14 +165,14 @@ public class TaggedPDFHelper { // TaggedPDFConstants.TR)); private static final int MAX_NUMBER_OF_ELEMENTS = 1; - private static final Map> visitedWithNS = new HashMap<>(); - private static final Set visitedWithoutNS = new HashSet<>(); + private final Map> visitedWithNS = new HashMap<>(); + private final Set visitedWithoutNS = new HashSet<>(); - private TaggedPDFHelper() { + public TaggedPDFHelper() { // disable default constructor } - public static StructureType getDefaultStructureType(StructureType type) { + public StructureType getDefaultStructureType(StructureType type) { if (type == null) { return null; } @@ -193,7 +193,7 @@ public static StructureType getDefaultStructureType(StructureType type) { return null; } - public static String getRoleMapToSameNamespaceTag(StructureType type) { + public String getRoleMapToSameNamespaceTag(StructureType type) { if (type == null) { return null; } @@ -224,7 +224,7 @@ public static String getRoleMapToSameNamespaceTag(StructureType type) { return null; } - public static Boolean isCircularMappingExist(StructureType type) { + public Boolean isCircularMappingExist(StructureType type) { if (type == null) { return null; } @@ -288,7 +288,7 @@ public static boolean isStandardType(StructureType type) { } } - private static void addVisited(StructureType type) { + private void addVisited(StructureType type) { ASAtom structType = type.getType(); PDStructureNameSpace nameSpace = type.getNameSpace(); if (nameSpace != null) { @@ -306,7 +306,7 @@ private static void addVisited(StructureType type) { } } - private static boolean isVisited(StructureType type) { + private boolean isVisited(StructureType type) { ASAtom structType = type.getType(); PDStructureNameSpace nameSpace = type.getNameSpace(); if (nameSpace != null) {