Sfoglia il codice sorgente

Eliminate unnecessary boxing (possible after r1062901)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1067711 13f79535-47bb-0310-9956-ffa450edef68
tags/fop-1_1rc1old
Andreas L. Delmelle 13 anni fa
parent
commit
d0c126ee27
1 ha cambiato i file con 16 aggiunte e 17 eliminazioni
  1. 16
    17
      src/java/org/apache/fop/layoutmgr/TraitSetter.java

+ 16
- 17
src/java/org/apache/fop/layoutmgr/TraitSetter.java Vedi File

int iBP; int iBP;
iBP = bpProps.getPadding(CommonBorderPaddingBackground.START, bNotFirst, context); iBP = bpProps.getPadding(CommonBorderPaddingBackground.START, bNotFirst, context);
if (iBP > 0) { if (iBP > 0) {
area.addTrait(Trait.PADDING_START, new Integer(iBP));
area.addTrait(Trait.PADDING_START, iBP);
} }
iBP = bpProps.getPadding(CommonBorderPaddingBackground.END, bNotLast, context); iBP = bpProps.getPadding(CommonBorderPaddingBackground.END, bNotLast, context);
if (iBP > 0) { if (iBP > 0) {
area.addTrait(Trait.PADDING_END, new Integer(iBP));
area.addTrait(Trait.PADDING_END, iBP);
} }
iBP = bpProps.getPadding(CommonBorderPaddingBackground.BEFORE, false, context); iBP = bpProps.getPadding(CommonBorderPaddingBackground.BEFORE, false, context);
if (iBP > 0) { if (iBP > 0) {
area.addTrait(Trait.PADDING_BEFORE, new Integer(iBP));
area.addTrait(Trait.PADDING_BEFORE, iBP);
} }
iBP = bpProps.getPadding(CommonBorderPaddingBackground.AFTER, false, context); iBP = bpProps.getPadding(CommonBorderPaddingBackground.AFTER, false, context);
if (iBP > 0) { if (iBP > 0) {
area.addTrait(Trait.PADDING_AFTER, new Integer(iBP));
area.addTrait(Trait.PADDING_AFTER, iBP);
} }


addBorderTrait(area, bpProps, bNotFirst, addBorderTrait(area, bpProps, bNotFirst,
BorderProps.SEPARATE, Trait.BORDER_AFTER); BorderProps.SEPARATE, Trait.BORDER_AFTER);
} }


/**
/*
* Sets border traits on an area. * Sets border traits on an area.
* *
* @param area area to set the traits on * @param area area to set the traits on
int padding = bordProps.getPadding(CommonBorderPaddingBackground.BEFORE, int padding = bordProps.getPadding(CommonBorderPaddingBackground.BEFORE,
discardBefore, context); discardBefore, context);
if (padding != 0) { if (padding != 0) {
area.addTrait(Trait.PADDING_BEFORE, new java.lang.Integer(padding));
area.addTrait(Trait.PADDING_BEFORE, padding);
} }


padding = bordProps.getPadding(CommonBorderPaddingBackground.AFTER, padding = bordProps.getPadding(CommonBorderPaddingBackground.AFTER,
discardAfter, context); discardAfter, context);
if (padding != 0) { if (padding != 0) {
area.addTrait(Trait.PADDING_AFTER, new java.lang.Integer(padding));
area.addTrait(Trait.PADDING_AFTER, padding);
} }


padding = bordProps.getPadding(CommonBorderPaddingBackground.START, padding = bordProps.getPadding(CommonBorderPaddingBackground.START,
discardStart, context); discardStart, context);
if (padding != 0) { if (padding != 0) {
area.addTrait(Trait.PADDING_START, new java.lang.Integer(padding));
area.addTrait(Trait.PADDING_START, padding);
} }


padding = bordProps.getPadding(CommonBorderPaddingBackground.END, padding = bordProps.getPadding(CommonBorderPaddingBackground.END,
discardEnd, context); discardEnd, context);
if (padding != 0) { if (padding != 0) {
area.addTrait(Trait.PADDING_END, new java.lang.Integer(padding));
area.addTrait(Trait.PADDING_END, padding);
} }


} }
assert borderInfo != null; assert borderInfo != null;
int width = borderInfo.getRetainedWidth(); int width = borderInfo.getRetainedWidth();
if (width != 0) { if (width != 0) {
BorderProps bps = new BorderProps(borderInfo.getStyle(), width, borderInfo.getColor(),
return new BorderProps(borderInfo.getStyle(), width, borderInfo.getColor(),
(outer ? BorderProps.COLLAPSE_OUTER : BorderProps.COLLAPSE_INNER)); (outer ? BorderProps.COLLAPSE_OUTER : BorderProps.COLLAPSE_INNER));
return bps;
} else { } else {
return null; return null;
} }
int startIndent, int endIndent, int startIndent, int endIndent,
PercentBaseContext context) { PercentBaseContext context) {
if (startIndent != 0) { if (startIndent != 0) {
area.addTrait(Trait.START_INDENT, new Integer(startIndent));
area.addTrait(Trait.START_INDENT, startIndent);
} }


int spaceStart = startIndent int spaceStart = startIndent
- bpProps.getBorderStartWidth(false) - bpProps.getBorderStartWidth(false)
- bpProps.getPaddingStart(false, context); - bpProps.getPaddingStart(false, context);
if (spaceStart != 0) { if (spaceStart != 0) {
area.addTrait(Trait.SPACE_START, new Integer(spaceStart));
area.addTrait(Trait.SPACE_START, spaceStart);
} }


if (endIndent != 0) { if (endIndent != 0) {
area.addTrait(Trait.END_INDENT, new Integer(endIndent));
area.addTrait(Trait.END_INDENT, endIndent);
} }
int spaceEnd = endIndent int spaceEnd = endIndent
- bpProps.getBorderEndWidth(false) - bpProps.getBorderEndWidth(false)
- bpProps.getPaddingEnd(false, context); - bpProps.getPaddingEnd(false, context);
if (spaceEnd != 0) { if (spaceEnd != 0) {
area.addTrait(Trait.SPACE_END, new Integer(spaceEnd));
area.addTrait(Trait.SPACE_END, spaceEnd);
} }
} }


MinOptMax space, double adjust) { MinOptMax space, double adjust) {
int effectiveSpace = getEffectiveSpace(adjust, space); int effectiveSpace = getEffectiveSpace(adjust, space);
if (effectiveSpace != 0) { if (effectiveSpace != 0) {
area.addTrait(spaceTrait, new Integer(effectiveSpace));
area.addTrait(spaceTrait, effectiveSpace);
} }
} }


*/ */
public static void addFontTraits(Area area, Font font) { public static void addFontTraits(Area area, Font font) {
area.addTrait(Trait.FONT, font.getFontTriplet()); area.addTrait(Trait.FONT, font.getFontTriplet());
area.addTrait(Trait.FONT_SIZE, new Integer(font.getFontSize()));
area.addTrait(Trait.FONT_SIZE, font.getFontSize());
} }


/** /**

Loading…
Annulla
Salva