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 sp...@apache.org on 2006/12/20 09:34:30 UTC
svn commit: r488960 [2/2] - in
/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo: ./ expr/ flow/ properties/
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/VerticalAlignShorthandParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/VerticalAlignShorthandParser.java?view=diff&rev=488960&r1=488959&r2=488960
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/VerticalAlignShorthandParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/VerticalAlignShorthandParser.java Wed Dec 20 00:34:28 2006
@@ -40,101 +40,101 @@
case EN_BASELINE:
switch (propId) {
case PR_ALIGNMENT_BASELINE:
- return new EnumProperty(EN_BASELINE, "BASELINE");
+ return EnumProperty.getInstance(EN_BASELINE, "BASELINE");
case PR_ALIGNMENT_ADJUST:
- return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));
+ return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
case PR_BASELINE_SHIFT:
- return new EnumLength(new EnumProperty(EN_BASELINE, "BASELINE"));
+ return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
case PR_DOMINANT_BASELINE:
- return new EnumProperty(EN_AUTO, "AUTO");
+ return EnumProperty.getInstance(EN_AUTO, "AUTO");
}
case EN_TOP:
switch (propId) {
case PR_ALIGNMENT_BASELINE:
- return new EnumProperty(EN_BEFORE_EDGE, "BEFORE_EDGE");
+ return EnumProperty.getInstance(EN_BEFORE_EDGE, "BEFORE_EDGE");
case PR_ALIGNMENT_ADJUST:
- return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));
+ return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
case PR_BASELINE_SHIFT:
- return new EnumLength(new EnumProperty(EN_BASELINE, "BASELINE"));
+ return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
case PR_DOMINANT_BASELINE:
- return new EnumProperty(EN_AUTO, "AUTO");
+ return EnumProperty.getInstance(EN_AUTO, "AUTO");
}
case EN_TEXT_TOP:
switch (propId) {
case PR_ALIGNMENT_BASELINE:
- return new EnumProperty(EN_TEXT_BEFORE_EDGE, "TEXT_BEFORE_EDGE");
+ return EnumProperty.getInstance(EN_TEXT_BEFORE_EDGE, "TEXT_BEFORE_EDGE");
case PR_ALIGNMENT_ADJUST:
- return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));
+ return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
case PR_BASELINE_SHIFT:
- return new EnumLength(new EnumProperty(EN_BASELINE, "BASELINE"));
+ return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
case PR_DOMINANT_BASELINE:
- return new EnumProperty(EN_AUTO, "AUTO");
+ return EnumProperty.getInstance(EN_AUTO, "AUTO");
}
case EN_MIDDLE:
switch (propId) {
case PR_ALIGNMENT_BASELINE:
- return new EnumProperty(EN_MIDDLE, "MIDDLE");
+ return EnumProperty.getInstance(EN_MIDDLE, "MIDDLE");
case PR_ALIGNMENT_ADJUST:
- return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));
+ return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
case PR_BASELINE_SHIFT:
- return new EnumLength(new EnumProperty(EN_BASELINE, "BASELINE"));
+ return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
case PR_DOMINANT_BASELINE:
- return new EnumProperty(EN_AUTO, "AUTO");
+ return EnumProperty.getInstance(EN_AUTO, "AUTO");
}
case EN_BOTTOM:
switch (propId) {
case PR_ALIGNMENT_BASELINE:
- return new EnumProperty(EN_AFTER_EDGE, "AFTER_EDGE");
+ return EnumProperty.getInstance(EN_AFTER_EDGE, "AFTER_EDGE");
case PR_ALIGNMENT_ADJUST:
- return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));
+ return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
case PR_BASELINE_SHIFT:
- return new EnumLength(new EnumProperty(EN_BASELINE, "BASELINE"));
+ return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
case PR_DOMINANT_BASELINE:
- return new EnumProperty(EN_AUTO, "AUTO");
+ return EnumProperty.getInstance(EN_AUTO, "AUTO");
}
case EN_TEXT_BOTTOM:
switch (propId) {
case PR_ALIGNMENT_BASELINE:
- return new EnumProperty(EN_TEXT_AFTER_EDGE, "TEXT_AFTER_EDGE");
+ return EnumProperty.getInstance(EN_TEXT_AFTER_EDGE, "TEXT_AFTER_EDGE");
case PR_ALIGNMENT_ADJUST:
- return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));
+ return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
case PR_BASELINE_SHIFT:
- return new EnumLength(new EnumProperty(EN_BASELINE, "BASELINE"));
+ return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
case PR_DOMINANT_BASELINE:
- return new EnumProperty(EN_AUTO, "AUTO");
+ return EnumProperty.getInstance(EN_AUTO, "AUTO");
}
case EN_SUB:
switch (propId) {
case PR_ALIGNMENT_BASELINE:
- return new EnumProperty(EN_BASELINE, "BASELINE");
+ return EnumProperty.getInstance(EN_BASELINE, "BASELINE");
case PR_ALIGNMENT_ADJUST:
- return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));
+ return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
case PR_BASELINE_SHIFT:
- return new EnumLength(new EnumProperty(EN_SUB, "SUB"));
+ return new EnumLength(EnumProperty.getInstance(EN_SUB, "SUB"));
case PR_DOMINANT_BASELINE:
- return new EnumProperty(EN_AUTO, "AUTO");
+ return EnumProperty.getInstance(EN_AUTO, "AUTO");
}
case EN_SUPER:
switch (propId) {
case PR_ALIGNMENT_BASELINE:
- return new EnumProperty(EN_BASELINE, "BASELINE");
+ return EnumProperty.getInstance(EN_BASELINE, "BASELINE");
case PR_ALIGNMENT_ADJUST:
- return new EnumLength(new EnumProperty(EN_AUTO, "AUTO"));
+ return new EnumLength(EnumProperty.getInstance(EN_AUTO, "AUTO"));
case PR_BASELINE_SHIFT:
- return new EnumLength(new EnumProperty(EN_SUPER, "SUPER"));
+ return new EnumLength(EnumProperty.getInstance(EN_SUPER, "SUPER"));
case PR_DOMINANT_BASELINE:
- return new EnumProperty(EN_AUTO, "AUTO");
+ return EnumProperty.getInstance(EN_AUTO, "AUTO");
}
default:
switch (propId) {
case PR_ALIGNMENT_BASELINE:
- return new EnumProperty(EN_BASELINE, "BASELINE");
+ return EnumProperty.getInstance(EN_BASELINE, "BASELINE");
case PR_ALIGNMENT_ADJUST:
return property;
case PR_BASELINE_SHIFT:
- return new EnumLength(new EnumProperty(EN_BASELINE, "BASELINE"));
+ return new EnumLength(EnumProperty.getInstance(EN_BASELINE, "BASELINE"));
case PR_DOMINANT_BASELINE:
- return new EnumProperty(EN_AUTO, "AUTO");
+ return EnumProperty.getInstance(EN_AUTO, "AUTO");
}
}
return null;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/WhiteSpaceShorthandParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/WhiteSpaceShorthandParser.java?view=diff&rev=488960&r1=488959&r2=488960
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/WhiteSpaceShorthandParser.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/WhiteSpaceShorthandParser.java Wed Dec 20 00:34:28 2006
@@ -42,17 +42,17 @@
switch (propId) {
case Constants.PR_LINEFEED_TREATMENT:
case Constants.PR_WHITE_SPACE_TREATMENT:
- return new EnumProperty(Constants.EN_PRESERVE, "PRESERVE");
+ return EnumProperty.getInstance(Constants.EN_PRESERVE, "PRESERVE");
case Constants.PR_WHITE_SPACE_COLLAPSE:
- return new EnumProperty(Constants.EN_FALSE, "FALSE");
+ return EnumProperty.getInstance(Constants.EN_FALSE, "FALSE");
case Constants.PR_WRAP_OPTION:
- return new EnumProperty(Constants.EN_NO_WRAP, "NO_WRAP");
+ return EnumProperty.getInstance(Constants.EN_NO_WRAP, "NO_WRAP");
default:
//nop
}
case Constants.EN_NO_WRAP:
if (propId == Constants.PR_WRAP_OPTION) {
- return new EnumProperty(Constants.EN_NO_WRAP, "NO_WRAP");
+ return EnumProperty.getInstance(Constants.EN_NO_WRAP, "NO_WRAP");
}
case Constants.EN_NORMAL:
default:
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org