PDLayoutAttributeObject.java (pdfbox-2.0.23-src) | : | PDLayoutAttributeObject.java (pdfbox-2.0.24-src) | ||
---|---|---|---|---|
skipping to change at line 1519 | skipping to change at line 1519 | |||
if (this.isSpecified(BORDER_THICKNESS)) | if (this.isSpecified(BORDER_THICKNESS)) | |||
{ | { | |||
Object borderThickness = this.getBorderThickness(); | Object borderThickness = this.getBorderThickness(); | |||
sb.append(", BorderThickness="); | sb.append(", BorderThickness="); | |||
if (borderThickness instanceof float[]) | if (borderThickness instanceof float[]) | |||
{ | { | |||
sb.append(arrayToString((float[]) borderThickness)); | sb.append(arrayToString((float[]) borderThickness)); | |||
} | } | |||
else | else | |||
{ | { | |||
sb.append(String.valueOf(borderThickness)); | sb.append(borderThickness); | |||
} | } | |||
} | } | |||
if (this.isSpecified(PADDING)) | if (this.isSpecified(PADDING)) | |||
{ | { | |||
Object padding = this.getPadding(); | Object padding = this.getPadding(); | |||
sb.append(", Padding="); | sb.append(", Padding="); | |||
if (padding instanceof float[]) | if (padding instanceof float[]) | |||
{ | { | |||
sb.append(arrayToString((float[]) padding)); | sb.append(arrayToString((float[]) padding)); | |||
} | } | |||
else | else | |||
{ | { | |||
sb.append(String.valueOf(padding)); | sb.append(padding); | |||
} | } | |||
} | } | |||
if (this.isSpecified(COLOR)) | if (this.isSpecified(COLOR)) | |||
{ | { | |||
sb.append(", Color=").append(this.getColor()); | sb.append(", Color=").append(this.getColor()); | |||
} | } | |||
if (this.isSpecified(SPACE_BEFORE)) | if (this.isSpecified(SPACE_BEFORE)) | |||
{ | { | |||
sb.append(", SpaceBefore=") | sb.append(", SpaceBefore=") | |||
.append(String.valueOf(this.getSpaceBefore())); | .append(this.getSpaceBefore()); | |||
} | } | |||
if (this.isSpecified(SPACE_AFTER)) | if (this.isSpecified(SPACE_AFTER)) | |||
{ | { | |||
sb.append(", SpaceAfter=") | sb.append(", SpaceAfter=") | |||
.append(String.valueOf(this.getSpaceAfter())); | .append(this.getSpaceAfter()); | |||
} | } | |||
if (this.isSpecified(START_INDENT)) | if (this.isSpecified(START_INDENT)) | |||
{ | { | |||
sb.append(", StartIndent=") | sb.append(", StartIndent=") | |||
.append(String.valueOf(this.getStartIndent())); | .append(this.getStartIndent()); | |||
} | } | |||
if (this.isSpecified(END_INDENT)) | if (this.isSpecified(END_INDENT)) | |||
{ | { | |||
sb.append(", EndIndent=") | sb.append(", EndIndent=") | |||
.append(String.valueOf(this.getEndIndent())); | .append(this.getEndIndent()); | |||
} | } | |||
if (this.isSpecified(TEXT_INDENT)) | if (this.isSpecified(TEXT_INDENT)) | |||
{ | { | |||
sb.append(", TextIndent=") | sb.append(", TextIndent=") | |||
.append(String.valueOf(this.getTextIndent())); | .append(this.getTextIndent()); | |||
} | } | |||
if (this.isSpecified(TEXT_ALIGN)) | if (this.isSpecified(TEXT_ALIGN)) | |||
{ | { | |||
sb.append(", TextAlign=").append(this.getTextAlign()); | sb.append(", TextAlign=").append(this.getTextAlign()); | |||
} | } | |||
if (this.isSpecified(BBOX)) | if (this.isSpecified(BBOX)) | |||
{ | { | |||
sb.append(", BBox=").append(this.getBBox()); | sb.append(", BBox=").append(this.getBBox()); | |||
} | } | |||
if (this.isSpecified(WIDTH)) | if (this.isSpecified(WIDTH)) | |||
{ | { | |||
Object width = this.getWidth(); | sb.append(", Width=").append(this.getWidth()); | |||
sb.append(", Width="); | ||||
if (width instanceof Float) | ||||
{ | ||||
sb.append(String.valueOf(width)); | ||||
} | ||||
else | ||||
{ | ||||
sb.append(width); | ||||
} | ||||
} | } | |||
if (this.isSpecified(HEIGHT)) | if (this.isSpecified(HEIGHT)) | |||
{ | { | |||
Object height = this.getHeight(); | sb.append(", Height=").append(this.getHeight()); | |||
sb.append(", Height="); | ||||
if (height instanceof Float) | ||||
{ | ||||
sb.append(String.valueOf(height)); | ||||
} | ||||
else | ||||
{ | ||||
sb.append(height); | ||||
} | ||||
} | } | |||
if (this.isSpecified(BLOCK_ALIGN)) | if (this.isSpecified(BLOCK_ALIGN)) | |||
{ | { | |||
sb.append(", BlockAlign=").append(this.getBlockAlign()); | sb.append(", BlockAlign=").append(this.getBlockAlign()); | |||
} | } | |||
if (this.isSpecified(INLINE_ALIGN)) | if (this.isSpecified(INLINE_ALIGN)) | |||
{ | { | |||
sb.append(", InlineAlign=").append(this.getInlineAlign()); | sb.append(", InlineAlign=").append(this.getInlineAlign()); | |||
} | } | |||
if (this.isSpecified(T_BORDER_STYLE)) | if (this.isSpecified(T_BORDER_STYLE)) | |||
skipping to change at line 1629 | skipping to change at line 1611 | |||
if (this.isSpecified(T_PADDING)) | if (this.isSpecified(T_PADDING)) | |||
{ | { | |||
Object tPadding = this.getTPadding(); | Object tPadding = this.getTPadding(); | |||
sb.append(", TPadding="); | sb.append(", TPadding="); | |||
if (tPadding instanceof float[]) | if (tPadding instanceof float[]) | |||
{ | { | |||
sb.append(arrayToString((float[]) tPadding)); | sb.append(arrayToString((float[]) tPadding)); | |||
} | } | |||
else | else | |||
{ | { | |||
sb.append(String.valueOf(tPadding)); | sb.append(tPadding); | |||
} | } | |||
} | } | |||
if (this.isSpecified(BASELINE_SHIFT)) | if (this.isSpecified(BASELINE_SHIFT)) | |||
{ | { | |||
sb.append(", BaselineShift=") | sb.append(", BaselineShift=").append(this.getBaselineShift()); | |||
.append(String.valueOf(this.getBaselineShift())); | ||||
} | } | |||
if (this.isSpecified(LINE_HEIGHT)) | if (this.isSpecified(LINE_HEIGHT)) | |||
{ | { | |||
Object lineHeight = this.getLineHeight(); | sb.append(", LineHeight=").append(this.getLineHeight()); | |||
sb.append(", LineHeight="); | ||||
if (lineHeight instanceof Float) | ||||
{ | ||||
sb.append(String.valueOf(lineHeight)); | ||||
} | ||||
else | ||||
{ | ||||
sb.append(lineHeight); | ||||
} | ||||
} | } | |||
if (this.isSpecified(TEXT_DECORATION_COLOR)) | if (this.isSpecified(TEXT_DECORATION_COLOR)) | |||
{ | { | |||
sb.append(", TextDecorationColor=") | sb.append(", TextDecorationColor=") | |||
.append(this.getTextDecorationColor()); | .append(this.getTextDecorationColor()); | |||
} | } | |||
if (this.isSpecified(TEXT_DECORATION_THICKNESS)) | if (this.isSpecified(TEXT_DECORATION_THICKNESS)) | |||
{ | { | |||
sb.append(", TextDecorationThickness=") | sb.append(", TextDecorationThickness=") | |||
.append(String.valueOf(this.getTextDecorationThickness())); | .append(this.getTextDecorationThickness()); | |||
} | } | |||
if (this.isSpecified(TEXT_DECORATION_TYPE)) | if (this.isSpecified(TEXT_DECORATION_TYPE)) | |||
{ | { | |||
sb.append(", TextDecorationType=") | sb.append(", TextDecorationType=") | |||
.append(this.getTextDecorationType()); | .append(this.getTextDecorationType()); | |||
} | } | |||
if (this.isSpecified(RUBY_ALIGN)) | if (this.isSpecified(RUBY_ALIGN)) | |||
{ | { | |||
sb.append(", RubyAlign=").append(this.getRubyAlign()); | sb.append(", RubyAlign=").append(this.getRubyAlign()); | |||
} | } | |||
skipping to change at line 1681 | skipping to change at line 1653 | |||
sb.append(", RubyPosition=").append(this.getRubyPosition()); | sb.append(", RubyPosition=").append(this.getRubyPosition()); | |||
} | } | |||
if (this.isSpecified(GLYPH_ORIENTATION_VERTICAL)) | if (this.isSpecified(GLYPH_ORIENTATION_VERTICAL)) | |||
{ | { | |||
sb.append(", GlyphOrientationVertical=") | sb.append(", GlyphOrientationVertical=") | |||
.append(this.getGlyphOrientationVertical()); | .append(this.getGlyphOrientationVertical()); | |||
} | } | |||
if (this.isSpecified(COLUMN_COUNT)) | if (this.isSpecified(COLUMN_COUNT)) | |||
{ | { | |||
sb.append(", ColumnCount=") | sb.append(", ColumnCount=") | |||
.append(String.valueOf(this.getColumnCount())); | .append(this.getColumnCount()); | |||
} | } | |||
if (this.isSpecified(COLUMN_GAP)) | if (this.isSpecified(COLUMN_GAP)) | |||
{ | { | |||
Object columnGap = this.getColumnGap(); | Object columnGap = this.getColumnGap(); | |||
sb.append(", ColumnGap="); | sb.append(", ColumnGap="); | |||
if (columnGap instanceof float[]) | if (columnGap instanceof float[]) | |||
{ | { | |||
sb.append(arrayToString((float[]) columnGap)); | sb.append(arrayToString((float[]) columnGap)); | |||
} | } | |||
else | else | |||
{ | { | |||
sb.append(String.valueOf(columnGap)); | sb.append(columnGap); | |||
} | } | |||
} | } | |||
if (this.isSpecified(COLUMN_WIDTHS)) | if (this.isSpecified(COLUMN_WIDTHS)) | |||
{ | { | |||
Object columnWidth = this.getColumnWidths(); | Object columnWidth = this.getColumnWidths(); | |||
sb.append(", ColumnWidths="); | sb.append(", ColumnWidths="); | |||
if (columnWidth instanceof float[]) | if (columnWidth instanceof float[]) | |||
{ | { | |||
sb.append(arrayToString((float[]) columnWidth)); | sb.append(arrayToString((float[]) columnWidth)); | |||
} | } | |||
else | else | |||
{ | { | |||
sb.append(String.valueOf(columnWidth)); | sb.append(columnWidth); | |||
} | } | |||
} | } | |||
return sb.toString(); | return sb.toString(); | |||
} | } | |||
} | } | |||
End of changes. 16 change blocks. | ||||
44 lines changed or deleted | 16 lines changed or added |