Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java?rev=1062901&r1=1062900&r2=1062901&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Trait.java Mon Jan 24 18:06:25 2011 @@ -24,11 +24,15 @@ import java.io.Serializable; import org.apache.xmlgraphics.image.loader.ImageInfo; -import org.apache.fop.fo.Constants; import org.apache.fop.fonts.FontTriplet; import org.apache.fop.traits.BorderProps; import org.apache.fop.util.ColorUtil; +import static org.apache.fop.fo.Constants.EN_REPEAT; +import static org.apache.fop.fo.Constants.EN_REPEATX; +import static org.apache.fop.fo.Constants.EN_REPEATY; +import static org.apache.fop.fo.Constants.EN_NOREPEAT; + // properties should be serialized by the holder /** * Area traits used for rendering. @@ -142,8 +146,10 @@ public final class Trait implements Seri /** Trait for color of underline decorations when rendering inline parent. */ public static final Integer UNDERLINE_COLOR = 34; + /** Trait for color of overline decorations when rendering inline parent. */ public static final Integer OVERLINE_COLOR = 35; + /** Trait for color of linethrough decorations when rendering inline parent. */ public static final Integer LINETHROUGH_COLOR = 36; @@ -367,6 +373,7 @@ public final class Trait implements Seri * Return the human-friendly string for debugging. * {@inheritDoc} */ + @Override public String toString() { StringBuffer sb = new StringBuffer(); sb.append("pvKey=").append(pvKey); @@ -441,6 +448,7 @@ public final class Trait implements Seri * @return a <code>String</code> of the form * "org.apache.fop.area.Trait.ExternalLink[dest=someURL,newWindow=false]" */ + @Override public String toString() { StringBuffer sb = new StringBuffer(64); sb.append("newWindow=").append(newWindow); @@ -581,23 +589,23 @@ public final class Trait implements Seri private String getRepeatString() { switch (getRepeat()) { - case Constants.EN_REPEAT: return "repeat"; - case Constants.EN_REPEATX: return "repeat-x"; - case Constants.EN_REPEATY: return "repeat-y"; - case Constants.EN_NOREPEAT: return "no-repeat"; + case EN_REPEAT: return "repeat"; + case EN_REPEATX: return "repeat-x"; + case EN_REPEATY: return "repeat-y"; + case EN_NOREPEAT: return "no-repeat"; default: throw new IllegalStateException("Illegal repeat style: " + getRepeat()); } } private static int getConstantForRepeat(String repeat) { if ("repeat".equalsIgnoreCase(repeat)) { - return Constants.EN_REPEAT; + return EN_REPEAT; } else if ("repeat-x".equalsIgnoreCase(repeat)) { - return Constants.EN_REPEATX; + return EN_REPEATX; } else if ("repeat-y".equalsIgnoreCase(repeat)) { - return Constants.EN_REPEATY; + return EN_REPEATY; } else if ("no-repeat".equalsIgnoreCase(repeat)) { - return Constants.EN_NOREPEAT; + return EN_NOREPEAT; } else { throw new IllegalStateException("Illegal repeat style: " + repeat); } @@ -607,6 +615,7 @@ public final class Trait implements Seri * Return the string for debugging. * {@inheritDoc} */ + @Override public String toString() { StringBuffer sb = new StringBuffer(); if (color != null) {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Container.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Container.java?rev=1062901&r1=1062900&r2=1062901&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Container.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/Container.java Mon Jan 24 18:06:25 2011 @@ -38,7 +38,7 @@ public class Container extends Area { /** * The list of block areas stacked inside this container */ - protected List blocks = new ArrayList(); + protected List<Block> blocks = new ArrayList<Block>(); /** * The width of this container Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java?rev=1062901&r1=1062900&r2=1062901&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/FilledArea.java Mon Jan 24 18:06:25 2011 @@ -39,9 +39,7 @@ public class FilledArea extends InlinePa private int unitWidth; - /** - * Create a new filled area. - */ + /** Create a new filled area. */ public FilledArea() { } @@ -88,13 +86,11 @@ public class FilledArea extends InlinePa return this.unitWidth; } - /** - * {@inheritDoc} - */ + /** {@inheritDoc} */ + @Override public int getBPD() { int bpd = 0; - for (Iterator childAreaIt = getChildAreas().iterator(); childAreaIt.hasNext();) { - InlineArea area = (InlineArea)childAreaIt.next(); + for (InlineArea area : getChildAreas()) { if (bpd < area.getBPD()) { bpd = area.getBPD(); } @@ -110,9 +106,10 @@ public class FilledArea extends InlinePa * * @return the list of child areas copied to fill the width */ - public List getChildAreas() { - int units = (int)(getIPD() / unitWidth); - List newList = new ArrayList(); + @Override + public List<InlineArea> getChildAreas() { + int units = getIPD() / unitWidth; + List<InlineArea> newList = new ArrayList<InlineArea>(); for (int count = 0; count < units; count++) { newList.addAll(inlines); } @@ -126,6 +123,7 @@ public class FilledArea extends InlinePa * @param lineShrink the total shrink of the line * @return true if there is an UnresolvedArea descendant */ + @Override public boolean applyVariationFactor(double variationFactor, int lineStretch, int lineShrink) { setIPD(getIPD() + adjustingInfo.applyVariationFactor(variationFactor)); Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java?rev=1062901&r1=1062900&r2=1062901&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java Mon Jan 24 18:06:25 2011 @@ -178,6 +178,7 @@ public class InlineArea extends Area { * * {@inheritDoc} */ + @Override public void addChildArea(Area childArea) { super.addChildArea(childArea); if (childArea instanceof InlineArea) { @@ -185,9 +186,7 @@ public class InlineArea extends Area { } } - /** - *@return true if the inline area is underlined. - */ + /** @return true if the inline area is underlined. */ public boolean hasUnderline() { return getTraitAsBoolean(Trait.UNDERLINE); } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java?rev=1062901&r1=1062900&r2=1062901&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineBlockParent.java Mon Jan 24 18:06:25 2011 @@ -48,6 +48,7 @@ public class InlineBlockParent extends I * * @param childArea the child area to add */ + @Override public void addChildArea(Area childArea) { if (child != null) { throw new IllegalStateException("InlineBlockParent may have only one child area."); Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java?rev=1062901&r1=1062900&r2=1062901&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java Mon Jan 24 18:06:25 2011 @@ -48,9 +48,7 @@ public class SpaceArea extends InlineAre isAdjustable = a; } - /** - * @return Returns the space. - */ + /** @return Returns the space. */ public String getSpace() { return String.valueOf(space); } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java?rev=1062901&r1=1062900&r2=1062901&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java Mon Jan 24 18:06:25 2011 @@ -99,20 +99,19 @@ public class TextArea extends AbstractTe */ public String getText() { StringBuffer text = new StringBuffer(); - InlineArea child; // assemble the text - for (int i = 0; i < inlines.size(); i++) { - child = (InlineArea) inlines.get(i); - if (child instanceof WordArea) { - text.append(((WordArea) child).getWord()); + for (InlineArea inline : inlines) { + if (inline instanceof WordArea) { + text.append(((WordArea) inline).getWord()); } else { - text.append(((SpaceArea) child).getSpace()); + text.append(((SpaceArea) inline).getSpace()); } } return text.toString(); } /** {@inheritDoc} */ + @Override public String toString() { return "TextArea{text=" + getText() + "}"; } Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java?rev=1062901&r1=1062900&r2=1062901&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java Mon Jan 24 18:06:25 2011 @@ -92,18 +92,14 @@ public class UnresolvedPageNumber extend * @param id an id whose PageViewports have been determined * @param pages the list of PageViewports associated with this ID */ - public void resolveIDRef(String id, List pages) { + public void resolveIDRef(String id, List<PageViewport> pages) { if (!resolved && pageIDRef.equals(id) && pages != null) { if (log.isDebugEnabled()) { log.debug("Resolving pageNumber: " + id); } resolved = true; - PageViewport page; - if (pageType == FIRST) { - page = (PageViewport)pages.get(0); - } else { - page = (PageViewport)pages.get(pages.size() - 1); - } + int pageIndex = pageType ? 0 : pages.size() - 1; + PageViewport page = pages.get(pageIndex); // replace the text removeText(); text = page.getPageNumberString(); @@ -136,6 +132,7 @@ public class UnresolvedPageNumber extend * @param lineShrink the total shrink of the line * @return true if there is an UnresolvedArea descendant */ + @Override public boolean applyVariationFactor(double variationFactor, int lineStretch, int lineShrink) { return true; Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java?rev=1062901&r1=1062900&r2=1062901&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java Mon Jan 24 18:06:25 2011 @@ -47,22 +47,18 @@ public class WordArea extends InlineArea this.letterAdjust = la; } - /** - * @return Returns the word. - */ + /** @return Returns the word. */ public String getWord() { return word; } - /** - * @return Returns the offset. - */ + /** @return Returns the offset. */ + @Override public int getOffset() { return offset; } - /** - * @param o The offset to set. - */ + /** @param o The offset to set. */ + @Override public void setOffset(int o) { offset = o; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
