You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2018/02/09 21:07:34 UTC
svn commit: r1823701 - in
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form:
PDButtonTest.java PDSignatureFieldTest.java TestCheckBox.java
TestFields.java TestListBox.java TestRadioButtons.java
Author: msahyoun
Date: Fri Feb 9 21:07:34 2018
New Revision: 1823701
URL: http://svn.apache.org/viewvc?rev=1823701&view=rev
Log:
PDFBOX-4071: remove unused throws declaration; use try-with
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureFieldTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestCheckBox.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestFields.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestListBox.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestRadioButtons.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java?rev=1823701&r1=1823700&r2=1823701&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java Fri Feb 9 21:07:34 2018
@@ -25,6 +25,7 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.MalformedURLException;
import java.net.URL;
import org.apache.pdfbox.cos.COSName;
@@ -107,18 +108,13 @@ public class PDButtonTest
*
* @throws IOException
*/
- public void testRadioButtonWithOptions()
+ public void testRadioButtonWithOptions() throws MalformedURLException
{
- URL url;
- PDDocument pdfDocument = null;
+ URL url = new URL("https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf");
- try
- {
- url = new URL("https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf");
- InputStream is = url.openStream();
-
- pdfDocument = PDDocument.load(is);
-
+ try (InputStream is = url.openStream();
+ PDDocument pdfDocument = PDDocument.load(is))
+ {
PDRadioButton radioButton = (PDRadioButton) pdfDocument.getDocumentCatalog().getAcroForm().getField("Checking/Savings");
radioButton.setValue("Off");
for (PDAnnotationWidget widget : radioButton.getWidgets())
@@ -131,20 +127,6 @@ public class PDButtonTest
{
fail("Unexpected IOException " + e.getMessage());
}
- finally
- {
- if (pdfDocument != null)
- {
- try
- {
- pdfDocument.close();
- }
- catch (IOException e)
- {
- e.printStackTrace();
- }
- }
- }
}
@Test
@@ -157,18 +139,13 @@ public class PDButtonTest
*
* @throws IOException
*/
- public void testOptionsAndNamesNotNumbers()
+ public void testOptionsAndNamesNotNumbers() throws MalformedURLException
{
- URL url;
- PDDocument pdfDocument = null;
+ URL url = new URL("https://issues.apache.org/jira/secure/attachment/12852207/test.pdf");
- try
- {
- url = new URL("https://issues.apache.org/jira/secure/attachment/12852207/test.pdf");
- InputStream is = url.openStream();
-
- pdfDocument = PDDocument.load(is);
-
+ try (InputStream is = url.openStream();
+ PDDocument pdfDocument = PDDocument.load(is))
+ {
pdfDocument.getDocumentCatalog().getAcroForm().getField("RadioButton").setValue("c");
PDRadioButton radioButton = (PDRadioButton) pdfDocument.getDocumentCatalog().getAcroForm().getField("RadioButton");
radioButton.setValue("c");
@@ -185,24 +162,10 @@ public class PDButtonTest
{
fail("Unexpected IOException " + e.getMessage());
}
- finally
- {
- if (pdfDocument != null)
- {
- try
- {
- pdfDocument.close();
- }
- catch (IOException e)
- {
- e.printStackTrace();
- }
- }
- }
}
@Test
- public void retrieveAcrobatCheckBoxProperties() throws IOException
+ public void retrieveAcrobatCheckBoxProperties()
{
PDCheckBox checkbox = (PDCheckBox) acrobatAcroForm.getField("Checkbox");
assertNotNull(checkbox);
@@ -359,7 +322,7 @@ public class PDButtonTest
}
@Test
- public void retrieveAcrobatRadioButtonProperties() throws IOException
+ public void retrieveAcrobatRadioButtonProperties()
{
PDRadioButton radioButton = (PDRadioButton) acrobatAcroForm.getField("RadioButtonGroup");
assertNotNull(radioButton);
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureFieldTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureFieldTest.java?rev=1823701&r1=1823700&r2=1823701&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureFieldTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureFieldTest.java Fri Feb 9 21:07:34 2018
@@ -19,7 +19,6 @@ package org.apache.pdfbox.pdmodel.intera
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -47,7 +46,7 @@ public class PDSignatureFieldTest
}
@Test
- public void createDefaultSignatureField() throws IOException
+ public void createDefaultSignatureField()
{
PDSignatureField sigField = new PDSignatureField(acroForm);
sigField.setPartialName("SignatureField");
@@ -67,7 +66,7 @@ public class PDSignatureFieldTest
}
@Test(expected=UnsupportedOperationException.class)
- public void setValueForAbstractedSignatureField() throws IOException
+ public void setValueForAbstractedSignatureField()
{
PDSignatureField sigField = new PDSignatureField(acroForm);
sigField.setPartialName("SignatureField");
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestCheckBox.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestCheckBox.java?rev=1823701&r1=1823700&r2=1823701&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestCheckBox.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestCheckBox.java Fri Feb 9 21:07:34 2018
@@ -72,10 +72,8 @@ public class TestCheckBox extends TestCa
*/
public void testCheckboxPDModel() throws IOException
{
- PDDocument doc = null;
- try
+ try (PDDocument doc = new PDDocument())
{
- doc = new PDDocument();
PDAcroForm form = new PDAcroForm( doc );
PDCheckBox checkBox = new PDCheckBox(form);
@@ -108,12 +106,5 @@ public class TestCheckBox extends TestCa
// if there is no Opt entry an empty List shall be returned
assertEquals(checkBox.getExportValues(), new ArrayList<String>());
}
- finally
- {
- if( doc != null )
- {
- doc.close();
- }
- }
}
}
\ No newline at end of file
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestFields.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestFields.java?rev=1823701&r1=1823700&r2=1823701&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestFields.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestFields.java Fri Feb 9 21:07:34 2018
@@ -76,10 +76,8 @@ public class TestFields extends TestCase
*/
public void testFlags() throws IOException
{
- PDDocument doc = null;
- try
+ try (PDDocument doc = new PDDocument())
{
- doc = new PDDocument();
PDAcroForm form = new PDAcroForm( doc );
PDTextField textBox = new PDTextField(form);
@@ -115,13 +113,6 @@ public class TestFields extends TestCase
textBox.setComb( true );
assertTrue( textBox.isComb() );
}
- finally
- {
- if( doc != null )
- {
- doc.close();
- }
- }
}
/**
@@ -131,13 +122,9 @@ public class TestFields extends TestCase
* @throws IOException If there is an error creating the field.
*/
public void testAcroFormsBasicFields() throws IOException
- {
- PDDocument doc = null;
-
- try
- {
- doc = PDDocument.load(new File(PATH_OF_PDF));
-
+ {
+ try (PDDocument doc = PDDocument.load(new File(PATH_OF_PDF)))
+ {
// get and assert that there is a form
PDAcroForm form = doc.getDocumentCatalog().getAcroForm();
assertNotNull(form);
@@ -185,13 +172,6 @@ public class TestFields extends TestCase
assertEquals(textField.getValue().length(),145396);
}
- finally
- {
- if( doc != null )
- {
- doc.close();
- }
- }
}
@@ -201,13 +181,9 @@ public class TestFields extends TestCase
* @throws IOException If there is an error loading the form or the field.
*/
public void testWidgetMissingRect() throws IOException
- {
- PDDocument doc = null;
-
- try
- {
- doc = PDDocument.load(new File(PATH_OF_PDF));
-
+ {
+ try (PDDocument doc = PDDocument.load(new File(PATH_OF_PDF)))
+ {
PDAcroForm form = doc.getDocumentCatalog().getAcroForm();
PDTextField textField = (PDTextField)form.getField("TextField-DefaultValue");
@@ -223,12 +199,5 @@ public class TestFields extends TestCase
assertNull(widget.getCOSObject().getDictionaryObject(COSName.AP));
}
- finally
- {
- if( doc != null )
- {
- doc.close();
- }
- }
}
}
\ No newline at end of file
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestListBox.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestListBox.java?rev=1823701&r1=1823700&r2=1823701&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestListBox.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestListBox.java Fri Feb 9 21:07:34 2018
@@ -97,10 +97,8 @@ public class TestListBox extends TestCas
displayValues.add("display01");
displayValues.add("display03");
- PDDocument doc = null;
- try
+ try (PDDocument doc = new PDDocument())
{
- doc = new PDDocument();
PDPage page = new PDPage(PDRectangle.A4);
doc.addPage(page);
PDAcroForm form = new PDAcroForm( doc );
@@ -253,12 +251,5 @@ public class TestListBox extends TestCas
e.getMessage() );
}
}
- finally
- {
- if( doc != null )
- {
- doc.close();
- }
- }
}
}
\ No newline at end of file
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestRadioButtons.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestRadioButtons.java?rev=1823701&r1=1823700&r2=1823701&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestRadioButtons.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestRadioButtons.java Fri Feb 9 21:07:34 2018
@@ -72,10 +72,8 @@ public class TestRadioButtons extends Te
*/
public void testRadioButtonPDModel() throws IOException
{
- PDDocument doc = null;
- try
+ try (PDDocument doc = new PDDocument())
{
- doc = new PDDocument();
PDAcroForm form = new PDAcroForm( doc );
PDRadioButton radioButton = new PDRadioButton(form);
@@ -110,12 +108,5 @@ public class TestRadioButtons extends Te
// if there is no Opt entry an empty List shall be returned
assertEquals(radioButton.getExportValues(), new ArrayList<String>());
}
- finally
- {
- if( doc != null )
- {
- doc.close();
- }
- }
}
}
\ No newline at end of file