Skip to content

Commit 98ca60c

Browse files
pavel-alaypavel-alay
committed
Rename back PdfOutputStream#write() methods
1 parent 50609c6 commit 98ca60c

File tree

2 files changed

+37
-39
lines changed

2 files changed

+37
-39
lines changed

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

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ This file is part of the iText (R) project.
5757

5858
import java.io.IOException;
5959
import java.io.Serializable;
60-
import java.security.cert.Certificate;
6160
import java.text.MessageFormat;
6261
import java.util.Map;
6362

@@ -99,44 +98,44 @@ public PdfOutputStream write(PdfObject pdfObject) {
9998
}
10099
switch (pdfObject.getType()) {
101100
case PdfObject.ARRAY:
102-
writePdfArray((PdfArray) pdfObject);
101+
write((PdfArray) pdfObject);
103102
break;
104103
case PdfObject.DICTIONARY:
105104
writePdfDictionary((PdfDictionary) pdfObject);
106105
break;
107106
case PdfObject.INDIRECT_REFERENCE:
108-
writePdfIndirectReference((PdfIndirectReference) pdfObject);
107+
write((PdfIndirectReference) pdfObject);
109108
break;
110109
case PdfObject.NAME:
111-
writePdfName((PdfName) pdfObject);
110+
write((PdfName) pdfObject);
112111
break;
113112
case PdfObject.NULL:
114113
case PdfObject.BOOLEAN:
115-
writePdfPrimitiveObject((PdfPrimitiveObject) pdfObject);
114+
write((PdfPrimitiveObject) pdfObject);
116115
break;
117116
case PdfObject.LITERAL:
118-
writePdfLiteral((PdfLiteral) pdfObject);
117+
write((PdfLiteral) pdfObject);
119118
break;
120119
case PdfObject.STRING:
121-
writePdfString((PdfString) pdfObject);
120+
write((PdfString) pdfObject);
122121
break;
123122
case PdfObject.NUMBER:
124-
writePdfNumber((PdfNumber) pdfObject);
123+
write((PdfNumber) pdfObject);
125124
break;
126125
case PdfObject.STREAM:
127-
writePdfStream((PdfStream) pdfObject);
126+
write((PdfStream) pdfObject);
128127
break;
129128
}
130129
return this;
131130
}
132131

