You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/01/28 17:56:51 UTC
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow ListItem.java ListBlock.java
jeremias 2005/01/28 08:56:51
Modified: src/java/org/apache/fop/fo/flow ListItem.java ListBlock.java
Log:
Cleanup and added missing some public accessors.
Revision Changes Path
1.36 +30 -6 xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java
Index: ListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ListItem.java 24 Dec 2004 12:06:26 -0000 1.35
+++ ListItem.java 28 Jan 2005 16:56:51 -0000 1.36
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
package org.apache.fop.fo.flow;
-// Java
-import java.util.List;
-
import org.xml.sax.Locator;
import org.apache.fop.apps.FOPException;
@@ -34,7 +31,6 @@
import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.KeepProperty;
-import org.apache.fop.layoutmgr.list.ListItemLayoutManager;
/**
* Class modelling the fo:list-item object.
@@ -148,6 +144,34 @@
}
/**
+ * @return the Common Margin Properties-Block.
+ */
+ public CommonMarginBlock getCommonMarginBlock() {
+ return commonMarginBlock;
+ }
+
+ /**
+ * @return the Common Border, Padding, and Background Properties.
+ */
+ public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
+ return commonBorderPaddingBackground;
+ }
+
+ /**
+ * @return the "break-after" property.
+ */
+ public int getBreakAfter() {
+ return breakAfter;
+ }
+
+ /**
+ * @return the "break-before" property.
+ */
+ public int getBreakBefore() {
+ return breakBefore;
+ }
+
+ /**
* Return the "id" property.
*/
public String getId() {
1.37 +22 -10 xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java
Index: ListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ListBlock.java 24 Dec 2004 12:06:26 -0000 1.36
+++ ListBlock.java 28 Jan 2005 16:56:51 -0000 1.37
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
package org.apache.fop.fo.flow;
-// Java
-import java.util.List;
-
import org.xml.sax.Locator;
import org.apache.fop.apps.FOPException;
@@ -35,7 +32,6 @@
import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.fo.properties.CommonRelativePosition;
import org.apache.fop.fo.properties.KeepProperty;
-import org.apache.fop.layoutmgr.list.ListBlockLayoutManager;
/**
* Class modelling the fo:list-block object.
@@ -84,8 +80,10 @@
keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
- provisionalDistanceBetweenStarts = pList.get(PR_PROVISIONAL_DISTANCE_BETWEEN_STARTS).getLength();
- provisionalLabelSeparation = pList.get(PR_PROVISIONAL_LABEL_SEPARATION).getLength();
+ provisionalDistanceBetweenStarts = pList.get(
+ PR_PROVISIONAL_DISTANCE_BETWEEN_STARTS).getLength();
+ provisionalLabelSeparation = pList.get(
+ PR_PROVISIONAL_LABEL_SEPARATION).getLength();
}
/**
@@ -126,21 +124,35 @@
}
/**
- * Return the Common Margin Properties-Block.
+ * @return the Common Margin Properties-Block.
*/
public CommonMarginBlock getCommonMarginBlock() {
return commonMarginBlock;
}
/**
- * Return the Common Border, Padding, and Background Properties.
+ * @return the Common Border, Padding, and Background Properties.
*/
public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
return commonBorderPaddingBackground;
}
/**
- * Return the "id" property.
+ * @return the "break-after" property.
+ */
+ public int getBreakAfter() {
+ return breakAfter;
+ }
+
+ /**
+ * @return the "break-before" property.
+ */
+ public int getBreakBefore() {
+ return breakBefore;
+ }
+
+ /**
+ * @return the "id" property.
*/
public String getId() {
return id;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org