You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2018/10/10 18:53:23 UTC
svn commit: r1843489 - in /pdfbox/trunk/preflight/src:
main/java/org/apache/pdfbox/preflight/
main/java/org/apache/pdfbox/preflight/parser/
test/java/org/apache/pdfbox/preflight/
Author: tilman
Date: Wed Oct 10 18:53:23 2018
New Revision: 1843489
URL: http://svn.apache.org/viewvc?rev=1843489&view=rev
Log:
PDFBOX-4071: use try-with-resources
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/XmlResultParser.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPDFBox3743.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java?rev=1843489&r1=1843488&r2=1843489&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/Validator_A1b.java Wed Oct 10 18:53:23 2018
@@ -181,10 +181,11 @@ public class Validator_A1b
try
{
parser.parse();
- PreflightDocument document = parser.getPreflightDocument();
- document.validate();
- result = document.getResult();
- document.close();
+ try (PreflightDocument document = parser.getPreflightDocument())
+ {
+ document.validate();
+ result = document.getResult();
+ }
}
catch (SyntaxValidationException e)
{
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/XmlResultParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/XmlResultParser.java?rev=1843489&r1=1843488&r2=1843489&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/XmlResultParser.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/XmlResultParser.java Wed Oct 10 18:53:23 2018
@@ -68,11 +68,12 @@ public class XmlResultParser
try
{
parser.parse();
- PreflightDocument document = parser.getPreflightDocument();
- document.validate();
- pdfType = document.getSpecification().getFname();
- result = document.getResult();
- document.close();
+ try (PreflightDocument document = parser.getPreflightDocument())
+ {
+ document.validate();
+ pdfType = document.getSpecification().getFname();
+ result = document.getResult();
+ }
}
catch (SyntaxValidationException e)
{
Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java?rev=1843489&r1=1843488&r2=1843489&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java Wed Oct 10 18:53:23 2018
@@ -77,18 +77,19 @@ public class Benchmark
long startLTime = System.currentTimeMillis();
PreflightParser parser = new PreflightParser(file);
parser.parse();
- PreflightDocument document = parser.getPreflightDocument();
- document.validate();
- ValidationResult result = document.getResult();
- if (!result.isValid())
+ try (PreflightDocument document = parser.getPreflightDocument())
{
- resFile.write(file.getAbsolutePath() + " isn't PDF/A\n");
- for (ValidationError error : result.getErrorsList())
+ document.validate();
+ ValidationResult result = document.getResult();
+ if (!result.isValid())
{
- resFile.write(error.getErrorCode() + " : " + error.getDetails() + "\n");
+ resFile.write(file.getAbsolutePath() + " isn't PDF/A\n");
+ for (ValidationError error : result.getErrorsList())
+ {
+ resFile.write(error.getErrorCode() + " : " + error.getDetails() + "\n");
+ }
}
}
- document.close();
long endLTime = System.currentTimeMillis();
resFile.write(file.getName() + " (ms) : " + (endLTime - startLTime) + "\n");
resFile.flush();
Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPDFBox3743.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPDFBox3743.java?rev=1843489&r1=1843488&r2=1843489&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPDFBox3743.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPDFBox3743.java Wed Oct 10 18:53:23 2018
@@ -41,10 +41,12 @@ public class TestPDFBox3743
DataSource ds = new FileDataSource("src/test/resources/PDFBOX-3743.pdf");
PreflightParser parser = new PreflightParser(ds);
parser.parse();
- PreflightDocument document = parser.getPreflightDocument();
- document.validate();
- ValidationResult result = document.getResult();
- document.close();
+ ValidationResult result;
+ try (PreflightDocument document = parser.getPreflightDocument())
+ {
+ document.validate();
+ result = document.getResult();
+ }
// Error should be:
// 2.4.3: Invalid Color space, /DeviceGray default for operator "Tj" can't be used without Color Profile