bckfnn 2004/10/20 10:49:16
Modified: src/java/org/apache/fop/fo/flow Leader.java TableRow.java
src/java/org/apache/fop/layoutmgr LeaderLayoutManager.java
Log:
Fourth phase of performance improvement.
- fix temporary renamed property getter method.
PR: 31699
Revision Changes Path
1.42 +1 -10 xml-fop/src/java/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Leader.java 20 Oct 2004 11:55:32 -0000 1.41
+++ Leader.java 20 Oct 2004 17:49:16 -0000 1.42
@@ -155,18 +155,10 @@
return length;
}
- public int getRuleThickness() {
- return ruleThickness.getValue();
- }
-
public Font getFontState() {
return commonFont.getFontState(getFOEventHandler().getFontInfo());
}
- public int getPatternWidth() {
- return leaderPatternWidth.getValue();
- }
-
/**
* Return the Common Font Properties.
*/
@@ -190,9 +182,8 @@
/**
* Return the "rule-thickness" property.
- * TODO: 31699
*/
- public Length ___getRuleThickness() {
+ public Length getRuleThickness() {
return ruleThickness;
}
1.39 +1 -2 xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- TableRow.java 19 Oct 2004 13:45:37 -0000 1.38
+++ TableRow.java 20 Oct 2004 17:49:16 -0000 1.39
@@ -151,9 +151,8 @@
/**
* Return the "keep-with-previous" property.
- * TODO: 31699
*/
- public KeepProperty ___getKeepWithPrevious() {
+ public KeepProperty getKeepWithPrevious() {
return keepWithPrevious;
}
1.10 +8 -8
xml-fop/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java
Index: LeaderLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LeaderLayoutManager.java 20 Oct 2004 13:37:48 -0000 1.9
+++ LeaderLayoutManager.java 20 Oct 2004 17:49:16 -0000 1.10
@@ -75,7 +75,7 @@
org.apache.fop.area.inline.Leader leader =
new org.apache.fop.area.inline.Leader();
leader.setRuleStyle(fobj.getRuleStyle());
- leader.setRuleThickness(fobj.getRuleThickness());
+ leader.setRuleThickness(fobj.getRuleThickness().getValue());
leaderArea = leader;
} else if (fobj.getLeaderPattern() == LeaderPattern.SPACE) {
leaderArea = new Space();
@@ -90,10 +90,10 @@
t.setOffset(font.getAscender());
int width = font.getCharWidth(dot);
Space spacer = null;
- if (fobj.getPatternWidth() > width) {
+ if (fobj.getLeaderPatternWidth().getValue() > width) {
spacer = new Space();
- spacer.setIPD(fobj.getPatternWidth() - width);
- width = fobj.getPatternWidth();
+ spacer.setIPD(fobj.getLeaderPatternWidth().getValue() - width);
+ width = fobj.getLeaderPatternWidth().getValue();
}
FilledArea fa = new FilledArea();
fa.setUnitWidth(width);
@@ -127,10 +127,10 @@
clm.fillArea(lm);
int width = clm.getStackingSize();
Space spacer = null;
- if (fobj.getPatternWidth() > width) {
+ if (fobj.getLeaderPatternWidth().getValue() > width) {
spacer = new Space();
- spacer.setIPD(fobj.getPatternWidth() - width);
- width = fobj.getPatternWidth();
+ spacer.setIPD(fobj.getLeaderPatternWidth().getValue() - width);
+ width = fobj.getLeaderPatternWidth().getValue();
}
fa.setUnitWidth(width);
if (spacer != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
