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 gm...@apache.org on 2004/01/07 22:28:42 UTC
cvs commit: xml-fop/src/java/org/apache/fop/datatypes LengthRange.java Space.java
gmazza 2004/01/07 13:28:42
Modified: src/java/org/apache/fop/datatypes LengthRange.java
Space.java
Log:
Constants simplifications in LengthRange and Space.java.
Revision Changes Path
1.6 +6 -7 xml-fop/src/java/org/apache/fop/datatypes/LengthRange.java
Index: LengthRange.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/LengthRange.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LengthRange.java 6 Jan 2004 00:49:40 -0000 1.5
+++ LengthRange.java 7 Jan 2004 21:28:42 -0000 1.6
@@ -51,7 +51,6 @@
package org.apache.fop.datatypes;
import org.apache.fop.fo.Property;
-import org.apache.fop.fo.Constants;
/**
* A "progression-dimension" quantity.
@@ -74,11 +73,11 @@
*/
public void setComponent(int cmpId, Property cmpnValue,
boolean bIsDefault) {
- if (cmpId == Constants.CP_MINIMUM) {
+ if (cmpId == CP_MINIMUM) {
setMinimum(cmpnValue, bIsDefault);
- } else if (cmpId == Constants.CP_OPTIMUM) {
+ } else if (cmpId == CP_OPTIMUM) {
setOptimum(cmpnValue, bIsDefault);
- } else if (cmpId == Constants.CP_MAXIMUM) {
+ } else if (cmpId == CP_MAXIMUM) {
setMaximum(cmpnValue, bIsDefault);
}
}
@@ -87,11 +86,11 @@
* @see org.apache.fop.datatypes.CompoundDatatype#getComponent(int)
*/
public Property getComponent(int cmpId) {
- if (cmpId == Constants.CP_MINIMUM) {
+ if (cmpId == CP_MINIMUM) {
return getMinimum();
- } else if (cmpId == Constants.CP_OPTIMUM) {
+ } else if (cmpId == CP_OPTIMUM) {
return getOptimum();
- } else if (cmpId == Constants.CP_MAXIMUM) {
+ } else if (cmpId == CP_MAXIMUM) {
return getMaximum();
} else {
return null; // SHOULDN'T HAPPEN
1.5 +4 -5 xml-fop/src/java/org/apache/fop/datatypes/Space.java
Index: Space.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/Space.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Space.java 6 Jan 2004 00:49:40 -0000 1.4
+++ Space.java 7 Jan 2004 21:28:42 -0000 1.5
@@ -51,7 +51,6 @@
package org.apache.fop.datatypes;
import org.apache.fop.fo.Property;
-import org.apache.fop.fo.Constants;
/**
* a space quantity in XSL (space-before, space-after)
@@ -66,9 +65,9 @@
*/
public void setComponent(int cmpId, Property cmpnValue,
boolean bIsDefault) {
- if (cmpId == Constants.CP_PRECEDENCE) {
+ if (cmpId == CP_PRECEDENCE) {
setPrecedence(cmpnValue, bIsDefault);
- } else if (cmpId == Constants.CP_CONDITIONALITY) {
+ } else if (cmpId == CP_CONDITIONALITY) {
setConditionality(cmpnValue, bIsDefault);
} else {
super.setComponent(cmpId, cmpnValue, bIsDefault);
@@ -79,9 +78,9 @@
* @see org.apache.fop.datatypes.CompoundDatatype#getComponent(int)
*/
public Property getComponent(int cmpId) {
- if (cmpId == Constants.CP_PRECEDENCE) {
+ if (cmpId == CP_PRECEDENCE) {
return getPrecedence();
- } else if (cmpId == Constants.CP_CONDITIONALITY) {
+ } else if (cmpId == CP_CONDITIONALITY) {
return getConditionality();
} else {
return super.getComponent(cmpId);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org