diff options
| author | Vincent Hennebert <vhennebert@apache.org> | 2009-10-13 16:41:13 +0000 |
|---|---|---|
| committer | Vincent Hennebert <vhennebert@apache.org> | 2009-10-13 16:41:13 +0000 |
| commit | 26cd587bf66b2895575a231e8a94d8d1b2721b23 (patch) | |
| tree | d0dcf65b9a598873275e0eea303b58326c3b9431 /src/java/org/apache/fop/layoutmgr | |
| parent | d3551e5d341ef9ef2ba2091dd9aa91c279bd9515 (diff) | |
| parent | a267cc5fa78c67e2b6257a9b54c0726a18b1a51b (diff) | |
| download | xmlgraphics-fop-26cd587bf66b2895575a231e8a94d8d1b2721b23.tar.gz xmlgraphics-fop-26cd587bf66b2895575a231e8a94d8d1b2721b23.zip | |
Merged changes from Trunk up to revision 824832
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_Accessibility@824839 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/layoutmgr')
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java | 6 | ||||
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/KnuthPenalty.java | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java | 0 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java index 53c529eaa..9a0dbe220 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java @@ -1021,7 +1021,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager /** * {@inheritDoc} - * Default implementation throws {@code IllegalStateException} + * Default implementation throws a {@link IllegalStateException}. * Must be implemented by the subclass, if applicable. */ public KeepProperty getKeepTogetherProperty() { @@ -1030,7 +1030,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager /** * {@inheritDoc} - * Default implementation throws {@code IllegalStateException} + * Default implementation throws a {@link IllegalStateException}. * Must be implemented by the subclass, if applicable. */ public KeepProperty getKeepWithPreviousProperty() { @@ -1039,7 +1039,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager /** * {@inheritDoc} - * Default implementation throws {@code IllegalStateException} + * Default implementation throws a {@link IllegalStateException}. * Must be implemented by the subclass, if applicable. */ public KeepProperty getKeepWithNextProperty() { diff --git a/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java b/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java index 5e44127df..9031b6b64 100644 --- a/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java +++ b/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java @@ -86,12 +86,12 @@ public class KnuthPenalty extends KnuthElement { } /** - * Get the penalty's value as a {@code java.lang.String}. - * (Mainly used in {@code toString()} methods, to improve readability + * Get the penalty's value as a {@link java.lang.String}. + * (Mainly used in {@link #toString()} methods, to improve readability * of the trace logs.) * * @param penaltyValue the penalty value - * @return the penalty value as a {@code java.lang.String} + * @return the penalty value as a {@link java.lang.String} */ protected static String valueOf(int penaltyValue) { String result = (penaltyValue < 0) ? "-" : ""; diff --git a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java index 6e0c34a82..6e0c34a82 100755..100644 --- a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java |