133-
protected void writePdfArray(PdfArray pdfArray) {
132+
protected void write(PdfArray pdfArray) {
134133
writeByte('[');
135134
for (int i = 0; i < pdfArray.size(); i++) {
136135
PdfObject value = pdfArray.get(i, false);
137136
PdfIndirectReference indirectReference;
138137
if ((indirectReference = value.getIndirectReference()) != null) {
139-
writePdfIndirectReference(indirectReference);
138+
write(indirectReference);
140139
} else {
141140
write(value);
142141
}
@@ -150,7 +149,7 @@ protected void writePdfDictionary(PdfDictionary pdfDictionary) {
150149
writeBytes(openDict);
151150
for (Map.Entry<PdfName, PdfObject> entry : pdfDictionary.entrySet()) {
152151
boolean isAlreadyWriteSpace = false;
153-
writePdfName(entry.getKey());
152+
write(entry.getKey());
154153
PdfObject value = entry.getValue();
155154
if (value == null) {
156155
Logger logger = LoggerFactory.getLogger(PdfOutputStream.class);
@@ -172,20 +171,20 @@ protected void writePdfDictionary(PdfDictionary pdfDictionary) {
172171
if (!isAlreadyWriteSpace) {
173172
writeSpace();
174173
}
175-
writePdfIndirectReference(indirectReference);
174+
write(indirectReference);
176175
} else {
177176
write(value);
178177
}
179178
}
180179
writeBytes(closeDict);
181180
}
182181

183-
protected void writePdfIndirectReference(PdfIndirectReference indirectReference) {
182+
protected void write(PdfIndirectReference indirectReference) {
184183
if (document != null && !indirectReference.getDocument().equals(document)) {
185184
throw new PdfException(PdfException.PdfInderectObjectBelongToOtherPdfDocument);
186185
}
187186
if (indirectReference.getRefersTo() == null) {
188-
writePdfPrimitiveObject(PdfNull.PDF_NULL);
187+
write(PdfNull.PDF_NULL);
189188
} else if (indirectReference.getGenNumber() == 0) {
190189
writeInteger(indirectReference.getObjNumber()).
191190
writeBytes(endIndirectWithZeroGenNr);
@@ -197,16 +196,16 @@ protected void writePdfIndirectReference(PdfIndirectReference indirectReference)
197196
}
198197
}
199198

200-
protected void writePdfPrimitiveObject(PdfPrimitiveObject pdfPrimitive) {
199+
protected void write(PdfPrimitiveObject pdfPrimitive) {
201200
writeBytes(pdfPrimitive.getInternalContent());
202201
}
203202

204-
protected void writePdfLiteral(PdfLiteral literal) {
203+
protected void write(PdfLiteral literal) {
205204
literal.setPosition(getCurrentPos());
206205
writeBytes(literal.getInternalContent());
207206
}
208207

209-
protected void writePdfString(PdfString pdfString) {
208+
protected void write(PdfString pdfString) {
210209
pdfString.encrypt(crypto);
211210
if (pdfString.isHexWriting()) {
212211
writeByte('<');
@@ -220,12 +219,12 @@ protected void writePdfString(PdfString pdfString) {
220219
}
221220

222221

223-
protected void writePdfName(PdfName name) {
222+
protected void write(PdfName name) {
224223
writeByte('/');
225224
writeBytes(name.getInternalContent());
226225
}
227226

228-
protected void writePdfNumber(PdfNumber pdfNumber) {
227+
protected void write(PdfNumber pdfNumber) {
229228
if (pdfNumber.hasContent()) {
230229
writeBytes(pdfNumber.getInternalContent());
231230
} else if (pdfNumber.isDoubleNumber()) {
@@ -241,7 +240,7 @@ private boolean isNotMetadataPdfStream(PdfStream pdfStream) {
241240

242241
}
243242

244-
protected void writePdfStream(PdfStream pdfStream) {
243+
protected void write(PdfStream pdfStream) {
245244
try {
246245
boolean userDefinedCompression = pdfStream.getCompressionLevel() != CompressionConstants.UNDEFINED_COMPRESSION;
247246
if (!userDefinedCompression) {

‎kernel/src/main/java/com/itextpdf/kernel/pdf/canvas/PdfCanvas.java

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ public PdfCanvas setFontAndSize(PdfFont font, float size) {
436436
PdfName fontName = resources.addFont(document, font);
437437
currentGs.setFont(font);
438438
contentStream.getOutputStream()
439-
.write(fontName)
439+
.write((PdfObject) fontName)
440440
.writeSpace()
441441
.writeFloat(size).writeSpace()
442442
.writeBytes(Tf);
@@ -1127,7 +1127,7 @@ public PdfCanvas circle(final double x, final double y, final double r) {
11271127
public PdfCanvas paintShading(PdfShading shading) {
11281128
PdfName shadingName = resources.addShading(shading);
11291129
document.checkIsoConformance(currentGs, IsoKey.GRAPHIC_STATE_ONLY);
1130-
contentStream.getOutputStream().write(shadingName).writeSpace().writeBytes(sh);
1130+
contentStream.getOutputStream().write((PdfObject) shadingName).writeSpace().writeBytes(sh);
11311131
return this;
11321132
}
11331133

@@ -1431,7 +1431,7 @@ public PdfCanvas setRenderingIntent(PdfName renderingIntent) {
14311431
return this;
14321432
currentGs.setRenderingIntent(renderingIntent);
14331433
contentStream.getOutputStream()
1434-
.write(renderingIntent).writeSpace()
1434+
.write((PdfObject) renderingIntent).writeSpace()
14351435
.writeBytes(ri);
14361436
return this;
14371437
}
@@ -1533,15 +1533,15 @@ else if (colorSpace instanceof PdfDeviceCs.Rgb)
15331533
else if (colorSpace instanceof PdfDeviceCs.Cmyk)
15341534
contentStream.getOutputStream().writeFloats(colorValue).writeSpace().writeBytes(fill ? k : K);
15351535
else if (colorSpace instanceof PdfSpecialCs.UncoloredTilingPattern)
1536-
contentStream.getOutputStream().write(resources.addColorSpace(colorSpace)).writeSpace().writeBytes(fill ? cs : CS).
1537-
writeNewLine().writeFloats(colorValue).writeSpace().write(resources.addPattern(pattern)).writeSpace().writeBytes(fill ? scn : SCN);
1536+
contentStream.getOutputStream().write((PdfObject) resources.addColorSpace(colorSpace)).writeSpace().writeBytes(fill ? cs : CS).
1537+
writeNewLine().writeFloats(colorValue).writeSpace().write((PdfObject) resources.addPattern(pattern)).writeSpace().writeBytes(fill ? scn : SCN);
15381538
else if (colorSpace instanceof PdfSpecialCs.Pattern)
1539-
contentStream.getOutputStream().write(PdfName.Pattern).writeSpace().writeBytes(fill ? cs : CS).
1540-
writeNewLine().write(resources.addPattern(pattern)).writeSpace().writeBytes(fill ? scn : SCN);
1539+
contentStream.getOutputStream().write((PdfObject) PdfName.Pattern).writeSpace().writeBytes(fill ? cs : CS).
1540+
writeNewLine().write((PdfObject) resources.addPattern(pattern)).writeSpace().writeBytes(fill ? scn : SCN);
15411541
else if (colorSpace.getPdfObject().isIndirect()) {
15421542
if (!setColorValueOnly) {
15431543
PdfName name = resources.addColorSpace(colorSpace);
1544-
contentStream.getOutputStream().write(name).writeSpace().writeBytes(fill ? cs : CS);
1544+
contentStream.getOutputStream().write((PdfObject) name).writeSpace().writeBytes(fill ? cs : CS);
15451545
}
15461546
contentStream.getOutputStream().writeFloats(colorValue).writeSpace().writeBytes(fill ? scn : SCN);
15471547
}
@@ -1992,7 +1992,7 @@ public PdfCanvas setExtGState(PdfExtGState extGState) {
19921992
if (!extGState.isFlushed())
19931993
currentGs.updateFromExtGState(extGState);
19941994
PdfName name = resources.addExtGState(extGState);
1995-
contentStream.getOutputStream().write(name).writeSpace().writeBytes(gs);
1995+
contentStream.getOutputStream().write((PdfObject) name).writeSpace().writeBytes(gs);
19961996
return this;
19971997
}
19981998

@@ -2027,13 +2027,13 @@ public PdfCanvas beginMarkedContent(PdfName tag) {
20272027
*/
20282028
public PdfCanvas beginMarkedContent(PdfName tag, PdfDictionary properties) {
20292029
mcDepth++;
2030-
PdfOutputStream out = contentStream.getOutputStream().write(tag).writeSpace();
2030+
PdfOutputStream out = contentStream.getOutputStream().write((PdfObject) tag).writeSpace();
20312031
if (properties == null) {
20322032
out.writeBytes(BMC);
20332033
} else if (properties.getIndirectReference() == null) {
20342034
out.write(properties).writeSpace().writeBytes(BDC);
20352035
} else {
2036-
out.write(resources.addProperties(properties)).writeSpace().writeBytes(BDC);
2036+
out.write((PdfObject) resources.addProperties(properties)).writeSpace().writeBytes(BDC);
20372037
}
20382038
return this;
20392039
}
@@ -2142,7 +2142,6 @@ public PdfStream getContentStream() {
21422142
* @param d an element of the transformation matrix
21432143
* @param e an element of the transformation matrix
21442144
* @param f an element of the transformation matrix
2145-
* @on error
21462145
*/
21472146
protected void addInlineImage(PdfImageXObject imageXObject, float a, float b, float c, float d, float e, float f) {
21482147
document.checkIsoConformance(imageXObject.getPdfObject(), IsoKey.INLINE_IMAGE, resources);
@@ -2153,7 +2152,7 @@ protected void addInlineImage(PdfImageXObject imageXObject, float a, float b, fl
21532152
for (Map.Entry<PdfName, PdfObject> entry : imageXObject.getPdfObject().entrySet()) {
21542153
PdfName key = entry.getKey();
21552154
if (!PdfName.Type.equals(key) && !PdfName.Subtype.equals(key) && !PdfName.Length.equals(key)) {
2156-
os.write(entry.getKey()).writeSpace();
2155+
os.write((PdfObject) entry.getKey()).writeSpace();
21572156
os.write(entry.getValue()).writeNewLine();
21582157
}
21592158
}
@@ -2173,13 +2172,12 @@ protected void addInlineImage(PdfImageXObject imageXObject, float a, float b, fl
21732172
* @param e an element of the transformation matrix
21742173
* @param f an element of the transformation matrix
21752174
* @return current canvas.
2176-
* @on error
21772175
*/
21782176
private PdfCanvas addForm(PdfFormXObject form, float a, float b, float c, float d, float e, float f) {
21792177
saveState();
21802178
concatMatrix(a, b, c, d, e, f);
21812179
PdfName name = resources.addForm(form);
2182-
contentStream.getOutputStream().write(name).writeSpace().writeBytes(Do);
2180+
contentStream.getOutputStream().write((PdfObject) name).writeSpace().writeBytes(Do);
21832181
restoreState();
21842182
return this;
21852183
}
@@ -2265,7 +2263,7 @@ private PdfCanvas addImage(PdfImageXObject image, float a, float b, float c, flo
22652263
saveState();
22662264
concatMatrix(a, b, c, d, e, f);
22672265
PdfName name = resources.addImage(image);
2268-
contentStream.getOutputStream().write(name).writeSpace().writeBytes(Do);
2266+
contentStream.getOutputStream().write((PdfObject) name).writeSpace().writeBytes(Do);
22692267
restoreState();
22702268
return this;
22712269
}
@@ -2274,7 +2272,7 @@ private PdfCanvas addImage(PdfXObject xObject, float a, float b, float c, float
22742272
saveState();
22752273
concatMatrix(a, b, c, d, e, f);
22762274
PdfName name = resources.addImage(xObject.getPdfObject());
2277-
contentStream.getOutputStream().write(name).writeSpace().writeBytes(Do);
2275+
contentStream.getOutputStream().write((PdfObject) name).writeSpace().writeBytes(Do);
22782276
restoreState();
22792277
return this;
22802278
}
@@ -2368,7 +2366,8 @@ private void showTextInt(String text) {
23682366

23692367
private void addToPropertiesAndBeginLayer(IPdfOCG layer) {
23702368
PdfName name = resources.addProperties(layer.getPdfObject());
2371-
contentStream.getOutputStream().write(PdfName.OC).writeSpace().write(name).writeSpace().writeBytes(BDC).writeNewLine();
2369+
contentStream.getOutputStream().write((PdfObject) PdfName.OC).writeSpace()
2370+
.write((PdfObject) name).writeSpace().writeBytes(BDC).writeNewLine();
23722371
}
23732372

23742373
private Color createColor(PdfColorSpace colorSpace, float[] colorValue, PdfPattern pattern) {

0 commit comments

Comments
 (0)