Skip to content

Commit 8266a46

Browse files
ars18wrwars18wrw
committed
Remove method duplucation
1 parent 75d858e commit 8266a46

File tree

12 files changed

+101
-110
lines changed

12 files changed

+101
-110
lines changed

‎kernel/src/main/java/com/itextpdf/kernel/pdf/PdfDocument.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ public PdfPage removePage(int pageNum) {
507507
*
508508
* @return document information dictionary.
509509
*/
510-
public PdfDocumentInfo getInfo() {
510+
public PdfDocumentInfo getDocumentInfo() {
511511
checkClosingStatus();
512512
return info;
513513
}
@@ -619,16 +619,6 @@ public PdfCatalog getCatalog() {
619619
return catalog;
620620
}
621621

622-
/**
623-
* Gets PDF document info.
624-
*
625-
* @return PDF document info.
626-
*/
627-
public PdfDocumentInfo getDocumentInfo() {
628-
checkClosingStatus();
629-
return info;
630-
}
631-
632622
/**
633623
* Close PDF document.
634624
*/

‎kernel/src/main/java/com/itextpdf/kernel/utils/CompareTool.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ public String compareDocumentInfo(String outPdf, String cmpPdf, byte[] outPass,
233233
String message = null;
234234
PdfDocument outDocument = new PdfDocument(new PdfReader(outPdf, outPass));
235235
PdfDocument cmpDocument = new PdfDocument(new PdfReader(cmpPdf, cmpPass));
236-
String[] cmpInfo = convertInfo(cmpDocument.getInfo());
237-
String[] outInfo = convertInfo(outDocument.getInfo());
236+
String[] cmpInfo = convertInfo(cmpDocument.getDocumentInfo());
237+
String[] outInfo = convertInfo(outDocument.getDocumentInfo());
238238
for (int i = 0; i < cmpInfo.length; ++i) {
239239
if (!cmpInfo[i].equals(outInfo[i])){
240240
message = "Document info fail";

‎kernel/src/test/java/com/itextpdf/kernel/pdf/PdfCopyTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void copying1() throws IOException {
5858
FileOutputStream fos1 = new FileOutputStream(destinationFolder + "copying1_1.pdf");
5959
PdfWriter writer1 = new PdfWriter(fos1);
6060
PdfDocument pdfDoc1 = new PdfDocument(writer1);
61-
pdfDoc1.getInfo().setAuthor("Alexander Chingarev").
61+
pdfDoc1.getDocumentInfo().setAuthor("Alexander Chingarev").
6262
setCreator("iText 6").
6363
setTitle("Empty iText 6 Document");
6464
pdfDoc1.getCatalog().getPdfObject().put(new PdfName("a"), new PdfName("b").makeIndirect(pdfDoc1));
@@ -74,7 +74,7 @@ public void copying1() throws IOException {
7474
PdfWriter writer2 = new PdfWriter(fos2);
7575
PdfDocument pdfDoc2 = new PdfDocument(writer2);
7676
pdfDoc2.addNewPage();
77-
pdfDoc2.getInfo().getPdfObject().put(new PdfName("a"), pdfDoc1.getCatalog().getPdfObject().get(new PdfName("a")).copyTo(pdfDoc2));
77+
pdfDoc2.getDocumentInfo().getPdfObject().put(new PdfName("a"), pdfDoc1.getCatalog().getPdfObject().get(new PdfName("a")).copyTo(pdfDoc2));
7878
pdfDoc2.close();
7979
pdfDoc1.close();
8080

‎kernel/src/test/java/com/itextpdf/kernel/pdf/PdfEncryptionTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void encryptWithPassword(String filename, int encryptionType, int compres
9898
writer.setCompressionLevel(compression);
9999
writer.setEncryption(USER, OWNER, permissions, encryptionType);
100100
PdfDocument document = new PdfDocument(writer);
101-
document.getInfo().setAuthor(author).
101+
document.getDocumentInfo().setAuthor(author).
102102
setCreator(creator);
103103
document.setXmpMetadata();
104104
PdfPage page = document.addNewPage();
@@ -128,8 +128,8 @@ public void iText7Decrypt(String src, byte[] password, String pageContent) throw
128128
PdfPage page = document.getPage(1);
129129

130130
Assert.assertTrue("Expected content: \n" + pageContent, new String(page.getStreamBytes(0)).contains(pageContent));
131-
Assert.assertEquals("Encrypted author", author, document.getInfo().getAuthor());
132-
Assert.assertEquals("Encrypted creator", creator, document.getInfo().getCreator());
131+
Assert.assertEquals("Encrypted author", author, document.getDocumentInfo().getAuthor());
132+
Assert.assertEquals("Encrypted creator", creator, document.getDocumentInfo().getCreator());
133133

134134
document.close();
135135
}

‎kernel/src/test/java/com/itextpdf/kernel/pdf/PdfReaderTest.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ public void openSimpleDoc() throws IOException {
4646
FileOutputStream fos = new FileOutputStream(filename);
4747
PdfWriter writer = new PdfWriter(fos);
4848
PdfDocument pdfDoc = new PdfDocument(writer);
49-
pdfDoc.getInfo().setAuthor(author).
49+
pdfDoc.getDocumentInfo().setAuthor(author).
5050
setCreator(creator).
5151
setTitle(title);
5252
pdfDoc.addNewPage();
5353
pdfDoc.close();
5454

5555
com.itextpdf.kernel.pdf.PdfReader reader = new com.itextpdf.kernel.pdf.PdfReader(new FileInputStream(filename));
5656
pdfDoc = new PdfDocument(reader);
57-
Assert.assertEquals(author, pdfDoc.getInfo().getAuthor());
58-
Assert.assertEquals(creator, pdfDoc.getInfo().getCreator());
59-
Assert.assertEquals(title, pdfDoc.getInfo().getTitle());
57+
Assert.assertEquals(author, pdfDoc.getDocumentInfo().getAuthor());
58+
Assert.assertEquals(creator, pdfDoc.getDocumentInfo().getCreator());
59+
Assert.assertEquals(title, pdfDoc.getDocumentInfo().getTitle());
6060
PdfObject object = pdfDoc.getPdfObject(1);
6161
Assert.assertEquals(PdfObject.Dictionary, object.getType());
6262
Assert.assertTrue(objectTypeEqualTo(object, PdfName.Catalog));
@@ -879,9 +879,9 @@ public void fixPdfTest08() throws IOException {
879879
PdfDocument document = new PdfDocument(reader);
880880
Assert.assertTrue("Need rebuildXref()", reader.hasRebuiltXref());
881881

882-
Assert.assertEquals(author, document.getInfo().getAuthor());
883-
Assert.assertEquals(creator, document.getInfo().getCreator());
884-
Assert.assertEquals(title, document.getInfo().getTitle());
882+
Assert.assertEquals(author, document.getDocumentInfo().getAuthor());
883+
Assert.assertEquals(creator, document.getDocumentInfo().getCreator());
884+
Assert.assertEquals(title, document.getDocumentInfo().getTitle());
885885

886886
int pageCount = document.getNumberOfPages();
887887
Assert.assertEquals(10, pageCount);
@@ -904,9 +904,9 @@ public void fixPdfTest09() throws IOException {
904904
PdfDocument document = new PdfDocument(reader);
905905
Assert.assertTrue("Need rebuildXref()", reader.hasRebuiltXref());
906906

907-
Assert.assertEquals(author, document.getInfo().getAuthor());
908-
Assert.assertEquals(creator, document.getInfo().getCreator());
909-
Assert.assertEquals(title, document.getInfo().getTitle());
907+
Assert.assertEquals(author, document.getDocumentInfo().getAuthor());
908+
Assert.assertEquals(creator, document.getDocumentInfo().getCreator());
909+
Assert.assertEquals(title, document.getDocumentInfo().getTitle());
910910

911911
int pageCount = document.getNumberOfPages();
912912
Assert.assertEquals(10, pageCount);
@@ -931,9 +931,9 @@ public void fixPdfTest10() throws IOException {
931931
Assert.assertFalse("No need in fixXref()", reader.hasFixedXref());
932932
Assert.assertFalse("No need in rebuildXref()", reader.hasRebuiltXref());
933933

934-
Assert.assertEquals(null, document.getInfo().getAuthor());
935-
Assert.assertEquals(null, document.getInfo().getCreator());
936-
Assert.assertEquals(null, document.getInfo().getTitle());
934+
Assert.assertEquals(null, document.getDocumentInfo().getAuthor());
935+
Assert.assertEquals(null, document.getDocumentInfo().getCreator());
936+
Assert.assertEquals(null, document.getDocumentInfo().getTitle());
937937

938938
int pageCount = document.getNumberOfPages();
939939
Assert.assertEquals(10, pageCount);

‎kernel/src/test/java/com/itextpdf/kernel/pdf/PdfStampingTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void stamping1() throws IOException {
3636
FileOutputStream fos1 = new FileOutputStream(filename1);
3737
PdfWriter writer1 = new PdfWriter(fos1);
3838
PdfDocument pdfDoc1 = new PdfDocument(writer1);
39-
pdfDoc1.getInfo().setAuthor("Alexander Chingarev").
39+
pdfDoc1.getDocumentInfo().setAuthor("Alexander Chingarev").
4040
setCreator("iText 6").
4141
setTitle("Empty iText 6 Document");
4242
PdfPage page1 = pdfDoc1.addNewPage();
@@ -49,7 +49,7 @@ public void stamping1() throws IOException {
4949
FileOutputStream fos2 = new FileOutputStream(filename2);
5050
PdfWriter writer2 = new PdfWriter(fos2);
5151
PdfDocument pdfDoc2 = new PdfDocument(reader2, writer2);
52-
pdfDoc2.getInfo().setCreator("iText 7").setTitle("Empty iText 7 Document");
52+
pdfDoc2.getDocumentInfo().setCreator("iText 7").setTitle("Empty iText 7 Document");
5353
pdfDoc2.close();
5454

5555
PdfReader reader3 = new PdfReader(new FileInputStream(filename2));
@@ -71,7 +71,7 @@ public void stamping1() throws IOException {
7171
assertEquals("iText 7", creator.toString());
7272
byte[] bytes = document.getPage(1).getContentBytes();
7373
assertEquals("%Hello World\n", new String(bytes));
74-
String date = document.getInfo().getPdfObject().getAsString(PdfName.ModDate).getValue();
74+
String date = document.getDocumentInfo().getPdfObject().getAsString(PdfName.ModDate).getValue();
7575
Calendar cl = PdfDate.decode(date);
7676
long diff = new GregorianCalendar().getTimeInMillis() - cl.getTimeInMillis();
7777
String message = "Unexpected creation date. Different from now is " + (float) diff / 1000 + "s";
@@ -843,7 +843,7 @@ public void stampingAppend1() throws IOException {
843843
FileOutputStream fos1 = new FileOutputStream(filename1);
844844
PdfWriter writer1 = new PdfWriter(fos1);
845845
PdfDocument pdfDoc1 = new PdfDocument(writer1);
846-
pdfDoc1.getInfo().setAuthor("Alexander Chingarev").
846+
pdfDoc1.getDocumentInfo().setAuthor("Alexander Chingarev").
847847
setCreator("iText 6").
848848
setTitle("Empty iText 6 Document");
849849
PdfPage page1 = pdfDoc1.addNewPage();
@@ -856,8 +856,8 @@ public void stampingAppend1() throws IOException {
856856
FileOutputStream fos2 = new FileOutputStream(filename2);
857857
PdfWriter writer2 = new PdfWriter(fos2);
858858
PdfDocument pdfDoc2 = new PdfDocument(reader2, writer2, true);
859-
pdfDoc2.getInfo().setCreator("iText 7").setTitle("Empty iText 7 Document");
860-
pdfDoc2.getInfo().setModified();
859+
pdfDoc2.getDocumentInfo().setCreator("iText 7").setTitle("Empty iText 7 Document");
860+
pdfDoc2.getDocumentInfo().setModified();
861861
pdfDoc2.close();
862862

863863
PdfReader reader3 = new PdfReader(new FileInputStream(filename2));
@@ -879,7 +879,7 @@ public void stampingAppend1() throws IOException {
879879
assertEquals("iText 7", creator.toString());
880880
byte[] bytes = pdfDocument.getPage(1).getContentBytes();
881881
assertEquals("%Hello World\n", new String(bytes));
882-
String date = pdfDocument.getInfo().getPdfObject().getAsString(PdfName.ModDate).getValue();
882+
String date = pdfDocument.getDocumentInfo().getPdfObject().getAsString(PdfName.ModDate).getValue();
883883
Calendar cl = PdfDate.decode(date);
884884
long diff = new GregorianCalendar().getTimeInMillis() - cl.getTimeInMillis();
885885
String message = "Unexpected creation date. Different from now is " + (float) diff / 1000 + "s";

‎kernel/src/test/java/com/itextpdf/kernel/pdf/PdfWriterTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void createEmptyDocument() throws IOException {
3434
FileOutputStream fos = new FileOutputStream(destinationFolder + "emptyDocument.pdf");
3535
PdfWriter writer = new PdfWriter(fos);
3636
PdfDocument pdfDoc = new PdfDocument(writer);
37-
pdfDoc.getInfo().setAuthor("Alexander Chingarev").
37+
pdfDoc.getDocumentInfo().setAuthor("Alexander Chingarev").
3838
setCreator("iText 6").
3939
setTitle("Empty iText 6 Document");
4040
PdfPage page = pdfDoc.addNewPage();
@@ -599,7 +599,7 @@ public void createPdfStreamByInputStream() throws IOException {
599599
FileOutputStream fos = new FileOutputStream(filename);
600600
PdfWriter writer = new PdfWriter(fos);
601601
PdfDocument document = new PdfDocument(writer);
602-
document.getInfo().setAuthor("Alexander Chingarev").
602+
document.getDocumentInfo().setAuthor("Alexander Chingarev").
603603
setCreator("iText 6").
604604
setTitle("Empty iText 6 Document");
605605
PdfPage page = document.addNewPage();
@@ -614,7 +614,7 @@ public void createPdfStreamByInputStream() throws IOException {
614614
// com.itextpdf.text.pdf.PdfReader reader = new PdfReader(filename);
615615
// Assert.assertEquals("Rebuilt", false, reader.isRebuilt());
616616
// Assert.assertNotNull(reader.getPageN(1));
617-
// String date = reader.getInfo().get("CreationDate");
617+
// String date = reader.getDocumentInfo().get("CreationDate");
618618
// Calendar cl = com.itextpdf.text.pdf.PdfDate.decode(date);
619619
// long diff = new GregorianCalendar().getTimeInMillis() - cl.getTimeInMillis();
620620
// String message = "Unexpected creation date. Different from now is " + (float)diff/1000 + "s";

‎kernel/src/test/java/com/itextpdf/kernel/pdf/XMPMetadataTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ public void createEmptyDocumentWithXmp() throws Exception {
3939
FileOutputStream fos = new FileOutputStream(destinationFolder +filename);
4040
PdfWriter writer = new PdfWriter(fos);
4141
PdfDocument pdfDoc = new PdfDocument(writer);
42-
pdfDoc.getInfo().setAuthor("Alexander Chingarev").
42+
pdfDoc.getDocumentInfo().setAuthor("Alexander Chingarev").
4343
setCreator("iText 6").
4444
setTitle("Empty iText 6 Document");
45-
pdfDoc.getInfo().getPdfObject().remove(PdfName.CreationDate);
45+
pdfDoc.getDocumentInfo().getPdfObject().remove(PdfName.CreationDate);
4646
PdfPage page = pdfDoc.addNewPage();
4747
page.flush();
4848
pdfDoc.setXmpMetadata();
@@ -62,10 +62,10 @@ public void createEmptyDocumentWithAbcXmp() throws IOException, XMPException {
6262
ByteArrayOutputStream fos = new ByteArrayOutputStream();
6363
PdfWriter writer = new PdfWriter(fos);
6464
PdfDocument pdfDoc = new PdfDocument(writer);
65-
pdfDoc.getInfo().setAuthor("Alexander Chingarev").
65+
pdfDoc.getDocumentInfo().setAuthor("Alexander Chingarev").
6666
setCreator("iText 6").
6767
setTitle("Empty iText 6 Document");
68-
pdfDoc.getInfo().getPdfObject().remove(PdfName.CreationDate);
68+
pdfDoc.getDocumentInfo().getPdfObject().remove(PdfName.CreationDate);
6969
PdfPage page = pdfDoc.addNewPage();
7070
page.flush();
7171
pdfDoc.setXmpMetadata("abc".getBytes());

0 commit comments

Comments
 (0)