Merge pull request #639 from veraPDF/remove_methods

Remove unnecessary methods

validation-model/src/main/java/org/verapdf/gf/model/impl/containers/StaticContainers.java

@@ -53,7 +53,6 @@ public class StaticContainers {
 	private static final ThreadLocal<Map<COSKey, Set<COSKey>>> destinationToStructParentsMap = new ThreadLocal<>();
 
 	private static final ThreadLocal<Stack<COSKey>> transparencyVisitedContentStreams = new ThreadLocal<>();
-	private static final ThreadLocal<Boolean> validPDF = new ThreadLocal<>();
 
 	private static final ThreadLocal<Map<String, Map<String, Glyph>>> cachedGlyphs = new ThreadLocal<>();
 
@@ -79,7 +78,6 @@ public static void clearAllContainers() {
 		transparencyVisitedContentStreams.set(new Stack<>());
 		cachedGlyphs.set(new HashMap<>());
 		noteIDSet.set(new HashSet<>());
-		validPDF.set(true);
 		lastHeadingNestingLevel.set(0);
 		currentTransparencyColorSpace.set(null);
 		xFormKeysSet.set(new HashSet<>());
@@ -203,14 +201,6 @@ public static void setTransparencyVisitedContentStreams(Stack<COSKey> transparen
 		StaticContainers.transparencyVisitedContentStreams.set(transparencyVisitedContentStreams);
 	}
 
-	public static boolean getValidPDF() {
-		return validPDF.get();
-	}
-
-	public static void setValidPDF(boolean validPDF) {
-		StaticContainers.validPDF.set(validPDF);
-	}
-
 	public static Integer getLastHeadingNestingLevel() {
 		return lastHeadingNestingLevel.get();
 	}

validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosDocument.java

@@ -232,14 +232,6 @@ public Boolean getisLinearized() {
 		return this.isLinearised;
 	}
 
-	/**
-	 * @return true if XMP content matches Info dictionary content
-	 */
-	@Override
-	public Boolean getdoesInfoMatchXMP() {
-		return XMPChecker.doesInfoMatchXMP(cosDocument);
-	}
-
 	@Override
 	public Boolean getMarked() {
 		if (this.catalog != null) {

validation-model/src/main/java/org/verapdf/gf/model/impl/external/GFEmbeddedFile.java

@@ -129,7 +129,7 @@ private static boolean isValidPdfaStream(final InputStream toValidate, final PDF
 		}
 	}
 
-	// We need to save data from StaticContainers before validating embedded
+	// We need to save data from StaticContainers, StaticResources and StaticXmpCoreContainers before validating embedded
 	// documents
 	private PDDocument document;
 	private PDFAFlavour flavour;
@@ -146,7 +146,6 @@ private static boolean isValidPdfaStream(final InputStream toValidate, final PDF
 	private Stack<COSKey> transparencyVisitedContentStreams;
 	private Map<String, PDFont> cachedPDFonts;
 	private Map<String, Map<String, Glyph>> cachedGlyphs;
-	private boolean validPDF;
 	private Integer lastHeadingNestingLevel;
 	private org.verapdf.pd.colors.PDColorSpace currentTransparencyColorSpace;
 
@@ -172,7 +171,6 @@ private void saveStaticContainersState() {
 		this.noteIDSet = StaticContainers.getNoteIDSet();
 		this.xFormKeysSet = StaticContainers.getXFormKeysSet();
 		this.transparencyVisitedContentStreams = StaticContainers.getTransparencyVisitedContentStreams();
-		this.validPDF = StaticContainers.getValidPDF();
 		this.lastHeadingNestingLevel = StaticContainers.getLastHeadingNestingLevel();
 		this.cachedGlyphs = StaticContainers.getCachedGlyphs();
 		this.currentTransparencyColorSpace = StaticContainers.getCurrentTransparencyColorSpace();
@@ -202,7 +200,6 @@ private void restoreSavedSCState() {
 		StaticContainers.setNoteIDSet(this.noteIDSet);
 		StaticContainers.setXFormKeysSet(this.xFormKeysSet);
 		StaticContainers.setTransparencyVisitedContentStreams(this.transparencyVisitedContentStreams);
-		StaticContainers.setValidPDF(this.validPDF);
 		StaticContainers.setLastHeadingNestingLevel(this.lastHeadingNestingLevel);
 		StaticContainers.setCachedGlyphs(this.cachedGlyphs);
 		StaticContainers.setCurrentTransparencyColorSpace(this.currentTransparencyColorSpace);

validation-model/src/main/java/org/verapdf/gf/model/impl/operator/textshow/GFGlyph.java

@@ -178,7 +178,6 @@ private void initForNotType3(boolean fontProgramIsInvalid, FontProgram fontProgr
             }
         } catch (IOException e) {
             LOGGER.log(Level.FINE, "Error in parsing font program", e);
-            StaticContainers.setValidPDF(false);
         }
     }
 

validation-model/src/main/java/org/verapdf/gf/model/impl/operator/textshow/GFOpTextShow.java

@@ -155,7 +155,6 @@ private List<Glyph> getUsedGlyphs() {
 				}
 			} catch (IOException e) {
 				LOGGER.log(Level.FINE, "Error processing text show operator's string argument : " + new String(string), e);
-				StaticContainers.setValidPDF(false);
 			}
 		}
 		return Collections.unmodifiableList(res);

validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDContentStream.java

@@ -137,7 +137,6 @@ protected void parseOperators() {
 					if (key != null) {
 						if (StaticContainers.getTransparencyVisitedContentStreams().contains(key)) {
 							LOGGER.log(Level.FINE, "Parsing content stream loop");
-							StaticContainers.setValidPDF(false);
 							this.containsTransparency = false;
 							this.operators = Collections.emptyList();
 							return;
@@ -171,7 +170,6 @@ protected void parseOperators() {
 				}
 			} catch (IOException e) {
 				LOGGER.log(Level.FINE, "Error while parsing content stream. " + e.getMessage(), e);
-				StaticContainers.setValidPDF(false);
 				this.operators = Collections.emptyList();
 			}
 		}

validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDDocument.java

@@ -126,11 +126,6 @@ public Boolean getcontainsAlternatePresentations() {
         return Boolean.FALSE;
     }
 
-    @Override
-    public Boolean getvalidPDF() {
-        return StaticContainers.getValidPDF();
-    }
-
     @Override
     public Boolean getcontainsAA() {
         return this.catalog != null && this.catalog.getObject().getType().isDictionaryBased() && this.catalog.knownKey(ASAtom.AA);

validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDStructElem.java

@@ -96,15 +96,6 @@ public GFPDStructElem(org.verapdf.pd.structure.PDStructElem structElemDictionary
 		this(structElemDictionary, null, STRUCTURE_ELEMENT_TYPE);
 	}
 
-	/**
-	 * @return Type entry of current structure element
-	 */
-	@Override
-	public String getType() {
-		ASAtom type = ((org.verapdf.pd.structure.PDStructElem) simplePDObject).getType();
-		return type == null ? null : type.getValue();
-	}
-
 	@Override
 	public String getparentStandardType() {
 		org.verapdf.pd.structure.PDStructElem parent = ((org.verapdf.pd.structure.PDStructElem) simplePDObject).getParent();

validation-model/src/main/java/org/verapdf/gf/model/impl/pd/GFPDStructTreeRoot.java

@@ -74,15 +74,6 @@ private List<CosUnicodeName> getRoleMapNames() {
 		return Collections.emptyList();
 	}
 
-	@Override
-	public String gettopLevelFirstElementStandardType() {
-		List<GFPDStructElem> children = getStructuralSignificanceChildren();
-		if (!children.isEmpty()) {
-			return children.get(0).getstandardType();
-		}
-		return null;
-	}
-
 	@Override
 	public String getfirstChildStandardTypeNamespaceURL() {
 		List<GFPDStructElem> children = getStructuralSignificanceChildren();