Merge pull request #621 from veraPDF/attributes_methods

Update attributes methods
veraPDF · Dec 12, 2023 · 747b253 · 747b253
2 parents ddc80dc + 4c22f52
commit 747b253
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/gfse/GFSEFENote.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/gfse/GFSEFENote.java
@@ -75,6 +75,6 @@ public GFSEFENote(PDStructElem structElemDictionary) {
 
     @Override
     public String getNoteType() {
-        return AttributeHelper.getNoteType(simplePDObject);
+        return AttributeHelper.getNoteType(simpleCOSObject);
     }
 }
diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/gfse/GFSEForm.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/gfse/GFSEForm.java
@@ -41,7 +41,7 @@ public GFSEForm(PDStructElem structElemDictionary) {
 
     @Override
     public String getroleAttribute() {
-        return AttributeHelper.getRole(this.simplePDObject);
+        return AttributeHelper.getRole(this.simpleCOSObject);
     }
 
     @Override

diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/gfse/GFSEL.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/gfse/GFSEL.java
@@ -36,7 +36,7 @@ public GFSEL(PDStructElem structElemDictionary) {
 
     @Override
     public String getListNumbering() {
-        return AttributeHelper.getListNumbering(simplePDObject);
+        return AttributeHelper.getListNumbering(simpleCOSObject);
     }
 
     @Override

diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/gfse/GFSETD.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/gfse/GFSETD.java
@@ -47,7 +47,7 @@ public GFSETD(PDStructElem structElemDictionary) {
 	}
 
 	protected List<String> getHeaders() {
-		COSArray headers = AttributeHelper.getArrayAttributeValue(simplePDObject, ASAtom.HEADERS,
+		COSArray headers = AttributeHelper.getArrayAttributeValue(simpleCOSObject, ASAtom.HEADERS,
 				TaggedPDFConstants.TABLE, null);
 		if (headers != null) {
 			List<String> list = new LinkedList<>();

diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/gfse/GFSETH.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/gfse/GFSETH.java
@@ -45,7 +45,7 @@ protected String getTHID() {
     }
 
     protected String getScope() {
-        return AttributeHelper.getScope(simplePDObject);
+        return AttributeHelper.getScope(simpleCOSObject);
     }
 
     public static String getDefaultScope(int rowNumber, int columnNumber) {

diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/gfse/GFSETableCell.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/pd/gfse/GFSETableCell.java
@@ -38,12 +38,12 @@ public GFSETableCell(PDStructElem structElemDictionary, String standardType, Str
 
     @Override
     public Long getColSpan() {
-        return AttributeHelper.getColSpan(simplePDObject);
+        return AttributeHelper.getColSpan(simpleCOSObject);
     }
 
     @Override
     public Long getRowSpan() {
-        return AttributeHelper.getRowSpan(simplePDObject);
+        return AttributeHelper.getRowSpan(simpleCOSObject);
     }
 
     public int getRowNumber() {

diff --git a/wcag-validation/src/main/java/org/verapdf/gf/model/impl/sa/GFSAAttributesDictionary.java b/wcag-validation/src/main/java/org/verapdf/gf/model/impl/sa/GFSAAttributesDictionary.java
@@ -38,11 +38,11 @@ public GFSAAttributesDictionary(PDStructElem pdStructElem) {
 
 	@Override
 	public long getColSpan() {
-		return AttributeHelper.getColSpan(pdStructElem);
+		return AttributeHelper.getColSpan(pdStructElem.getObject());
 	}
 
 	@Override
 	public long getRowSpan() {
-		return AttributeHelper.getRowSpan(pdStructElem);
+		return AttributeHelper.getRowSpan(pdStructElem.getObject());
 	}
 }
diff --git a/wcag-validation/src/main/java/org/verapdf/gf/model/impl/sa/structelems/GFSAFigure.java b/wcag-validation/src/main/java/org/verapdf/gf/model/impl/sa/structelems/GFSAFigure.java
@@ -36,6 +36,6 @@ public GFSAFigure(PDStructElem structElemDictionary, String parentsStandardTypes
 
     @Override
     public Boolean gethasBBox() {
-        return AttributeHelper.getBBox(this.structElemDictionary) != null;
+        return AttributeHelper.getBBox(this.structElemDictionary.getObject()) != null;
     }
 }