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 pb...@apache.org on 2002/10/21 18:31:46 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/properties WordSpacingCommon.java AbsolutePosition.java ActiveState.java AlignmentAdjust.java AlignmentBaseline.java AutoRestore.java BackgroundAttachment.java BackgroundColor.java Background.java BackgroundPositionHorizontal.java BackgroundPosition.java BackgroundPositionVertical.java BackgroundRepeat.java BaselineShift.java BlankOrNotBlank.java BorderAfterColor.java BorderAfterWidthConditionality.java BorderAfterWidth.java BorderAfterWidthLength.java BorderBeforeColor.java BorderBeforeWidthConditionality.java BorderBeforeWidth.java BorderBeforeWidthLength.java BorderBottomColor.java BorderBottom.java BorderBottomWidth.java BorderCollapse.java BorderColor.java BorderCommonStyle.java BorderCommonWidth.java BorderEndColor.java BorderEndWidthConditionality.java BorderEndWidth.java BorderEndWidthLength.java Border.java BorderLeftColor.java BorderLeft.java BorderLeftWidth.java BorderRightColor.java BorderRight.java BorderRightWidth.java BorderSeparationBlockProgressionDirection.java BorderSeparationInlineProgressionDirection.java BorderSpacing.java BorderStartColor.java BorderStartWidthConditionality.java BorderStartWidth.java BorderStartWidthLength.java BorderStyle.java BorderTopColor.java BorderTop.java BorderTopWidth.java BorderWidth.java BreakCommon.java CaptionSide.java Clear.java Clip.java Color.java ColorNonTransparent.java ColorTransparent.java ColumnCount.java ColumnGap.java Conditionality.java ContentDimension.java Cue.java DestinationPlacementOffset.java Direction.java DisplayAlign.java DominantBaseline.java EmptyCells.java EndIndent.java EndsRow.java Extent.java ExternalDestination.java Float.java FlowName.java FontFamily.java Font.java FontSelectionStrategy.java FontSize.java FontStretch.java FontStyle.java FontVariant.java FontWeight.java ForcePageCount.java Format.java GlyphOrientationHorizontal.java Hyphenate.java HyphenationCharacter.java HyphenationKeep.java HyphenationLadderCount.java HyphenationPushCharacterCount.java HyphenationRemainCharacterCount.java IndicateDestination.java InitialPageNumber.java InternalDestination.java IntrusionDisplace.java Keep.java LastLineEndIndent.java LeaderAlignment.java LeaderLengthMaximum.java LeaderLengthMinimum.java LeaderLengthOptimum.java LeaderPattern.java LeaderPatternWidth.java LetterSpacingConditionality.java LetterSpacing.java LetterSpacingMaximum.java LetterSpacingMinimum.java LetterSpacingOptimum.java LetterSpacingPrecedence.java LetterValue.java LinefeedTreatment.java LineHeightConditionality.java LineHeight.java LineHeightMaximum.java LineHeightMinimum.java LineHeightOptimum.java LineHeightPrecedence.java LineHeightShiftAdjustment.java LineStackingStrategy.java MarginBottom.java Margin.java MarginLeft.java MarginRight.java MarginTop.java MarkerClassName.java MasterName.java MasterReference.java MaxHeight.java MaximumRepeats.java MediaUsage.java MinHeight.java NumberColumnsRepeated.java NumberColumnsSpanned.java NumberRowsSpanned.java OddOrEven.java Orphans.java Overflow.java PaddingAfterConditionality.java PaddingAfter.java PaddingAfterLength.java PaddingBeforeConditionality.java PaddingBefore.java PaddingBeforeLength.java PaddingBottom.java PaddingEndConditionality.java PaddingEnd.java PaddingEndLength.java Padding.java PaddingLeft.java PaddingRight.java PaddingStartConditionality.java PaddingStart.java PaddingStartLength.java PaddingTop.java PageBreakCommon.java PageBreakInside.java PageHeightWidth.java PagePosition.java Position.java PrecedenceCommon.java Precedence.java Property.java ProvisionalDistanceBetweenStarts.java ProvisionalLabelSeparation.java ReferenceOrientation.java RegionName.java RelativeAlign.java RelativePosition.java RenderingIntent.java RetrieveBoundary.java RetrievePosition.java RuleStyle.java RuleThickness.java Scaling.java ScalingMethod.java ScoreSpaces.java ShowDestination.java Size.java SourceDocument.java SpaceAfterConditionality.java SpaceAfter.java SpaceAfterMaximum.java SpaceAfterMinimum.java SpaceAfterOptimum.java SpaceAfterPrecedence.java SpaceBeforeConditionality.java SpaceBefore.java SpaceBeforeMaximum.java SpaceBeforeMinimum.java SpaceBeforeOptimum.java SpaceBeforePrecedence.java SpaceEndConditionality.java SpaceEnd.java SpaceEndMaximum.java SpaceEndMinimum.java SpaceEndOptimum.java SpaceEndPrecedence.java SpaceStartConditionality.java SpaceStart.java SpaceStartMaximum.java SpaceStartMinimum.java SpaceStartOptimum.java SpaceStartPrecedence.java Span.java StartIndent.java StartingState.java StartsRow.java SuppressAtLineBreak.java SwitchTo.java TableLayout.java TableOmitFooterAtBreak.java TableOmitHeaderAtBreak.java TargetPresentationContext.java TargetProcessingContext.java TargetStylesheet.java TextAlign.java TextAlignLast.java TextAltitude.java TextDecoration.java TextDepth.java TextIndent.java TextShadow.java TextTransform.java UnicodeBidi.java VerticalAlign.java Visibility.java WhiteSpaceCollapse.java WhiteSpace.java WhiteSpaceTreatment.java Widows.java WordSpacingConditionality.java WordSpacing.java WordSpacingMaximum.java WordSpacingMinimum.java WordSpacingOptimum.java WordSpacingPrecedence.java WrapOption.java WritingMode.java
pbwest 2002/10/21 09:31:46
Modified: src/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design
AbsolutePosition.java ActiveState.java
AlignmentAdjust.java AlignmentBaseline.java
AutoRestore.java BackgroundAttachment.java
BackgroundColor.java Background.java
BackgroundPositionHorizontal.java
BackgroundPosition.java
BackgroundPositionVertical.java
BackgroundRepeat.java BaselineShift.java
BlankOrNotBlank.java BorderAfterColor.java
BorderAfterWidthConditionality.java
BorderAfterWidth.java BorderAfterWidthLength.java
BorderBeforeColor.java
BorderBeforeWidthConditionality.java
BorderBeforeWidth.java BorderBeforeWidthLength.java
BorderBottomColor.java BorderBottom.java
BorderBottomWidth.java BorderCollapse.java
BorderColor.java BorderCommonStyle.java
BorderCommonWidth.java BorderEndColor.java
BorderEndWidthConditionality.java
BorderEndWidth.java BorderEndWidthLength.java
Border.java BorderLeftColor.java BorderLeft.java
BorderLeftWidth.java BorderRightColor.java
BorderRight.java BorderRightWidth.java
BorderSeparationBlockProgressionDirection.java
BorderSeparationInlineProgressionDirection.java
BorderSpacing.java BorderStartColor.java
BorderStartWidthConditionality.java
BorderStartWidth.java BorderStartWidthLength.java
BorderStyle.java BorderTopColor.java BorderTop.java
BorderTopWidth.java BorderWidth.java
BreakCommon.java CaptionSide.java Clear.java
Clip.java Color.java ColorNonTransparent.java
ColorTransparent.java ColumnCount.java
ColumnGap.java Conditionality.java
ContentDimension.java Cue.java
DestinationPlacementOffset.java Direction.java
DisplayAlign.java DominantBaseline.java
EmptyCells.java EndIndent.java EndsRow.java
Extent.java ExternalDestination.java Float.java
FlowName.java FontFamily.java Font.java
FontSelectionStrategy.java FontSize.java
FontStretch.java FontStyle.java FontVariant.java
FontWeight.java ForcePageCount.java Format.java
GlyphOrientationHorizontal.java Hyphenate.java
HyphenationCharacter.java HyphenationKeep.java
HyphenationLadderCount.java
HyphenationPushCharacterCount.java
HyphenationRemainCharacterCount.java
IndicateDestination.java InitialPageNumber.java
InternalDestination.java IntrusionDisplace.java
Keep.java LastLineEndIndent.java
LeaderAlignment.java LeaderLengthMaximum.java
LeaderLengthMinimum.java LeaderLengthOptimum.java
LeaderPattern.java LeaderPatternWidth.java
LetterSpacingConditionality.java LetterSpacing.java
LetterSpacingMaximum.java LetterSpacingMinimum.java
LetterSpacingOptimum.java
LetterSpacingPrecedence.java LetterValue.java
LinefeedTreatment.java
LineHeightConditionality.java LineHeight.java
LineHeightMaximum.java LineHeightMinimum.java
LineHeightOptimum.java LineHeightPrecedence.java
LineHeightShiftAdjustment.java
LineStackingStrategy.java MarginBottom.java
Margin.java MarginLeft.java MarginRight.java
MarginTop.java MarkerClassName.java MasterName.java
MasterReference.java MaxHeight.java
MaximumRepeats.java MediaUsage.java MinHeight.java
NumberColumnsRepeated.java
NumberColumnsSpanned.java NumberRowsSpanned.java
OddOrEven.java Orphans.java Overflow.java
PaddingAfterConditionality.java PaddingAfter.java
PaddingAfterLength.java
PaddingBeforeConditionality.java PaddingBefore.java
PaddingBeforeLength.java PaddingBottom.java
PaddingEndConditionality.java PaddingEnd.java
PaddingEndLength.java Padding.java PaddingLeft.java
PaddingRight.java PaddingStartConditionality.java
PaddingStart.java PaddingStartLength.java
PaddingTop.java PageBreakCommon.java
PageBreakInside.java PageHeightWidth.java
PagePosition.java Position.java
PrecedenceCommon.java Precedence.java Property.java
ProvisionalDistanceBetweenStarts.java
ProvisionalLabelSeparation.java
ReferenceOrientation.java RegionName.java
RelativeAlign.java RelativePosition.java
RenderingIntent.java RetrieveBoundary.java
RetrievePosition.java RuleStyle.java
RuleThickness.java Scaling.java ScalingMethod.java
ScoreSpaces.java ShowDestination.java Size.java
SourceDocument.java SpaceAfterConditionality.java
SpaceAfter.java SpaceAfterMaximum.java
SpaceAfterMinimum.java SpaceAfterOptimum.java
SpaceAfterPrecedence.java
SpaceBeforeConditionality.java SpaceBefore.java
SpaceBeforeMaximum.java SpaceBeforeMinimum.java
SpaceBeforeOptimum.java SpaceBeforePrecedence.java
SpaceEndConditionality.java SpaceEnd.java
SpaceEndMaximum.java SpaceEndMinimum.java
SpaceEndOptimum.java SpaceEndPrecedence.java
SpaceStartConditionality.java SpaceStart.java
SpaceStartMaximum.java SpaceStartMinimum.java
SpaceStartOptimum.java SpaceStartPrecedence.java
Span.java StartIndent.java StartingState.java
StartsRow.java SuppressAtLineBreak.java
SwitchTo.java TableLayout.java
TableOmitFooterAtBreak.java
TableOmitHeaderAtBreak.java
TargetPresentationContext.java
TargetProcessingContext.java TargetStylesheet.java
TextAlign.java TextAlignLast.java TextAltitude.java
TextDecoration.java TextDepth.java TextIndent.java
TextShadow.java TextTransform.java UnicodeBidi.java
VerticalAlign.java Visibility.java
WhiteSpaceCollapse.java WhiteSpace.java
WhiteSpaceTreatment.java Widows.java
WordSpacingConditionality.java WordSpacing.java
WordSpacingMaximum.java WordSpacingMinimum.java
WordSpacingOptimum.java WordSpacingPrecedence.java
WrapOption.java WritingMode.java
Added: src/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design
WordSpacingCommon.java
Log:
Methods converted from class to instance.
Property index argument added to refineParsing() and refineExpansionList().
Revision Changes Path
No revision
No revision
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/AbsolutePosition.java
Index: AbsolutePosition.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/AbsolutePosition.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AbsolutePosition.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ AbsolutePosition.java 21 Oct 2002 16:31:29 -0000 1.1.2.2
@@ -18,10 +18,10 @@
,"absolute"
,"fixed"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/ActiveState.java
Index: ActiveState.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ActiveState.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ActiveState.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ ActiveState.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -38,10 +38,10 @@
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/AlignmentAdjust.java
Index: AlignmentAdjust.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/AlignmentAdjust.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AlignmentAdjust.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ AlignmentAdjust.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -51,10 +51,10 @@
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/AlignmentBaseline.java
Index: AlignmentBaseline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/AlignmentBaseline.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AlignmentBaseline.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ AlignmentBaseline.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -50,10 +50,10 @@
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/AutoRestore.java
Index: AutoRestore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/AutoRestore.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- AutoRestore.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ AutoRestore.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = BOOL;
public static final int traitMapping = ACTION;
public static final int initialValueType = BOOL_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.AUTO_RESTORE, true);
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundAttachment.java
Index: BackgroundAttachment.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundAttachment.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BackgroundAttachment.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BackgroundAttachment.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -13,7 +13,7 @@
public static final int initialValueType = ENUM_IT;
public static final int SCROLL = 1;
public static final int FIXED = 2;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.BACKGROUND_ATTACHMENT, SCROLL);
@@ -26,10 +26,10 @@
,"scroll"
,"fixed"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundColor.java
Index: BackgroundColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundColor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BackgroundColor.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BackgroundColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -9,7 +9,7 @@
public static final int dataTypes = COLOR_TRANS | INHERIT;
public static final int traitMapping = RENDERING;
public static final int initialValueType = COLOR_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, "transparent");
1.1.2.2 +40 -31 xml-fop/src/org/apache/fop/fo/properties/Attic/Background.java
Index: Background.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Background.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Background.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ Background.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -54,21 +54,30 @@
* a BackgroundAttachment EnumType or Inherit value
* a BackgroundPositionHorizontal Numeric or Inherit value
* a BackgroundPositionVertical Numeric or Inherit value
+ *
+ * @param propindex - the <tt>int</tt> property index.
+ * @param foNode - the <tt>FONode</tt> on which this expression is being
+ * parsed.
+ * @value - the <tt>PropertyValue</tt> passed from
+ * <i>PropertyParser.parse()</i>.
+ * @return the refined <tt>PropertyValue</tt>.
+ * @throws <tt>PropertyException</tt>.
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
if ( ! (value instanceof PropertyValueList)) {
- return processValue(foNode, value);
+ return processValue(propindex, foNode, value);
} else {
- return processList
- (foNode, spaceSeparatedList((PropertyValueList)value));
+ return processList(propindex,
+ foNode, spaceSeparatedList((PropertyValueList)value));
}
}
- private /**/static/**/ PropertyValueList processValue
- (FONode foNode, PropertyValue value) throws PropertyException
+ private /*static*/ PropertyValueList processValue
+ (int propindex, FONode foNode, PropertyValue value)
+ throws PropertyException
{
// Can be Inherit, ColorType, UriType, None, Numeric, or an
// NCName (i.e. enum token)
@@ -78,22 +87,23 @@
type == PropertyValue.FROM_NEAREST_SPECIFIED)
{
// Copy the value to each member of the shorthand expansion
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(value));
+ return refineExpansionList(PropNames.BACKGROUND, foNode,
+ ShorthandPropSets.expandAndCopySHand(value));
} else {
// Make a list and pass to processList
PropertyValueList tmpList
- = new PropertyValueList(value.getProperty());
+ = new PropertyValueList(propindex);
+ //= new PropertyValueList(value.getProperty());
tmpList.add(value);
- return processList(foNode, tmpList);
+ return processList(propindex, foNode, tmpList);
}
}
- private /**/static/**/ PropertyValueList processList
- (FONode foNode, PropertyValueList value)
+ private /*static*/ PropertyValueList processList
+ (int property, FONode foNode, PropertyValueList value)
throws PropertyException
{
- int property = value.getProperty();
+ //int property = value.getProperty();
PropertyValue color= null,
image = null,
repeat = null,
@@ -155,19 +165,17 @@
MessageHandler.log("background: duplicate" +
"position overrides previous position");
if (tmpval == null)
- // Only for testing the effect of statics on speed
- // FIXME NOW
- position = (new BackgroundPosition()).refineParsing
- (foNode, pval, IS_NESTED);
+ position = PropertyConsts.pconsts.refineParsing
+ (PropNames.BACKGROUND_POSITION,
+ foNode, pval, IS_NESTED);
else { // 2 elements
// make a space-separated list
PropertyValueList ssList = new PropertyValueList
(PropNames.BACKGROUND_POSITION);
ssList.add(posnList);
- // Only for testing the effect of statics on speed
- // FIXME NOW
- position = (new BackgroundPosition()).refineParsing
- (foNode, ssList, IS_NESTED);
+ position = PropertyConsts.pconsts.refineParsing
+ (PropNames.BACKGROUND_POSITION,
+ foNode, ssList, IS_NESTED);
}
continue scanning_elements;
} // end of case NUMERIC
@@ -219,13 +227,15 @@
// Is the current NCName a position token?
boolean pos1ok = false, pos2ok = false;
try {
- BackgroundPosition.getEnumIndex(ncname);
+ PropertyConsts.pconsts.getEnumIndex
+ (PropNames.BACKGROUND_POSITION, ncname);
pos1ok = true;
if (elements.hasNext()) {
tmpval = (PropertyValue)(elements.next());
if (tmpval instanceof NCName) {
String ncname2 = ((NCName)tmpval).getString();
- BackgroundPosition.getEnumIndex(ncname2);
+ PropertyConsts.pconsts.getEnumIndex
+ (PropNames.BACKGROUND_POSITION, ncname2);
pos2ok = true;
} else {
// Restore the listIterator cursor
@@ -247,15 +257,14 @@
PropertyValueList ssList = new PropertyValueList
(PropNames.BACKGROUND_POSITION);
ssList.add(posnList);
- position = BackgroundPosition.refineParsing
- (foNode, ssList, IS_NESTED);
+ position = PropertyConsts.pconsts.refineParsing
+ (PropNames.BACKGROUND_POSITION,
+ foNode, ssList, IS_NESTED);
} else { // one only
// Now send one NCName to BackgroundPosition
- // Only for testing the effect of statics on
- // constructor speed.
- // FIXME NOW!!!!!!
- position = BackgroundPosition.refineParsing
- (foNode, pval, IS_NESTED);
+ position = PropertyConsts.pconsts.refineParsing
+ (PropNames.BACKGROUND_POSITION,
+ foNode, pval, IS_NESTED);
}
continue scanning_elements;
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundPositionHorizontal.java
Index: BackgroundPositionHorizontal.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundPositionHorizontal.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BackgroundPositionHorizontal.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BackgroundPositionHorizontal.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -15,7 +15,7 @@
public static final int LEFT = 1;
public static final int CENTER = 2;
public static final int RIGHT = 3;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Percentage.makePercentage
@@ -30,10 +30,10 @@
,"right"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +23 -17 xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundPosition.java
Index: BackgroundPosition.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundPosition.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BackgroundPosition.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BackgroundPosition.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -66,19 +66,21 @@
* containing the expansion of the shorthand. I.e. the first
* element is a value for BackgroundPositionHorizontal, and the
* second is for BackgroundPositionVertical.
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
- return refineParsing(foNode, value, NOT_NESTED);
+ return refineParsing(propindex, foNode, value, NOT_NESTED);
}
/**
- * Do the work for the two argument refineParsing method.
+ * Do the work for the three argument refineParsing method.
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @param nested <tt>boolean</tt> indicating whether this method is
@@ -87,24 +89,24 @@
* @return <tt>PropertyValue</tt> the verified value
* @see #refineParsing(FOTree,PropertyValue)
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value, boolean nested)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
if ( ! (value instanceof PropertyValueList)) {
return processValue(foNode, value, nested);
} else {
return processList
- (spaceSeparatedList((PropertyValueList)value));
+ (spaceSeparatedList((PropertyValueList)value));
}
}
- private /**/static/**/ PropertyValueList processValue
- (FONode foNode, PropertyValue value, boolean nested)
+ private /*static*/ PropertyValueList processValue
+ (FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
- PropertyValueList newlist
- = new PropertyValueList(value.getProperty());
+ int property = value.getProperty();
+ PropertyValueList newlist = new PropertyValueList(property);
// Can only be Inherit, NCName (i.e. enum token)
// or Numeric (i.e. Length or Percentage)
int type = value.getType();
@@ -114,7 +116,8 @@
type == PropertyValue.FROM_NEAREST_SPECIFIED) {
// Copy the value to each member of the shorthand
newlist = refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(value));
+ (PropNames.BACKGROUND_POSITION, foNode,
+ ShorthandPropSets.expandAndCopySHand(value));
}
}
@@ -236,11 +239,13 @@
String enumval2 = ((NCName)posn2).getNCName();
double percent1 = 50.0d, percent2 = 50.0d;
try {
- enum1 = BackgroundPositionHorizontal.getEnumIndex(enumval1);
+ enum1 = PropertyConsts.pconsts.getEnumIndex
+ (PropNames.BACKGROUND_POSITION_HORIZONTAL, enumval1);
} catch (PropertyException e) {
// Not a horizontal element - try vertical
try {
- enum1 = BackgroundPositionVertical.getEnumIndex(enumval1);
+ enum1 = PropertyConsts.pconsts.getEnumIndex
+ (PropNames.BACKGROUND_POSITION_VERTICAL, enumval1);
enum1 += RIGHT;
} catch (PropertyException e2) {
throw new PropertyException
@@ -249,12 +254,13 @@
}
}
try {
- enum2 = BackgroundPositionVertical.getEnumIndex(enumval2);
+ enum2 = PropertyConsts.pconsts.getEnumIndex
+ (PropNames.BACKGROUND_POSITION_VERTICAL, enumval2);
enum2 += RIGHT;
} catch (PropertyException e) {
try {
- enum2 =
- BackgroundPositionHorizontal.getEnumIndex(enumval2);
+ enum2 = PropertyConsts.pconsts.getEnumIndex
+ (PropNames.BACKGROUND_POSITION_HORIZONTAL, enumval2);
} catch (PropertyException e2) {
throw new PropertyException
("Unrecognised value for BackgroundPosition: "
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundPositionVertical.java
Index: BackgroundPositionVertical.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundPositionVertical.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BackgroundPositionVertical.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BackgroundPositionVertical.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -15,7 +15,7 @@
public static final int TOP = 1;
public static final int CENTER = 2;
public static final int BOTTOM = 3;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Percentage.makePercentage
@@ -29,10 +29,10 @@
,"center"
,"bottom"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundRepeat.java
Index: BackgroundRepeat.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundRepeat.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BackgroundRepeat.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BackgroundRepeat.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -15,7 +15,7 @@
public static final int REPEAT_X = 2;
public static final int REPEAT_Y = 3;
public static final int NO_REPEAT = 4;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.BACKGROUND_REPEAT, REPEAT);
@@ -30,10 +30,10 @@
,"repeat-y"
,"no-repeat"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BaselineShift.java
Index: BaselineShift.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BaselineShift.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BaselineShift.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BaselineShift.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -15,7 +15,7 @@
public static final int BASELINE = 1;
public static final int SUB = 2;
public static final int SUPER = 3;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.BASELINE_SHIFT, BASELINE);
@@ -29,10 +29,10 @@
,"sub"
,"super"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BlankOrNotBlank.java
Index: BlankOrNotBlank.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BlankOrNotBlank.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BlankOrNotBlank.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BlankOrNotBlank.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -14,7 +14,7 @@
public static final int BLANK = 1;
public static final int NOT_BLANK = 2;
public static final int ANY = 3;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.BLANK_OR_NOT_BLANK, ANY);
@@ -28,10 +28,10 @@
,"not-blank"
,"any"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterColor.java
Index: BorderAfterColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterColor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderAfterColor.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderAfterColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int traitMapping = RENDERING;
public static final int initialValueType = COLOR_IT;
public static final int inherited = NO;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidthConditionality.java
Index: BorderAfterWidthConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidthConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderAfterWidthConditionality.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderAfterWidthConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidth.java
Index: BorderAfterWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidth.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderAfterWidth.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderAfterWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -18,13 +18,13 @@
// automatically update the following initial Length PropertyValue
// if the mapping changes.
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public static Numeric getMappedLength(int enum)
+ public /*static*/ Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength (PropNames.BORDER_AFTER_WIDTH, enum);
1.1.2.2 +5 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidthLength.java
Index: BorderAfterWidthLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidthLength.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderAfterWidthLength.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderAfterWidthLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -3,17 +3,17 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.properties.BorderCommonWidth;
-public class BorderAfterWidthLength extends Property {
+public class BorderAfterWidthLength extends BorderCommonWidth {
public static final int dataTypes = LENGTH;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
- return BorderCommonWidth.getMappedLength
- (PropNames.BORDER_AFTER_WIDTH_LENGTH, BorderCommonWidth.MEDIUM);
+ return getMappedLength
+ (PropNames.BORDER_AFTER_WIDTH_LENGTH, MEDIUM);
}
public static final int inherited = NO;
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeColor.java
Index: BorderBeforeColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeColor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderBeforeColor.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderBeforeColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int traitMapping = RENDERING;
public static final int initialValueType = COLOR_IT;
public static final int inherited = NO;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType(PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidthConditionality.java
Index: BorderBeforeWidthConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidthConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderBeforeWidthConditionality.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderBeforeWidthConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidth.java
Index: BorderBeforeWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidth.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderBeforeWidth.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderBeforeWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,13 +11,13 @@
COMPOUND | MAPPED_LENGTH | LENGTH | INHERIT;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public static Numeric getMappedLength(int enum)
+ public /*static*/ Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength(PropNames.BORDER_BEFORE_WIDTH, enum);
1.1.2.2 +5 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidthLength.java
Index: BorderBeforeWidthLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidthLength.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderBeforeWidthLength.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderBeforeWidthLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -3,17 +3,17 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.properties.BorderCommonWidth;
-public class BorderBeforeWidthLength extends Property {
+public class BorderBeforeWidthLength extends BorderCommonWidth {
public static final int dataTypes = LENGTH;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
- return BorderCommonWidth.getMappedLength
- (PropNames.BORDER_BEFORE_WIDTH_LENGTH, BorderCommonWidth.MEDIUM);
+ return getMappedLength
+ (PropNames.BORDER_BEFORE_WIDTH_LENGTH, MEDIUM);
}
public static final int inherited = NO;
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottomColor.java
Index: BorderBottomColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottomColor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderBottomColor.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderBottomColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = COLOR_IT;
public static final int inherited = NO;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType(PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.2 +8 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottom.java
Index: BorderBottom.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottom.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderBottom.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderBottom.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -30,15 +30,20 @@
* N.B. this is the order of elements defined in
* ShorthandPropSets.borderRightExpansion
*
+ * @param propindex - the <tt>int</tt> proeprty index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
- return borderEdge(foNode, value,
+ int property = PropNames.BORDER_BOTTOM;
+ if (property != propindex) // DEBUG
+ throw new PropertyException
+ ("Mismatch between propindex and BORDER_BOTTOM.");
+ return borderEdge(property, foNode, value,
PropNames.BORDER_BOTTOM_STYLE,
PropNames.BORDER_BOTTOM_COLOR,
PropNames.BORDER_BOTTOM_WIDTH
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottomWidth.java
Index: BorderBottomWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottomWidth.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderBottomWidth.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderBottomWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,13 +10,13 @@
public static final int dataTypes = MAPPED_LENGTH | INHERIT;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public static Numeric getMappedLength(int enum)
+ public /*static*/ Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength(PropNames.BORDER_BOTTOM_WIDTH, enum);
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderCollapse.java
Index: BorderCollapse.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderCollapse.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderCollapse.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderCollapse.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -13,7 +13,7 @@
public static final int initialValueType = ENUM_IT;
public static final int COLLAPSE = 1;
public static final int SEPARATE = 2;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.BORDER_COLLAPSE, COLLAPSE);
@@ -26,10 +26,10 @@
,"collapse"
,"separate"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +13 -11 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderColor.java
Index: BorderColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderColor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderColor.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -42,19 +42,21 @@
* the third element is a value for border-bottom-color,
* the fourth element is a value for border-left-color.
*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
- return refineParsing(foNode, value, NOT_NESTED);
+ return refineParsing(propindex, foNode, value, NOT_NESTED);
}
/**
- * Do the work for the two argument refineParsing method.
+ * Do the work for the three argument refineParsing method.
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @param nested <tt>boolean</tt> indicating whether this method is
@@ -63,8 +65,8 @@
* @return <tt>PropertyValue</tt> the verified value
* @see #refineParsing(FONode,PropertyValue)
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value, boolean nested)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
int type = value.getType();
@@ -73,12 +75,12 @@
if (type == PropertyValue.INHERIT ||
type == PropertyValue.FROM_PARENT ||
type == PropertyValue.FROM_NEAREST_SPECIFIED)
- return refineExpansionList(foNode,
+ return refineExpansionList(PropNames.BORDER_COLOR, foNode,
ShorthandPropSets.expandAndCopySHand(value));
}
if (type == PropertyValue.COLOR_TYPE)
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(value));
+ return refineExpansionList(PropNames.BORDER_COLOR, foNode,
+ ShorthandPropSets.expandAndCopySHand(value));
if (type == PropertyValue.NCNAME) {
// Must be a standard color
ColorType color;
@@ -90,8 +92,8 @@
(((NCName)value).getNCName() +
" not a standard color for border-color");
}
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(color));
+ return refineExpansionList(PropNames.BORDER_COLOR, foNode,
+ ShorthandPropSets.expandAndCopySHand(color));
}
else throw new PropertyException
("Invalid " + value.getClass().getName() +
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderCommonStyle.java
Index: BorderCommonStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderCommonStyle.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderCommonStyle.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderCommonStyle.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -43,10 +43,10 @@
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderCommonWidth.java
Index: BorderCommonWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderCommonWidth.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderCommonWidth.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderCommonWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -37,17 +37,17 @@
* @return <tt>Numeric[]</tt> containing the values corresponding
* to the MappedNumeric enumeration constants for border width
*/
- public static Numeric getMappedLength(int property, int enum)
+ public /*static*/ Numeric getMappedLength(int property, int enum)
throws PropertyException
{
return
Length.makeLength(property, mappedPoints[enum], Length.PT);
}
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndColor.java
Index: BorderEndColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndColor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderEndColor.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderEndColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int traitMapping = RENDERING;
public static final int initialValueType = COLOR_IT;
public static final int inherited = NO;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidthConditionality.java
Index: BorderEndWidthConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidthConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderEndWidthConditionality.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderEndWidthConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidth.java
Index: BorderEndWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidth.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderEndWidth.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderEndWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,13 +11,13 @@
COMPOUND | MAPPED_LENGTH | LENGTH | INHERIT;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public static Numeric getMappedLength(int enum)
+ public /*static*/ Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength(PropNames.BORDER_END_WIDTH, enum);
1.1.2.2 +5 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidthLength.java
Index: BorderEndWidthLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidthLength.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderEndWidthLength.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderEndWidthLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -3,17 +3,17 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.properties.BorderCommonWidth;
-public class BorderEndWidthLength extends Property {
+public class BorderEndWidthLength extends BorderCommonWidth {
public static final int dataTypes = LENGTH;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
- return BorderCommonWidth.getMappedLength
- (PropNames.BORDER_END_WIDTH_LENGTH, BorderCommonWidth.MEDIUM);
+ return getMappedLength
+ (PropNames.BORDER_END_WIDTH_LENGTH, MEDIUM);
}
public static final int inherited = NO;
1.1.2.2 +11 -10 xml-fop/src/org/apache/fop/fo/properties/Attic/Border.java
Index: Border.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Border.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Border.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ Border.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -6,6 +6,7 @@
import org.apache.fop.datatypes.Ints;
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.ShorthandPropSets;
import org.apache.fop.fo.properties.Property;
@@ -21,8 +22,8 @@
public static final int initialValueType = NOTYPE_IT;
public static final int inherited = NO;
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
int type = value.getType();
@@ -30,8 +31,8 @@
type == PropertyValue.FROM_PARENT ||
type == PropertyValue.FROM_NEAREST_SPECIFIED)
// Copy the value to each member of the shorthand expansion
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(value));
+ return refineExpansionList(PropNames.BORDER, foNode,
+ ShorthandPropSets.expandAndCopySHand(value));
PropertyValueList ssList = null;
// Must be a space-separated list or a single value from the
@@ -58,8 +59,8 @@
PropertyValue val = (PropertyValue)(values.next());
PropertyValue pv = null;
try {
- // FIXME NOW
- pv = (new BorderWidth()).refineParsing(foNode, val, IS_NESTED);
+ pv = PropertyConsts.pconsts.refineParsing
+ (PropNames.BORDER_WIDTH, foNode, val, IS_NESTED);
if (width != null)
MessageHandler.log("border: duplicate" +
"width overrides previous width");
@@ -67,8 +68,8 @@
continue;
} catch (PropertyException e) {}
try {
- // FIXME NOW
- pv = (new BorderStyle()).refineParsing(foNode, val, IS_NESTED);
+ pv = PropertyConsts.pconsts.refineParsing
+ (PropNames.BORDER_STYLE, foNode, val, IS_NESTED);
if (style != null)
MessageHandler.log("border: duplicate" +
"style overrides previous style");
@@ -76,8 +77,8 @@
continue;
} catch (PropertyException e) {}
try {
- // FIXME NOW
- pv = (new BorderColor()).refineParsing(foNode, val, IS_NESTED);
+ pv = PropertyConsts.pconsts.refineParsing
+ (PropNames.BORDER_COLOR, foNode, val, IS_NESTED);
if (color != null)
MessageHandler.log("border: duplicate" +
"color overrides previous color");
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeftColor.java
Index: BorderLeftColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeftColor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderLeftColor.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderLeftColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = COLOR_IT;
public static final int inherited = NO;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.2 +8 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeft.java
Index: BorderLeft.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeft.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderLeft.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderLeft.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -30,15 +30,20 @@
* N.B. this is the order of elements defined in
* ShorthandPropSets.borderRightExpansion
*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
- return borderEdge(foNode, value,
+ int property = PropNames.BORDER_LEFT;
+ if (property != propindex) // DEBUG
+ throw new PropertyException
+ ("Mismatch between propindex and BORDER_LEFT.");
+ return borderEdge(property, foNode, value,
PropNames.BORDER_LEFT_STYLE,
PropNames.BORDER_LEFT_COLOR,
PropNames.BORDER_LEFT_WIDTH
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeftWidth.java
Index: BorderLeftWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeftWidth.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderLeftWidth.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderLeftWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,13 +10,13 @@
public static final int dataTypes = MAPPED_LENGTH | INHERIT;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public static Numeric getMappedLength(int enum)
+ public /*static*/ Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength(PropNames.BORDER_LEFT_WIDTH, enum);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRightColor.java
Index: BorderRightColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRightColor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderRightColor.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderRightColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = COLOR_IT;
public static final int inherited = NO;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.2 +8 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRight.java
Index: BorderRight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRight.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderRight.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderRight.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -30,15 +30,20 @@
* N.B. this is the order of elements defined in
* ShorthandPropSets.borderRightExpansion
*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
- return borderEdge(foNode, value,
+ int property = PropNames.BORDER_RIGHT;
+ if (property != propindex) // DEBUG
+ throw new PropertyException
+ ("Mismatch between propindex and BORDER_RIGHT.");
+ return borderEdge(property, foNode, value,
PropNames.BORDER_RIGHT_STYLE,
PropNames.BORDER_RIGHT_COLOR,
PropNames.BORDER_RIGHT_WIDTH
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRightWidth.java
Index: BorderRightWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRightWidth.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderRightWidth.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderRightWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,13 +10,13 @@
public static final int dataTypes = MAPPED_LENGTH | INHERIT;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public static Numeric getMappedLength(int enum)
+ public /*static*/ Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength(PropNames.BORDER_RIGHT_WIDTH, enum);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderSeparationBlockProgressionDirection.java
Index: BorderSeparationBlockProgressionDirection.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderSeparationBlockProgressionDirection.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderSeparationBlockProgressionDirection.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderSeparationBlockProgressionDirection.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
public static final int dataTypes = LENGTH;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderSeparationInlineProgressionDirection.java
Index: BorderSeparationInlineProgressionDirection.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderSeparationInlineProgressionDirection.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderSeparationInlineProgressionDirection.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderSeparationInlineProgressionDirection.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
public static final int dataTypes = LENGTH;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.2 +7 -6 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderSpacing.java
Index: BorderSpacing.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderSpacing.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderSpacing.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderSpacing.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -28,12 +28,13 @@
* Note: the Lengths cannot be percentages (what about relative
* lengths?)
*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
int type = value.getType();
@@ -41,13 +42,13 @@
if (type == PropertyValue.INHERIT ||
type == PropertyValue.FROM_PARENT ||
type == PropertyValue.FROM_NEAREST_SPECIFIED)
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(value));
+ return refineExpansionList(PropNames.BORDER_SPACING, foNode,
+ ShorthandPropSets.expandAndCopySHand(value));
if (type == PropertyValue.NUMERIC &&
((Numeric)value).isLength())
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(value));
+ return refineExpansionList(PropNames.BORDER_SPACING, foNode,
+ ShorthandPropSets.expandAndCopySHand(value));
throw new PropertyException
("Invalid " + value.getClass().getName() +
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartColor.java
Index: BorderStartColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartColor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderStartColor.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderStartColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
public static final int traitMapping = RENDERING;
public static final int initialValueType = COLOR_IT;
public static final int inherited = NO;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidthConditionality.java
Index: BorderStartWidthConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidthConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderStartWidthConditionality.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderStartWidthConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidth.java
Index: BorderStartWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidth.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderStartWidth.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderStartWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,13 +11,13 @@
COMPOUND | MAPPED_LENGTH | LENGTH | INHERIT;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public static Numeric getMappedLength(int enum)
+ public /*static*/ Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength(PropNames.BORDER_START_WIDTH, enum);
1.1.2.2 +5 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidthLength.java
Index: BorderStartWidthLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidthLength.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderStartWidthLength.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderStartWidthLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -3,17 +3,17 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.properties.BorderCommonWidth;
-public class BorderStartWidthLength extends Property {
+public class BorderStartWidthLength extends BorderCommonWidth {
public static final int dataTypes = LENGTH;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
- return BorderCommonWidth.getMappedLength
- (PropNames.BORDER_START_WIDTH_LENGTH, BorderCommonWidth.MEDIUM);
+ return getMappedLength
+ (PropNames.BORDER_START_WIDTH_LENGTH, MEDIUM);
}
public static final int inherited = NO;
1.1.2.2 +11 -9 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStyle.java
Index: BorderStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStyle.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderStyle.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderStyle.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -40,19 +40,21 @@
* the third element is a value for border-bottom-style,
* the fourth element is a value for border-left-style.
*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
- return refineParsing(foNode, value, NOT_NESTED);
+ return refineParsing(propindex, foNode, value, NOT_NESTED);
}
/**
- * Do the work for the two argument refineParsing method.
+ * Do the work for the three argument refineParsing method.
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @param nested <tt>boolean</tt> indicating whether this method is
@@ -61,8 +63,8 @@
* @return <tt>PropertyValue</tt> the verified value
* @see #refineParsing(FONode,PropertyValue)
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value, boolean nested)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
int type = value.getType();
@@ -71,7 +73,7 @@
if (type == PropertyValue.INHERIT ||
type == PropertyValue.FROM_PARENT ||
type == PropertyValue.FROM_NEAREST_SPECIFIED)
- return refineExpansionList(foNode,
+ return refineExpansionList(PropNames.BORDER_STYLE, foNode,
ShorthandPropSets.expandAndCopySHand(value));
}
if (type == PropertyValue.NCNAME) {
@@ -85,8 +87,8 @@
(((NCName)value).getNCName() +
" not a border-style");
}
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(enum));
+ return refineExpansionList(PropNames.BORDER_STYLE, foNode,
+ ShorthandPropSets.expandAndCopySHand(enum));
}
else throw new PropertyException
("Invalid " + value.getClass().getName() +
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTopColor.java
Index: BorderTopColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTopColor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderTopColor.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderTopColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = COLOR_IT;
public static final int inherited = NO;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.2 +8 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTop.java
Index: BorderTop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTop.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderTop.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderTop.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -30,15 +30,20 @@
* N.B. this is the order of elements defined in
* ShorthandPropSets.borderRightExpansion
*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
- return borderEdge(foNode, value,
+ int property = PropNames.BORDER_TOP;
+ if (property != propindex) // DEBUG
+ throw new PropertyException
+ ("Mismatch between propindex and BORDER_TOP.");
+ return borderEdge(property, foNode, value,
PropNames.BORDER_TOP_STYLE,
PropNames.BORDER_TOP_COLOR,
PropNames.BORDER_TOP_WIDTH
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTopWidth.java
Index: BorderTopWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTopWidth.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderTopWidth.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderTopWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,13 +10,13 @@
public static final int dataTypes = MAPPED_LENGTH | INHERIT;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public static Numeric getMappedLength(int enum)
+ public /*static*/ Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength(PropNames.BORDER_TOP_WIDTH, enum);
1.1.2.2 +10 -8 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderWidth.java
Index: BorderWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderWidth.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BorderWidth.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BorderWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -40,19 +40,21 @@
* the third element is a value for border-bottom-width,
* the fourth element is a value for border-left-width.
*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
- return refineParsing(foNode, value, NOT_NESTED);
+ return refineParsing(propindex, foNode, value, NOT_NESTED);
}
/**
* Do the work for the two argument refineParsing method.
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @param nested <tt>boolean</tt> indicating whether this method is
@@ -61,8 +63,8 @@
* @return <tt>PropertyValue</tt> the verified value
* @see #refineParsing(FONode,PropertyValue)
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value, boolean nested)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
int type = value.getType();
@@ -71,7 +73,7 @@
if (type == PropertyValue.INHERIT ||
type == PropertyValue.FROM_PARENT ||
type == PropertyValue.FROM_NEAREST_SPECIFIED)
- return refineExpansionList(foNode,
+ return refineExpansionList(PropNames.BORDER_WIDTH, foNode,
ShorthandPropSets.expandAndCopySHand(value));
}
if (type == PropertyValue.NCNAME) {
@@ -92,8 +94,8 @@
}
// Correct the property in the mapped Numeric
mapped.setProperty(PropNames.BORDER_WIDTH);
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(mapped));
+ return refineExpansionList(PropNames.BORDER_WIDTH, foNode,
+ ShorthandPropSets.expandAndCopySHand(mapped));
}
else throw new PropertyException
("Invalid " + value.getClass().getName() +
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BreakCommon.java
Index: BreakCommon.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BreakCommon.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- BreakCommon.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ BreakCommon.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -29,10 +29,10 @@
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/CaptionSide.java
Index: CaptionSide.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/CaptionSide.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- CaptionSide.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ CaptionSide.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -25,7 +25,7 @@
public static final int LEFT = 7;
public static final int RIGHT = 8;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.CAPTION_SIDE, BEFORE);
@@ -53,10 +53,10 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/Clear.java
Index: Clear.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Clear.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Clear.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ Clear.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -38,10 +38,10 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/Clip.java
Index: Clip.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Clip.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Clip.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ Clip.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -17,12 +17,13 @@
public static final int inherited = NO;
/*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
int type = value.getType();
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/Color.java
Index: Color.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Color.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Color.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ Color.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
public static final int traitMapping = RENDERING;
public static final int initialValueType = COLOR_IT;
public static final int inherited = COMPUTED;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType(PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/ColorNonTransparent.java
Index: ColorNonTransparent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColorNonTransparent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ColorNonTransparent.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ ColorNonTransparent.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -25,10 +25,10 @@
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/ColorTransparent.java
Index: ColorTransparent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColorTransparent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ColorTransparent.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ ColorTransparent.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -25,10 +25,10 @@
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/ColumnCount.java
Index: ColumnCount.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColumnCount.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ColumnCount.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ ColumnCount.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = NUMBER | INHERIT;
public static final int traitMapping = SPECIFICATION;
public static final int initialValueType = NUMBER_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Numeric(PropNames.COLUMN_COUNT, 1d);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/ColumnGap.java
Index: ColumnGap.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColumnGap.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ColumnGap.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ ColumnGap.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;
public static final int traitMapping = SPECIFICATION;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.COLUMN_GAP, 12.0d, Length.PT);
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/Conditionality.java
Index: Conditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Conditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Conditionality.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ Conditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -14,10 +14,10 @@
,"retain"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/ContentDimension.java
Index: ContentDimension.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ContentDimension.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ContentDimension.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ ContentDimension.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,10 +11,10 @@
,"scale-to-fit"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.2 +5 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/Cue.java
Index: Cue.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Cue.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Cue.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ Cue.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -32,12 +32,13 @@
* The first element is a value for cue-before,
* the second element is a value for cue-after.
*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
int type = value.getType();
@@ -46,8 +47,8 @@
type == PropertyValue.FROM_PARENT ||
type == PropertyValue.FROM_NEAREST_SPECIFIED ||
type == PropertyValue.URI_TYPE)
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(value));
+ return refineExpansionList(PropNames.CUE, foNode,
+ ShorthandPropSets.expandAndCopySHand(value));
throw new PropertyException
("Invalid " + value.getClass().getName() +
" object for cue");
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/DestinationPlacementOffset.java
Index: DestinationPlacementOffset.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/DestinationPlacementOffset.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- DestinationPlacementOffset.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ DestinationPlacementOffset.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH;
public static final int traitMapping = ACTION;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Direction.java
Index: Direction.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Direction.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Direction.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ Direction.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -13,7 +13,7 @@
public static final int initialValueType = ENUM_IT;
public static final int LTR = 1;
public static final int RTL = 2;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.DIRECTION, LTR);
@@ -25,10 +25,10 @@
,"ltr"
,"rtl"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/DisplayAlign.java
Index: DisplayAlign.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/DisplayAlign.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- DisplayAlign.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ DisplayAlign.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -19,10 +19,10 @@
,"center"
,"after"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/DominantBaseline.java
Index: DominantBaseline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/DominantBaseline.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- DominantBaseline.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ DominantBaseline.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -47,10 +47,10 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/EmptyCells.java
Index: EmptyCells.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/EmptyCells.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- EmptyCells.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ EmptyCells.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -13,7 +13,7 @@
public static final int initialValueType = ENUM_IT;
public static final int SHOW = 1;
public static final int HIDE = 2;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.EMPTY_CELLS, SHOW);
@@ -25,10 +25,10 @@
,"show"
,"hide"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/EndIndent.java
Index: EndIndent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/EndIndent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- EndIndent.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ EndIndent.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.END_INDENT, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/EndsRow.java
Index: EndsRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/EndsRow.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- EndsRow.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ EndsRow.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = BOOL;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = BOOL_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.ENDS_ROW, false);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/Extent.java
Index: Extent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Extent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Extent.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ Extent.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;
public static final int traitMapping = SPECIFICATION;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.EXTENT, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/ExternalDestination.java
Index: ExternalDestination.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ExternalDestination.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ExternalDestination.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ ExternalDestination.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = URI_SPECIFICATION;
public static final int traitMapping = ACTION;
public static final int initialValueType = URI_SPECIFICATION_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new UriType(PropNames.EXTERNAL_DESTINATION, "");
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/Float.java
Index: Float.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Float.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Float.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ Float.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -36,10 +36,10 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/FlowName.java
Index: FlowName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FlowName.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FlowName.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ FlowName.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = NCNAME;
public static final int traitMapping = REFERENCE;
public static final int initialValueType = NCNAME_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new NCName(PropNames.FLOW_NAME, "");
1.1.2.2 +6 -6 xml-fop/src/org/apache/fop/fo/properties/Attic/FontFamily.java
Index: FontFamily.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontFamily.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FontFamily.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ FontFamily.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -44,8 +44,8 @@
}
}
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
// There is no point in attempting to validate the enumeration
@@ -61,14 +61,14 @@
// be at the top level, and any font family names
// that contained spaces will be in PropertyValueLists.
- return refineParsing(foNode, value, NOT_NESTED);
+ return refineParsing(propindex, foNode, value, NOT_NESTED);
}
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value, boolean nested)
+ public /*static*/ PropertyValue refineParsing
+ (int property, FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
- int property = value.getProperty();
+ //int property = value.getProperty();
int type = value.getType();
// First, check that we have a list
if (type != PropertyValue.LIST) {
1.1.2.2 +27 -21 xml-fop/src/org/apache/fop/fo/properties/Attic/Font.java
Index: Font.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Font.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Font.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ Font.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -16,6 +16,7 @@
import org.apache.fop.fo.expr.SystemFontFunction;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropNames;
+import org.apache.fop.fo.PropertyConsts;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.ShorthandPropSets;
import org.apache.fop.fo.properties.Property;
@@ -167,12 +168,13 @@
* <p>The setup of the shorthand expansion list is determined by the
* above considerations.
*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
PropertyValueList startList = null;
@@ -215,7 +217,7 @@
}
}
- private /**/static/**/ PropertyValueList processValue
+ private /*static*/ PropertyValueList processValue
(FONode foNode, PropertyValue value)
throws PropertyException
{
@@ -226,8 +228,8 @@
type == PropertyValue.FROM_PARENT ||
type == PropertyValue.FROM_NEAREST_SPECIFIED)
{
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(value));
+ return refineExpansionList(PropNames.FONT, foNode,
+ ShorthandPropSets.expandAndCopySHand(value));
}
// else not Inherit/From../From..
FontFamilySet family = null;
@@ -327,14 +329,13 @@
// font-family begins at slash + 2
familyStart = slash + 2;
fontsize = slash - 1;
- // FIXME NOW !!!!!!!
- size = (new FontSize()).refineParsing
- (foNode, propvals[fontsize], IS_NESTED);
+ size = PropertyConsts.pconsts.refineParsing
+ (PropNames.FONT_SIZE, foNode, propvals[fontsize], IS_NESTED);
// derive the line-height
// line-height is at slash + 1
- // FIXME NOW !!!!!!!
- height = (new LineHeight()).refineParsing
- (foNode, propvals[slash + 1], IS_NESTED);
+ height = PropertyConsts.pconsts.refineParsing
+ (PropNames.LINE_HEIGHT,
+ foNode, propvals[slash + 1], IS_NESTED);
} else {
// Don''t know where slash is. If anything precedes the
// font-family, it must be a font-size. Look for that.
@@ -389,8 +390,9 @@
// and that list is prepended to fontList.
if (fontList.size() == 0
&& familyStart == (propvals.length - 1)) {
- fontset = (new FontFamily()).refineParsing
- (foNode, propvals[familyStart], IS_NESTED);
+ fontset = PropertyConsts.pconsts.refineParsing
+ (PropNames.FONT_FAMILY, foNode,
+ propvals[familyStart], IS_NESTED);
} else {
// Must develop a list to prepend to fontList
PropertyValueList tmpList =
@@ -399,16 +401,18 @@
tmpList.add(propvals[i]);
fontList.addFirst(tmpList);
// Get a FontFamilySet
- fontset = (new FontFamily()).refineParsing
- (foNode, fontList, IS_NESTED);
+ fontset = PropertyConsts.pconsts.refineParsing
+ (PropNames.FONT_FAMILY, foNode,
+ fontList, IS_NESTED);
}
// Only font-style font-variant and font-weight, in any order
// remain as possibilities at the front of the expression
for (int i = 0; i < fontsize; i++) {
PropertyValue pv = null;
try {
- pv = (new FontStyle()).refineParsing
- (foNode, propvals[i], IS_NESTED);
+ pv = PropertyConsts.pconsts.refineParsing
+ (PropNames.FONT_STYLE, foNode,
+ propvals[i], IS_NESTED);
if (style != null)
MessageHandler.log("font: duplicate" +
"style overrides previous style");
@@ -417,8 +421,9 @@
} catch(PropertyException e) {}
try {
- pv = (new FontVariant()).refineParsing
- (foNode, propvals[i], IS_NESTED);
+ pv = PropertyConsts.pconsts.refineParsing
+ (PropNames.FONT_VARIANT, foNode,
+ propvals[i], IS_NESTED);
if (variant != null)
MessageHandler.log("font: duplicate" +
"variant overrides previous variant");
@@ -427,8 +432,9 @@
} catch(PropertyException e) {}
try {
- pv = (new FontWeight()).refineParsing
- (foNode, propvals[i], IS_NESTED);
+ pv = PropertyConsts.pconsts.refineParsing
+ (PropNames.FONT_WEIGHT, foNode,
+ propvals[i], IS_NESTED);
if (weight != null)
MessageHandler.log("font: duplicate" +
"weight overrides previous weight");
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/FontSelectionStrategy.java
Index: FontSelectionStrategy.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontSelectionStrategy.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FontSelectionStrategy.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ FontSelectionStrategy.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -15,10 +15,10 @@
null
,"character-by-character"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +5 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/FontSize.java
Index: FontSize.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontSize.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FontSize.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ FontSize.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -31,9 +31,10 @@
public static final int SMALLER = 9;
// N.B. This foundational value MUST be an absolute length
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
+ System.out.println("font-size initial size"); //DEBUG
return getMappedLength(MEDIUM);
}
@@ -66,9 +67,11 @@
,0.83d // smaller
};
- public static Numeric getMappedLength(int enum)
+ public /*static*/ Numeric getMappedLength(int enum)
throws PropertyException
{
+ System.out.println("font-size getMappedLength " + enum + " "
+ + mappedLengths[enum]);
if (enum == LARGER || enum == SMALLER)
return Ems.makeEms(PropNames.FONT_SIZE, mappedLengths[enum]);
return
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/FontStretch.java
Index: FontStretch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontStretch.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FontStretch.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ FontStretch.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -28,7 +28,7 @@
public static final int EXTRA_EXPANDED = 10;
public static final int ULTRA_EXPANDED = 11;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.FONT_STRETCH, NORMAL);
@@ -58,10 +58,10 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/FontStyle.java
Index: FontStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontStyle.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FontStyle.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ FontStyle.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -15,7 +15,7 @@
public static final int ITALIC = 2;
public static final int OBLIQUE = 3;
public static final int BACKSLANT = 4;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.FONT_STYLE, NORMAL);
@@ -30,10 +30,10 @@
,"oblique"
,"backslant"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/FontVariant.java
Index: FontVariant.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontVariant.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FontVariant.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ FontVariant.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -13,7 +13,7 @@
public static final int initialValueType = ENUM_IT;
public static final int NORMAL = 1;
public static final int SMALL_CAPS = 2;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.FONT_VARIANT, NORMAL);
@@ -25,10 +25,10 @@
,"normal"
,"small-caps"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +13 -10 xml-fop/src/org/apache/fop/fo/properties/Attic/FontWeight.java
Index: FontWeight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontWeight.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FontWeight.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ FontWeight.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -17,7 +17,7 @@
public static final int BOLDER = 3;
public static final int LIGHTER = 4;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.FONT_WEIGHT, 400);
@@ -34,19 +34,21 @@
};
/*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
- return refineParsing(foNode, value, NOT_NESTED);
+ return refineParsing(propindex, foNode, value, NOT_NESTED);
}
/**
- * Do the work for the two argument refineParsing method.
+ * Do the work for the three argument refineParsing method.
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @param nested <tt>boolean</tt> indicating whether this method is
@@ -55,13 +57,14 @@
* @return <tt>PropertyValue</tt> the verified value
* @see #refineParsing(FONode,PropertyValue)
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value, boolean nested)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
// Override the shadowed method to ensure that Integer values
// are limited to the valid numbers
- PropertyValue fw = Property.refineParsing(foNode, value, nested);
+ PropertyValue fw =
+ super.refineParsing(propindex, foNode, value, nested);
// If the result is an IntegerType, restrict the values
if (fw instanceof IntegerType) {
int weight = ((IntegerType)fw).getInt();
@@ -71,10 +74,10 @@
}
return fw;
}
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/ForcePageCount.java
Index: ForcePageCount.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ForcePageCount.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ForcePageCount.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ ForcePageCount.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -37,10 +37,10 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/Format.java
Index: Format.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Format.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Format.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ Format.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = STRING;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LITERAL_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Literal(PropNames.FORMAT, "1");
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/GlyphOrientationHorizontal.java
Index: GlyphOrientationHorizontal.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/GlyphOrientationHorizontal.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- GlyphOrientationHorizontal.java 19 Oct 2002 03:40:07 -0000 1.1.2.1
+++ GlyphOrientationHorizontal.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ANGLE | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ANGLE_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Angle
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/Hyphenate.java
Index: Hyphenate.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Hyphenate.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Hyphenate.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ Hyphenate.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = BOOL | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = BOOL_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.HYPHENATE, false);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationCharacter.java
Index: HyphenationCharacter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationCharacter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- HyphenationCharacter.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ HyphenationCharacter.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = CHARACTER_T | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LITERAL_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Literal(PropNames.HYPHENATION_CHARACTER, "\u2010");
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationKeep.java
Index: HyphenationKeep.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationKeep.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- HyphenationKeep.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ HyphenationKeep.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -17,10 +17,10 @@
,"column"
,"page"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationLadderCount.java
Index: HyphenationLadderCount.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationLadderCount.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- HyphenationLadderCount.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ HyphenationLadderCount.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -12,7 +12,7 @@
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ENUM_IT;
public static final int NO_LIMIT = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.HYPHENATION_LADDER_COUNT, NO_LIMIT);
@@ -23,10 +23,10 @@
null
,"no-limit"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationPushCharacterCount.java
Index: HyphenationPushCharacterCount.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationPushCharacterCount.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- HyphenationPushCharacterCount.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ HyphenationPushCharacterCount.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = NUMBER | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = NUMBER_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Numeric (PropNames.HYPHENATION_PUSH_CHARACTER_COUNT, 2d);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationRemainCharacterCount.java
Index: HyphenationRemainCharacterCount.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationRemainCharacterCount.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- HyphenationRemainCharacterCount.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ HyphenationRemainCharacterCount.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = NUMBER | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = NUMBER_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Numeric (PropNames.HYPHENATION_REMAIN_CHARACTER_COUNT, 2d);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/IndicateDestination.java
Index: IndicateDestination.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/IndicateDestination.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- IndicateDestination.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ IndicateDestination.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = BOOL;
public static final int traitMapping = ACTION;
public static final int initialValueType = BOOL_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.INDICATE_DESTINATION, false);
1.2.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/InitialPageNumber.java
Index: InitialPageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/InitialPageNumber.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- InitialPageNumber.java 19 Oct 2002 03:40:08 -0000 1.2.2.1
+++ InitialPageNumber.java 21 Oct 2002 16:31:30 -0000 1.2.2.2
@@ -17,10 +17,10 @@
,"auto-odd"
,"auto-even"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/InternalDestination.java
Index: InternalDestination.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/InternalDestination.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- InternalDestination.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ InternalDestination.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LITERAL | NCNAME;
public static final int traitMapping = ACTION;
public static final int initialValueType = LITERAL_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Literal(PropNames.INTERNAL_DESTINATION, "");
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/IntrusionDisplace.java
Index: IntrusionDisplace.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/IntrusionDisplace.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- IntrusionDisplace.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ IntrusionDisplace.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -19,10 +19,10 @@
,"indent"
,"block"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/Keep.java
Index: Keep.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Keep.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Keep.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ Keep.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,10 +10,10 @@
,"always"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LastLineEndIndent.java
Index: LastLineEndIndent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LastLineEndIndent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LastLineEndIndent.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LastLineEndIndent.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderAlignment.java
Index: LeaderAlignment.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderAlignment.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LeaderAlignment.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LeaderAlignment.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -17,10 +17,10 @@
,"reference-area"
,"page"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderLengthMaximum.java
Index: LeaderLengthMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderLengthMaximum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LeaderLengthMaximum.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LeaderLengthMaximum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | PERCENTAGE;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = PERCENTAGE_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Percentage.makePercentage
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderLengthMinimum.java
Index: LeaderLengthMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderLengthMinimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LeaderLengthMinimum.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LeaderLengthMinimum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | PERCENTAGE;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.LEADER_LENGTH_MINIMUM,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderLengthOptimum.java
Index: LeaderLengthOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderLengthOptimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LeaderLengthOptimum.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LeaderLengthOptimum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | PERCENTAGE;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.LEADER_LENGTH_OPTIMUM,
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderPattern.java
Index: LeaderPattern.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderPattern.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LeaderPattern.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LeaderPattern.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -15,7 +15,7 @@
public static final int RULE = 2;
public static final int DOTS = 3;
public static final int USE_CONTENT = 4;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.LEADER_PATTERN, SPACE);
@@ -29,10 +29,10 @@
,"dots"
,"use-content"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderPatternWidth.java
Index: LeaderPatternWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderPatternWidth.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LeaderPatternWidth.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LeaderPatternWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -12,7 +12,7 @@
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ENUM_IT;
public static final int USE_FONT_METRICS = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType
@@ -24,10 +24,10 @@
null
,"use-font-metrics"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingConditionality.java
Index: LetterSpacingConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LetterSpacingConditionality.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LetterSpacingConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.LETTER_SPACING_CONDITIONALITY, DISCARD);
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacing.java
Index: LetterSpacing.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacing.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LetterSpacing.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LetterSpacing.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -12,7 +12,7 @@
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
public static final int NORMAL = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.LETTER_SPACING, 0d, Length.PT);
@@ -23,10 +23,10 @@
null
,"normal"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingMaximum.java
Index: LetterSpacingMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingMaximum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LetterSpacingMaximum.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LetterSpacingMaximum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
public static final int NORMAL = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingMinimum.java
Index: LetterSpacingMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingMinimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LetterSpacingMinimum.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LetterSpacingMinimum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
public static final int NORMAL = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingOptimum.java
Index: LetterSpacingOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingOptimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LetterSpacingOptimum.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LetterSpacingOptimum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
public static final int NORMAL = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingPrecedence.java
Index: LetterSpacingPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingPrecedence.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LetterSpacingPrecedence.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LetterSpacingPrecedence.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = INTEGER | ENUM;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/LetterValue.java
Index: LetterValue.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LetterValue.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LetterValue.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LetterValue.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -17,10 +17,10 @@
,"alphabetic"
,"traditional"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/LinefeedTreatment.java
Index: LinefeedTreatment.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LinefeedTreatment.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LinefeedTreatment.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LinefeedTreatment.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -15,7 +15,7 @@
public static final int PRESERVE = 2;
public static final int TREAT_AS_SPACE = 3;
public static final int TREAT_AS_ZERO_WIDTH_SPACE = 4;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.LINEFEED_TREATMENT, TREAT_AS_SPACE);
@@ -29,10 +29,10 @@
,"treat-as-space"
,"treat-as-zero-width-space"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightConditionality.java
Index: LineHeightConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LineHeightConditionality.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LineHeightConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.LINE_HEIGHT_CONDITIONALITY, DISCARD);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeight.java
Index: LineHeight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeight.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LineHeight.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LineHeight.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -20,7 +20,7 @@
,"normal"
};
- public static Numeric getMappedLength(int enum)
+ public /*static*/ Numeric getMappedLength(int enum)
throws PropertyException
{
if (enum != NORMAL)
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightMaximum.java
Index: LineHeightMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightMaximum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LineHeightMaximum.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LineHeightMaximum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | PERCENTAGE;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Ems.makeEms(PropNames.LINE_HEIGHT_MAXIMUM, 1.2d);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightMinimum.java
Index: LineHeightMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightMinimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LineHeightMinimum.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LineHeightMinimum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | PERCENTAGE;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Ems.makeEms(PropNames.LINE_HEIGHT_MINIMUM, 1.2d);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightOptimum.java
Index: LineHeightOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightOptimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LineHeightOptimum.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LineHeightOptimum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | PERCENTAGE;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Ems.makeEms(PropNames.LINE_HEIGHT_OPTIMUM, 1.2d);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightPrecedence.java
Index: LineHeightPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightPrecedence.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LineHeightPrecedence.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LineHeightPrecedence.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = INTEGER | ENUM;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightShiftAdjustment.java
Index: LineHeightShiftAdjustment.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightShiftAdjustment.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LineHeightShiftAdjustment.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LineHeightShiftAdjustment.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -13,7 +13,7 @@
public static final int initialValueType = ENUM_IT;
public static final int CONSIDER_SHIFTS = 1;
public static final int DISREGARD_SHIFTS = 2;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType
@@ -26,10 +26,10 @@
,"consider-shifts"
,"disregard-shifts"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/LineStackingStrategy.java
Index: LineStackingStrategy.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineStackingStrategy.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- LineStackingStrategy.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ LineStackingStrategy.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -14,7 +14,7 @@
public static final int LINE_HEIGHT = 1;
public static final int FONT_HEIGHT = 2;
public static final int MAX_HEIGHT = 3;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType
@@ -28,10 +28,10 @@
,"font-height"
,"max-height"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/MarginBottom.java
Index: MarginBottom.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MarginBottom.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MarginBottom.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ MarginBottom.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
PERCENTAGE | LENGTH | AUTO | INHERIT;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.MARGIN_BOTTOM, 0.0d, Length.PT);
1.1.2.2 +7 -6 xml-fop/src/org/apache/fop/fo/properties/Attic/Margin.java
Index: Margin.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Margin.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Margin.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ Margin.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -43,12 +43,13 @@
* the third element is a value for margin-bottom,
* the fourth element is a value for margin-left.
*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
if ( ! (value instanceof PropertyValueList)) {
@@ -56,12 +57,12 @@
|| value instanceof FromParent
|| value instanceof FromNearestSpecified
)
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(value));
+ return refineExpansionList(PropNames.MARGIN, foNode,
+ ShorthandPropSets.expandAndCopySHand(value));
// N.B. Does this require further refinement?
// Where is Auto expanded?
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand
+ return refineExpansionList(PropNames.MARGIN, foNode,
+ ShorthandPropSets.expandAndCopySHand
(autoOrDistance(value)));
} else {
PropertyValueList list =
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/MarginLeft.java
Index: MarginLeft.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MarginLeft.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MarginLeft.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ MarginLeft.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
PERCENTAGE | LENGTH | AUTO | INHERIT;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.MARGIN_LEFT, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/MarginRight.java
Index: MarginRight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MarginRight.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MarginRight.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ MarginRight.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
PERCENTAGE | LENGTH | AUTO | INHERIT;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.MARGIN_RIGHT, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/MarginTop.java
Index: MarginTop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MarginTop.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MarginTop.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ MarginTop.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
PERCENTAGE | LENGTH | AUTO | INHERIT;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.MARGIN_TOP, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/MarkerClassName.java
Index: MarkerClassName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MarkerClassName.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MarkerClassName.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ MarkerClassName.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = NCNAME;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = NCNAME_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new NCName(PropNames.MARKER_CLASS_NAME, "");
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/MasterName.java
Index: MasterName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MasterName.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MasterName.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ MasterName.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = NCNAME;
public static final int traitMapping = SPECIFICATION;
public static final int initialValueType = NCNAME_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new NCName(PropNames.MASTER_NAME, "");
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/MasterReference.java
Index: MasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MasterReference.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MasterReference.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ MasterReference.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = NCNAME;
public static final int traitMapping = SPECIFICATION;
public static final int initialValueType = NCNAME_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new NCName(PropNames.MASTER_REFERENCE, "");
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/MaxHeight.java
Index: MaxHeight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MaxHeight.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MaxHeight.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ MaxHeight.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
PERCENTAGE | LENGTH | NONE | INHERIT;
public static final int traitMapping = SHORTHAND_MAP;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.MAX_HEIGHT, 0.0d, Length.PT);
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/MaximumRepeats.java
Index: MaximumRepeats.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MaximumRepeats.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MaximumRepeats.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ MaximumRepeats.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -12,7 +12,7 @@
public static final int traitMapping = SPECIFICATION;
public static final int initialValueType = ENUM_IT;
public static final int NO_LIMIT = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.MAXIMUM_REPEATS, NO_LIMIT);
@@ -23,10 +23,10 @@
null
,"no-limit"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/MediaUsage.java
Index: MediaUsage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MediaUsage.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MediaUsage.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ MediaUsage.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -19,10 +19,10 @@
,"bounded-in-one-dimension"
,"unbounded"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/MinHeight.java
Index: MinHeight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MinHeight.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MinHeight.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ MinHeight.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;
public static final int traitMapping = SHORTHAND_MAP;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.MIN_HEIGHT, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/NumberColumnsRepeated.java
Index: NumberColumnsRepeated.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/NumberColumnsRepeated.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- NumberColumnsRepeated.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ NumberColumnsRepeated.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = NUMBER;
public static final int traitMapping = SPECIFICATION;
public static final int initialValueType = NUMBER_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Numeric (PropNames.NUMBER_COLUMNS_REPEATED, 1d);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/NumberColumnsSpanned.java
Index: NumberColumnsSpanned.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/NumberColumnsSpanned.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- NumberColumnsSpanned.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ NumberColumnsSpanned.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = NUMBER;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = NUMBER_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Numeric (PropNames.NUMBER_COLUMNS_SPANNED, 1d);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/NumberRowsSpanned.java
Index: NumberRowsSpanned.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/NumberRowsSpanned.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- NumberRowsSpanned.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ NumberRowsSpanned.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = NUMBER;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = INTEGER_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.NUMBER_ROWS_SPANNED, 1);
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/OddOrEven.java
Index: OddOrEven.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/OddOrEven.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- OddOrEven.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ OddOrEven.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -14,7 +14,7 @@
public static final int ODD = 1;
public static final int EVEN = 2;
public static final int ANY = 3;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.ODD_OR_EVEN, ANY);
@@ -27,10 +27,10 @@
,"even"
,"any"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/Orphans.java
Index: Orphans.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Orphans.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Orphans.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ Orphans.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = INTEGER | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = INTEGER_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.ORPHANS, 2);
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/Overflow.java
Index: Overflow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Overflow.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Overflow.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ Overflow.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -21,10 +21,10 @@
,"scroll"
,"error-if-overflow"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingAfterConditionality.java
Index: PaddingAfterConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingAfterConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingAfterConditionality.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingAfterConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.PADDING_AFTER_CONDITIONALITY, DISCARD);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingAfter.java
Index: PaddingAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingAfter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingAfter.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingAfter.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
COMPOUND | PERCENTAGE | LENGTH | INHERIT;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.PADDING_AFTER, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingAfterLength.java
Index: PaddingAfterLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingAfterLength.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingAfterLength.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingAfterLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = PERCENTAGE | LENGTH;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.PADDING_AFTER_LENGTH,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBeforeConditionality.java
Index: PaddingBeforeConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBeforeConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingBeforeConditionality.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingBeforeConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.PADDING_BEFORE_CONDITIONALITY, DISCARD);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBefore.java
Index: PaddingBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBefore.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingBefore.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingBefore.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
COMPOUND |PERCENTAGE | LENGTH | INHERIT;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.PADDING_BEFORE,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBeforeLength.java
Index: PaddingBeforeLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBeforeLength.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingBeforeLength.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingBeforeLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.PADDING_BEFORE_LENGTH,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBottom.java
Index: PaddingBottom.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBottom.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingBottom.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingBottom.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingEndConditionality.java
Index: PaddingEndConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingEndConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingEndConditionality.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingEndConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.PADDING_END_CONDITIONALITY, DISCARD);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingEnd.java
Index: PaddingEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingEnd.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingEnd.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingEnd.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
COMPOUND | PERCENTAGE | LENGTH | INHERIT;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.PADDING_END, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingEndLength.java
Index: PaddingEndLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingEndLength.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingEndLength.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingEndLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = PERCENTAGE | LENGTH;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.PADDING_END_LENGTH,
1.1.2.2 +5 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/Padding.java
Index: Padding.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Padding.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Padding.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ Padding.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -41,12 +41,13 @@
* the third element is a value for padding-bottom,
* the fourth element is a value for padding-left.
*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
if ( ! (value instanceof PropertyValueList)) {
@@ -56,8 +57,8 @@
|| (value instanceof Numeric
&& ((Numeric)value).isDistance())
)
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(value));
+ return refineExpansionList(PropNames.PADDING, foNode,
+ ShorthandPropSets.expandAndCopySHand(value));
throw new PropertyException
("Invalid property value for 'padding': "
+ value.getClass().getName());
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingLeft.java
Index: PaddingLeft.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingLeft.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingLeft.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingLeft.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.PADDING_LEFT, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingRight.java
Index: PaddingRight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingRight.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingRight.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingRight.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.PADDING_RIGHT, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingStartConditionality.java
Index: PaddingStartConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingStartConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingStartConditionality.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingStartConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.PADDING_START_CONDITIONALITY, DISCARD);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingStart.java
Index: PaddingStart.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingStart.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingStart.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingStart.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -11,7 +11,7 @@
COMPOUND | PERCENTAGE | LENGTH | INHERIT;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.PADDING_START, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingStartLength.java
Index: PaddingStartLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingStartLength.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingStartLength.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingStartLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = PERCENTAGE | LENGTH;
public static final int traitMapping = FORMATTING | RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.PADDING_START_LENGTH,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingTop.java
Index: PaddingTop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingTop.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PaddingTop.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PaddingTop.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.PADDING_TOP, 0.0d, Length.PT);
1.1.2.2 +9 -6 xml-fop/src/org/apache/fop/fo/properties/Attic/PageBreakCommon.java
Index: PageBreakCommon.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PageBreakCommon.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PageBreakCommon.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PageBreakCommon.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -42,22 +42,25 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
/*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
+ // Ignore the argument value - always assume the PropertyValue
+ // is set up with the property index from the correct subclass
int property = value.getProperty();
int beforeAfter, previousNext;
switch (property) {
@@ -79,8 +82,8 @@
value instanceof FromNearestSpecified |
value instanceof Auto)
{
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(value));
+ return refineExpansionList(property , foNode,
+ ShorthandPropSets.expandAndCopySHand(value));
}
if (value instanceof NCName) {
EnumType enum = null;
1.1.2.2 +15 -18 xml-fop/src/org/apache/fop/fo/properties/Attic/PageBreakInside.java
Index: PageBreakInside.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PageBreakInside.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PageBreakInside.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PageBreakInside.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -28,12 +28,13 @@
};
/*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
if (value instanceof Inherit |
@@ -41,26 +42,22 @@
value instanceof FromNearestSpecified |
value instanceof Auto)
{
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(value));
+ return refineExpansionList(PropNames.PAGE_BREAK_INSIDE, foNode,
+ ShorthandPropSets.expandAndCopySHand(value));
}
if (value instanceof NCName) {
EnumType enum = null;
String ncname = ((NCName)value).getNCName();
- try {
- enum = new EnumType(value.getProperty(), ncname);
- } catch (PropertyException e) {
+ //PropertyValueList list =
+ //new PropertyValueList(PropNames.PAGE_BREAK_INSIDE);
+ if (ncname.equals("avoid")) {
+ //list.add
+ //(new EnumType(PropNames.KEEP_TOGETHER, "always"));
+ //return list;
+ return new EnumType(PropNames.KEEP_TOGETHER, "always");
+ } else
throw new PropertyException
("Unrecognized NCName in page-break-inside: " + ncname);
- }
- PropertyValueList list =
- new PropertyValueList(PropNames.PAGE_BREAK_INSIDE);
- switch (enum.getEnumValue()) {
- case AVOID:
- list.add
- (new EnumType(PropNames.KEEP_TOGETHER, "always"));
- return list;
- }
}
throw new PropertyException
@@ -68,10 +65,10 @@
+ value.getClass().getName());
}
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/PageHeightWidth.java
Index: PageHeightWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PageHeightWidth.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PageHeightWidth.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PageHeightWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,10 +10,10 @@
,"indefinite"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/PagePosition.java
Index: PagePosition.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PagePosition.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PagePosition.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PagePosition.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -15,7 +15,7 @@
public static final int LAST = 2;
public static final int REST = 3;
public static final int ANY = 4;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.PAGE_POSITION, ANY);
@@ -29,10 +29,10 @@
,"rest"
,"any"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +8 -7 xml-fop/src/org/apache/fop/fo/properties/Attic/Position.java
Index: Position.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Position.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Position.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ Position.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -23,7 +23,7 @@
public static final int RELATIVE = 2;
public static final int ABSOLUTE = 3;
public static final int FIXED = 4;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.POSITION, STATIC);
@@ -39,20 +39,21 @@
};
/*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
if (value instanceof Inherit |
value instanceof FromParent |
value instanceof FromNearestSpecified)
{
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(value));
+ return refineExpansionList(PropNames.POSITION, foNode,
+ ShorthandPropSets.expandAndCopySHand(value));
}
if (value instanceof NCName) {
EnumType enum = null;
@@ -95,10 +96,10 @@
("Invalid value for 'position': "
+ value.getClass().getName());
}
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/PrecedenceCommon.java
Index: PrecedenceCommon.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PrecedenceCommon.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PrecedenceCommon.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ PrecedenceCommon.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -12,10 +12,10 @@
,"force"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/Precedence.java
Index: Precedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Precedence.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Precedence.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ Precedence.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = BOOL | INHERIT;
public static final int traitMapping = SPECIFICATION;
public static final int initialValueType = BOOL_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.PRECEDENCE, false);
1.1.2.2 +67 -48 xml-fop/src/org/apache/fop/fo/properties/Attic/Property.java
Index: Property.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Property.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Property.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ Property.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -331,32 +331,38 @@
*
* <p>This method is overriden by individual property classes which
* require specific processing.
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value - <tt>PropertyValue</tt> returned by the parser
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
- return refineParsing(foNode, value, NOT_NESTED);
+ return refineParsing(propindex, foNode, value, NOT_NESTED);
}
/**
- * Do the work for the two argument refineParsing method.
+ * Do the work for the three argument refineParsing method.
+ * @param property - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param value - <tt>PropertyValue</tt> returned by the parser
* @param nested - <tt>boolean</tt> indicating whether this method is
* called normally (false), or as part of another <i>refineParsing</i>
* method.
- * @see #refineParsing(FOTree,PropertyValue)
+ * @see #refineParsing(int,FOTree,PropertyValue)
*/
- protected /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue value, boolean nested)
+ public /*static*/ PropertyValue refineParsing(int property,
+ FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
- int property = value.getProperty();
+ //int property = value.getProperty();
+ if (property != value.getProperty()) // DEBUG
+ throw new PropertyException
+ ("Mismatched property and value.property.");
String propName = PropNames.getPropertyName(property);
int proptype = value.getType();
+ int dataTypes = PropertyConsts.pconsts.getDataTypes(property);
PropertyValue pv;
if ((dataTypes & AURAL) != 0)
throw new PropertyNotImplementedException
@@ -368,6 +374,8 @@
if ((dataTypes & (INTEGER | FLOAT | LENGTH | PERCENTAGE
| ANGLE | FREQUENCY | TIME)) != 0)
return value;
+ throw new PropertyException
+ ("Numeric value invalid for " + propName);
case PropertyValue.NCNAME:
String ncname = ((NCName)value).getNCName();
// Can by any of
@@ -387,6 +395,8 @@
return (new MappedNumeric
(property, ncname, foNode.getFOTree()))
.getMappedNumValue();
+ throw new PropertyException
+ ("NCName value invalid for " + propName);
case PropertyValue.LITERAL:
// Can be LITERAL or CHARACTER_T
if ((dataTypes & (LITERAL | CHARACTER_T)) != 0) return value;
@@ -464,27 +474,31 @@
* The set of properties will, in general, be different from the
* generating property, which will be the one associated with the list
* itself.
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> for which the properties are
* being processed.
* @param list - the list of <tt>PropertyValues</tt> to be refined.
* @return a <tt>PropertyValueList>/tt> containing the refined property
* values.
*/
- public /**/static/**/ PropertyValueList refineExpansionList
- (FONode foNode, PropertyValueList list)
+ public /*static*/ PropertyValueList refineExpansionList
+ (int propindex, FONode foNode, PropertyValueList list)
throws PropertyException
{
+ if (propindex != list.getProperty()) // DEBUG
+ throw new PropertyException
+ ("Mismatch between propindex and list property.");
PropertyValueList newlist = new PropertyValueList(list.getProperty());
Iterator properties = list.iterator();
while (properties.hasNext()) {
// refine the next element
- PropertyValue pv =
- foNode.propertyConsts.refineParsing
- (foNode, (PropertyValue)(properties.next()));
+ PropertyValue pv = (PropertyValue)(properties.next());
+ pv = PropertyConsts.pconsts.refineParsing
+ (pv.getProperty(), foNode, pv);
// if it's a list, recursively refine. This will return a list
if (pv.getType() == PropertyValue.LIST) {
- PropertyValueList pvl =
- refineExpansionList(foNode, (PropertyValueList)pv);
+ PropertyValueList pvl = refineExpansionList
+ (pv.getProperty(), foNode, (PropertyValueList)pv);
newlist.addAll(pvl);
} else { // single element
newlist.add(pv);
@@ -504,7 +518,7 @@
* @throws <tt>PropertyException</tt> if <i>list</i> contains more than
* one element or if the contained element is not a list.
*/
- protected /**/static/**/ PropertyValueList spaceSeparatedList
+ protected /*static*/ PropertyValueList spaceSeparatedList
(PropertyValueList list)
throws PropertyException
{
@@ -531,7 +545,7 @@
* @return <tt>EnumValue</tt> equivalent of the argument
* @exception <tt>PropertyException</tt>
*/
- protected /**/static/**/ EnumType getEnum(PropertyValue value,
+ protected /*static*/ EnumType getEnum(PropertyValue value,
int property, String type)
throws PropertyException
{
@@ -559,7 +573,7 @@
* @return <tt>int</tt> constant representing the enumeration value.
* @exception PropertyException
*/
- public /**/static/**/ int getEnumIndex(String enum)
+ public /*static*/ int getEnumIndex(String enum)
throws PropertyException
{
throw new PropertyException("ENUM not supported.");
@@ -570,7 +584,7 @@
* @return <tt>String</tt> containing the enumeration text.
* @exception PropertyException
*/
- public /**/static/**/ String getEnumText(int enumIndex)
+ public /*static*/ String getEnumText(int enumIndex)
throws PropertyException
{
throw new PropertyException("ENUM not supported.");
@@ -584,7 +598,7 @@
* @return the integer equivalent of the enum text
* @exception PropertyException if the enum text is not valid.
*/
- public /**/static/**/ int enumValueToIndex(String value, String[] values)
+ public /*static*/ int enumValueToIndex(String value, String[] values)
throws PropertyException
{
for (int i = 1; i < values.length; i++) {
@@ -604,11 +618,11 @@
* @return a <tt>Numeric</tt>. This implementation never returns.
* @throws <tt>PropertyException</tt>.
*/
- public /**/static/**/ Numeric getMappedLength(int enum)
+ public /*static*/ Numeric getMappedLength(int enum)
throws PropertyException
{
throw new PropertyException
- ("No MAPPED_LENGTH not supported.");
+ ("MAPPED_LENGTH not supported.");
}
/**
@@ -621,10 +635,13 @@
* @exception <tt>PropertyException</tt>
* @exception <tt>PropertyNotImplementedException</tt>
*/
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
- Method method = null;
+ int initialValueType =
+ PropertyConsts.pconsts.getInitialValueType(property);
+ //System.out.println("In Property getInitialValue property "
+ //+ property);
if ((initialValueType & Property.USE_GET_IT_FUNCTION) != 0)
throw new PropertyException
("Property.getInitialValue() called for property with "
@@ -675,31 +692,32 @@
* N.B. this is the order of elements defined in
* ShorthandPropSets.borderRightExpansion
*/
- protected /**/static/**/ PropertyValue borderEdge(FONode foNode,
- PropertyValue value, int styleProp, int colorProp, int widthProp)
+ protected /*static*/ PropertyValue borderEdge
+ (int propindex, FONode foNode, PropertyValue value,
+ int styleProp, int colorProp, int widthProp)
throws PropertyException
{
- return borderEdge
- (foNode, value, styleProp, colorProp, widthProp, NOT_NESTED);
+ return borderEdge(propindex, foNode, value, styleProp,
+ colorProp, widthProp, NOT_NESTED);
}
- protected /**/static/**/ PropertyValue borderEdge
- (FONode foNode, PropertyValue value, int styleProp,
- int colorProp, int widthProp, boolean nested)
+ protected /*static*/ PropertyValue borderEdge
+ (int propindex, FONode foNode, PropertyValue value, int styleProp,
+ int colorProp, int widthProp, boolean nested)
throws PropertyException
{
if (value.getType() != PropertyValue.LIST) {
- return processEdgeValue
- (foNode, value, styleProp, colorProp, widthProp, nested);
+ return processEdgeValue(propindex, foNode, value,
+ styleProp, colorProp, widthProp, nested);
} else {
- return processEdgeList
- (foNode, spaceSeparatedList((PropertyValueList)value),
+ return processEdgeList(propindex, foNode,
+ spaceSeparatedList((PropertyValueList)value),
styleProp, colorProp, widthProp);
}
}
- private /**/static/**/ PropertyValueList processEdgeValue
- (FONode foNode, PropertyValue value, int styleProp,
+ private /*static*/ PropertyValueList processEdgeValue
+ (int propindex, FONode foNode, PropertyValue value, int styleProp,
int colorProp, int widthProp, boolean nested)
throws PropertyException
{
@@ -710,23 +728,23 @@
type == PropertyValue.FROM_NEAREST_SPECIFIED)
{
// Copy the value to each member of the shorthand expansion
- return refineExpansionList
- (foNode, ShorthandPropSets.expandAndCopySHand(value));
+ return refineExpansionList(propindex, foNode,
+ ShorthandPropSets.expandAndCopySHand(value));
}
}
// Make a list and pass to processList
- PropertyValueList tmpList
- = new PropertyValueList(value.getProperty());
+ PropertyValueList tmpList = new PropertyValueList(propindex);
tmpList.add(value);
return processEdgeList
- (foNode, tmpList, styleProp, colorProp, widthProp);
+ (propindex, foNode, tmpList, styleProp, colorProp, widthProp);
}
- private /**/static/**/ PropertyValueList processEdgeList(FONode foNode,
- PropertyValueList value, int styleProp, int colorProp, int widthProp)
+ private /*static*/ PropertyValueList processEdgeList
+ (int property, FONode foNode, PropertyValueList value,
+ int styleProp, int colorProp, int widthProp)
throws PropertyException
{
- int property = value.getProperty();
+ //int property = value.getProperty();
String propName = PropNames.getPropertyName(property);
PropertyValue color= null,
style = null,
@@ -747,6 +765,7 @@
if (color != null) MessageHandler.log(propName +
": duplicate color overrides previous color");
color = pval;
+ color.setProperty(colorProp);
continue scanning_elements;
case PropertyValue.NCNAME:
// Could be standard color, style Enum or width MappedNumeric
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/ProvisionalDistanceBetweenStarts.java
Index: ProvisionalDistanceBetweenStarts.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ProvisionalDistanceBetweenStarts.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ProvisionalDistanceBetweenStarts.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ ProvisionalDistanceBetweenStarts.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | INHERIT;
public static final int traitMapping = SPECIFICATION;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/ProvisionalLabelSeparation.java
Index: ProvisionalLabelSeparation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ProvisionalLabelSeparation.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ProvisionalLabelSeparation.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ ProvisionalLabelSeparation.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | INHERIT;
public static final int traitMapping = SPECIFICATION;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/ReferenceOrientation.java
Index: ReferenceOrientation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ReferenceOrientation.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ReferenceOrientation.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ ReferenceOrientation.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = INTEGER | INHERIT;
public static final int traitMapping = NEW_TRAIT;
public static final int initialValueType = INTEGER_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.REFERENCE_ORIENTATION, 0);
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/RegionName.java
Index: RegionName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RegionName.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- RegionName.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ RegionName.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -40,10 +40,10 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/RelativeAlign.java
Index: RelativeAlign.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RelativeAlign.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- RelativeAlign.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ RelativeAlign.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -13,7 +13,7 @@
public static final int initialValueType = ENUM_IT;
public static final int BEFORE = 1;
public static final int BASELINE = 2;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.RELATIVE_ALIGN, BEFORE);
@@ -25,10 +25,10 @@
,"before"
,"baseline"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/RelativePosition.java
Index: RelativePosition.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RelativePosition.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- RelativePosition.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ RelativePosition.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -13,7 +13,7 @@
public static final int initialValueType = ENUM_IT;
public static final int STATIC = 1;
public static final int RELATIVE = 2;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.RELATIVE_POSITION, STATIC);
@@ -25,10 +25,10 @@
,"static"
,"relative"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/RenderingIntent.java
Index: RenderingIntent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RenderingIntent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- RenderingIntent.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ RenderingIntent.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -34,10 +34,10 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/RetrieveBoundary.java
Index: RetrieveBoundary.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RetrieveBoundary.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- RetrieveBoundary.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ RetrieveBoundary.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -14,7 +14,7 @@
public static final int PAGE = 1;
public static final int PAGE_SEQUENCE = 2;
public static final int DOCUMENT = 3;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.RETRIEVE_BOUNDARY, PAGE_SEQUENCE);
@@ -27,10 +27,10 @@
,"page-sequence"
,"document"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/RetrievePosition.java
Index: RetrievePosition.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RetrievePosition.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- RetrievePosition.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ RetrievePosition.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -15,7 +15,7 @@
public static final int FIRST_INCLUDING_CARRYOVER = 2;
public static final int LAST_STARTING_WITHIN_PAGE = 3;
public static final int LAST_ENDING_WITHIN_PAGE = 4;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType
@@ -30,10 +30,10 @@
,"last-starting-within-page"
,"last-ending-within-page"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/RuleStyle.java
Index: RuleStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RuleStyle.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- RuleStyle.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ RuleStyle.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -22,7 +22,7 @@
public static final int DOUBLE = 4;
public static final int GROOVE = 5;
public static final int RIDGE = 6;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.RULE_STYLE, SOLID);
@@ -46,10 +46,10 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/RuleThickness.java
Index: RuleThickness.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RuleThickness.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- RuleThickness.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ RuleThickness.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH;
public static final int traitMapping = RENDERING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Scaling.java
Index: Scaling.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Scaling.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Scaling.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ Scaling.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -13,7 +13,7 @@
public static final int initialValueType = ENUM_IT;
public static final int UNIFORM = 1;
public static final int NON_UNIFORM = 2;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.SCALING, UNIFORM);
@@ -25,10 +25,10 @@
,"uniform"
,"non-uniform"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/ScalingMethod.java
Index: ScalingMethod.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ScalingMethod.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ScalingMethod.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ ScalingMethod.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -17,10 +17,10 @@
,"integer-pixels"
,"resample-any-method"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/ScoreSpaces.java
Index: ScoreSpaces.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ScoreSpaces.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ScoreSpaces.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ ScoreSpaces.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = BOOL | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = BOOL_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.SCORE_SPACES, true);
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/ShowDestination.java
Index: ShowDestination.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ShowDestination.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ShowDestination.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ ShowDestination.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -13,7 +13,7 @@
public static final int initialValueType = ENUM_IT;
public static final int REPLACE = 1;
public static final int NEW = 2;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.SHOW_DESTINATION, REPLACE);
@@ -25,10 +25,10 @@
,"replace"
,"new"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/Size.java
Index: Size.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Size.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Size.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ Size.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -17,10 +17,10 @@
,"landscape"
,"portrait"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +6 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/SourceDocument.java
Index: SourceDocument.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SourceDocument.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SourceDocument.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SourceDocument.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -2,6 +2,7 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.PropertyValueList;
import org.apache.fop.datatypes.UriType;
@@ -17,16 +18,18 @@
public static final int inherited = NO;
/*
+ * @param propindex - the <tt>int</tt> property index.
* @param foNode - the <tt>FONode</tt> being built
* @param list <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue list)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue list)
throws PropertyException
{
if ( ! (list instanceof PropertyValueList))
- return Property.refineParsing(foNode, list);
+ return super.refineParsing
+ (PropNames.SOURCE_DOCUMENT, foNode, list);
// Confirm that the list contains only UriType elements
Iterator iter = ((PropertyValueList)list).iterator();
while (iter.hasNext()) {
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterConditionality.java
Index: SpaceAfterConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceAfterConditionality.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceAfterConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.SPACE_AFTER_CONDITIONALITY, DISCARD);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfter.java
Index: SpaceAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfter.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceAfter.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceAfter.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = COMPOUND | LENGTH | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_AFTER, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterMaximum.java
Index: SpaceAfterMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterMaximum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceAfterMaximum.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceAfterMaximum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_AFTER_MAXIMUM,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterMinimum.java
Index: SpaceAfterMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterMinimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceAfterMinimum.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceAfterMinimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_AFTER_MINIMUM,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterOptimum.java
Index: SpaceAfterOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterOptimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceAfterOptimum.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceAfterOptimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_AFTER_OPTIMUM,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterPrecedence.java
Index: SpaceAfterPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterPrecedence.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceAfterPrecedence.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceAfterPrecedence.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = INTEGER | ENUM;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = INTEGER_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.SPACE_AFTER_PRECEDENCE, 0);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeConditionality.java
Index: SpaceBeforeConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceBeforeConditionality.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceBeforeConditionality.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.SPACE_BEFORE_CONDITIONALITY, DISCARD);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBefore.java
Index: SpaceBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBefore.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceBefore.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceBefore.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = COMPOUND | LENGTH | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_BEFORE, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeMaximum.java
Index: SpaceBeforeMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeMaximum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceBeforeMaximum.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceBeforeMaximum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_BEFORE_MAXIMUM,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeMinimum.java
Index: SpaceBeforeMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeMinimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceBeforeMinimum.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceBeforeMinimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_BEFORE_MINIMUM,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeOptimum.java
Index: SpaceBeforeOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeOptimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceBeforeOptimum.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceBeforeOptimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_BEFORE_OPTIMUM,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforePrecedence.java
Index: SpaceBeforePrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforePrecedence.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceBeforePrecedence.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceBeforePrecedence.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = INTEGER | ENUM;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = INTEGER_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.SPACE_BEFORE_PRECEDENCE, 0);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndConditionality.java
Index: SpaceEndConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceEndConditionality.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceEndConditionality.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.SPACE_END_CONDITIONALITY, DISCARD);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEnd.java
Index: SpaceEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEnd.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceEnd.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceEnd.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -11,7 +11,7 @@
COMPOUND | LENGTH | PERCENTAGE | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_END, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndMaximum.java
Index: SpaceEndMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndMaximum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceEndMaximum.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceEndMaximum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | PERCENTAGE;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_END_MAXIMUM,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndMinimum.java
Index: SpaceEndMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndMinimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceEndMinimum.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceEndMinimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | PERCENTAGE;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_END_MINIMUM,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndOptimum.java
Index: SpaceEndOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndOptimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceEndOptimum.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceEndOptimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | PERCENTAGE;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_END_OPTIMUM,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndPrecedence.java
Index: SpaceEndPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndPrecedence.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceEndPrecedence.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceEndPrecedence.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = INTEGER | ENUM;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = INTEGER_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.SPACE_END_PRECEDENCE, 0);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartConditionality.java
Index: SpaceStartConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceStartConditionality.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceStartConditionality.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.SPACE_START_CONDITIONALITY, DISCARD);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStart.java
Index: SpaceStart.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStart.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceStart.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceStart.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -11,7 +11,7 @@
COMPOUND | LENGTH | PERCENTAGE | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_START, 0.0d, Length.PT);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartMaximum.java
Index: SpaceStartMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartMaximum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceStartMaximum.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceStartMaximum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | PERCENTAGE;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_START_MAXIMUM,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartMinimum.java
Index: SpaceStartMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartMinimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceStartMinimum.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceStartMinimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | PERCENTAGE;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_START_MINIMUM,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartOptimum.java
Index: SpaceStartOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartOptimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceStartOptimum.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceStartOptimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | PERCENTAGE;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_START_OPTIMUM,
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartPrecedence.java
Index: SpaceStartPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartPrecedence.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpaceStartPrecedence.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SpaceStartPrecedence.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = INTEGER | ENUM;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = INTEGER_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.SPACE_START_PRECEDENCE, 0);
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/Span.java
Index: Span.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Span.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Span.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ Span.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -15,10 +15,10 @@
null
,"all"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/StartIndent.java
Index: StartIndent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/StartIndent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- StartIndent.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ StartIndent.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = LENGTH | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.START_INDENT, 0.0d, Length.PT);
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/StartingState.java
Index: StartingState.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/StartingState.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- StartingState.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ StartingState.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -13,7 +13,7 @@
public static final int initialValueType = ENUM_IT;
public static final int SHOW = 1;
public static final int HIDE = 2;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.STARTING_STATE, SHOW);
@@ -25,10 +25,10 @@
,"show"
,"hide"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/StartsRow.java
Index: StartsRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/StartsRow.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- StartsRow.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ StartsRow.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = BOOL;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = BOOL_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.STARTS_ROW, false);
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/SuppressAtLineBreak.java
Index: SuppressAtLineBreak.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SuppressAtLineBreak.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SuppressAtLineBreak.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SuppressAtLineBreak.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -17,10 +17,10 @@
,"suppress"
,"retain"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +6 -7 xml-fop/src/org/apache/fop/fo/properties/Attic/SwitchTo.java
Index: SwitchTo.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SwitchTo.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SwitchTo.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ SwitchTo.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -3,7 +3,6 @@
import org.apache.fop.datatypes.PropertyValueList;
import org.apache.fop.datatypes.NCName;
import org.apache.fop.datatypes.EnumType;
-import org.apache.fop.datastructs.ROStringArray;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropNames;
@@ -19,7 +18,7 @@
public static final int XSL_PRECEDING = 1;
public static final int XSL_FOLLOWING = 2;
public static final int XSL_ANY = 3;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.SWITCH_TO, XSL_ANY);
@@ -33,15 +32,15 @@
,"xsl-any"
};
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue list)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue list)
throws PropertyException
{
// Check for the enumeration. Look for a list of NCNames.
// N.B. it may be possible to perform further checks on the
// validity of the NCNames - do they match multi-case case names.
if ( ! (list instanceof PropertyValueList))
- return Property.refineParsing(foNode, list);
+ return super.refineParsing(PropNames.SWITCH_TO, foNode, list);
PropertyValueList ssList =
spaceSeparatedList((PropertyValueList)list);
@@ -54,10 +53,10 @@
}
return list;
}
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/TableLayout.java
Index: TableLayout.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TableLayout.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TableLayout.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ TableLayout.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -15,10 +15,10 @@
null
,"fixed"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/TableOmitFooterAtBreak.java
Index: TableOmitFooterAtBreak.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TableOmitFooterAtBreak.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TableOmitFooterAtBreak.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ TableOmitFooterAtBreak.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = BOOL;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = BOOL_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool (PropNames.TABLE_OMIT_FOOTER_AT_BREAK, false);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/TableOmitHeaderAtBreak.java
Index: TableOmitHeaderAtBreak.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TableOmitHeaderAtBreak.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TableOmitHeaderAtBreak.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ TableOmitHeaderAtBreak.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = BOOL;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = BOOL_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool (PropNames.TABLE_OMIT_HEADER_AT_BREAK, false);
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/TargetPresentationContext.java
Index: TargetPresentationContext.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TargetPresentationContext.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TargetPresentationContext.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ TargetPresentationContext.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -12,7 +12,7 @@
public static final int traitMapping = ACTION;
public static final int initialValueType = ENUM_IT;
public static final int USE_TARGET_PROCESSING_CONTEXT = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.TARGET_PRESENTATION_CONTEXT,
@@ -24,10 +24,10 @@
null
,"use-target-processing-context"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/TargetProcessingContext.java
Index: TargetProcessingContext.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TargetProcessingContext.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TargetProcessingContext.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ TargetProcessingContext.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -12,7 +12,7 @@
public static final int traitMapping = ACTION;
public static final int initialValueType = ENUM_IT;
public static final int DOCUMENT_ROOT = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.TARGET_PROCESSING_CONTEXT,
@@ -24,10 +24,10 @@
null
,"document-root"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/TargetStylesheet.java
Index: TargetStylesheet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TargetStylesheet.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TargetStylesheet.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ TargetStylesheet.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -12,7 +12,7 @@
public static final int traitMapping = ACTION;
public static final int initialValueType = ENUM_IT;
public static final int USE_NORMAL_STYLESHEET = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.TARGET_STYLESHEET,
@@ -24,10 +24,10 @@
null
,"use-normal-stylesheet"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/TextAlign.java
Index: TextAlign.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextAlign.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TextAlign.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ TextAlign.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -24,7 +24,7 @@
public static final int LEFT = 7;
public static final int RIGHT = 8;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.TEXT_ALIGN, START);
@@ -51,10 +51,10 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/TextAlignLast.java
Index: TextAlignLast.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextAlignLast.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TextAlignLast.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ TextAlignLast.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -25,7 +25,7 @@
public static final int LEFT = 8;
public static final int RIGHT = 9;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.TEXT_ALIGN_LAST, RELATIVE);
@@ -53,10 +53,10 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/TextAltitude.java
Index: TextAltitude.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextAltitude.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TextAltitude.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ TextAltitude.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -12,7 +12,7 @@
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ENUM_IT;
public static final int USE_FONT_METRICS = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.TEXT_ALTITUDE, USE_FONT_METRICS);
@@ -24,10 +24,10 @@
,"use-font-metrics"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/TextDecoration.java
Index: TextDecoration.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextDecoration.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TextDecoration.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ TextDecoration.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -20,7 +20,7 @@
public static final int dataTypes = COMPLEX | NONE | INHERIT;
public static final int traitMapping = NEW_TRAIT;
public static final int initialValueType = TEXT_DECORATION_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new TextDecorations
@@ -56,8 +56,8 @@
,BLINK
};
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue list)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue list)
throws PropertyException
{
byte onMask = NO_DECORATION;
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/TextDepth.java
Index: TextDepth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextDepth.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TextDepth.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ TextDepth.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -12,7 +12,7 @@
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ENUM_IT;
public static final int USE_FONT_METRICS = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.TEXT_DEPTH, USE_FONT_METRICS);
@@ -23,10 +23,10 @@
null
,"use-font-metrics"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/TextIndent.java
Index: TextIndent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextIndent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TextIndent.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ TextIndent.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = LENGTH_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.TEXT_INDENT, 0.0d, Length.PT);
1.1.2.2 +5 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/TextShadow.java
Index: TextShadow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextShadow.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TextShadow.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ TextShadow.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -6,6 +6,7 @@
import org.apache.fop.datatypes.ShadowEffect;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.properties.ColorNonTransparent;
import java.util.Iterator;
@@ -27,13 +28,13 @@
* <tt>Length</tt>s may be preceded or followed by a color
* specifier.
*/
- public /**/static/**/ PropertyValue refineParsing
- (FONode foNode, PropertyValue list)
+ public /*static*/ PropertyValue refineParsing
+ (int propindex, FONode foNode, PropertyValue list)
throws PropertyException
{
int property = list.getProperty();
if ( ! (list instanceof PropertyValueList)) {
- return Property.refineParsing(foNode, list);
+ return super.refineParsing(PropNames.TEXT_SHADOW, foNode, list);
}
if (((PropertyValueList)list).size() == 0)
throw new PropertyException
@@ -41,7 +42,7 @@
PropertyValueList newlist = new PropertyValueList(property);
Iterator effects = ((PropertyValueList)list).iterator();
while (effects.hasNext()) {
- newlist.add(new ShadowEffect(property,
+ newlist.add(new ShadowEffect(PropNames.TEXT_SHADOW,
(PropertyValueList)(effects.next())));
}
return newlist;
1.1.2.2 +2 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/TextTransform.java
Index: TextTransform.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextTransform.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TextTransform.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ TextTransform.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -19,10 +19,10 @@
,"uppercase"
,"lowercase"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/UnicodeBidi.java
Index: UnicodeBidi.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/UnicodeBidi.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- UnicodeBidi.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ UnicodeBidi.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -14,7 +14,7 @@
public static final int NORMAL = 1;
public static final int EMBED = 2;
public static final int BIDI_OVERRIDE = 3;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.UNICODE_BIDI, NORMAL);
@@ -27,10 +27,10 @@
,"embed"
,"bidi-override"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/VerticalAlign.java
Index: VerticalAlign.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/VerticalAlign.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- VerticalAlign.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ VerticalAlign.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -24,7 +24,7 @@
public static final int TEXT_BOTTOM = 6;
public static final int TOP = 7;
public static final int BOTTOM = 8;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.VERTICAL_ALIGN, BASELINE);
@@ -50,10 +50,10 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Visibility.java
Index: Visibility.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Visibility.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Visibility.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ Visibility.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -14,7 +14,7 @@
public static final int VISIBLE = 1;
public static final int HIDDEN = 2;
public static final int COLLAPSE = 3;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.VISIBILITY, VISIBLE);
@@ -27,10 +27,10 @@
,"hidden"
,"collapse"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/WhiteSpaceCollapse.java
Index: WhiteSpaceCollapse.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WhiteSpaceCollapse.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- WhiteSpaceCollapse.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ WhiteSpaceCollapse.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = BOOL | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = BOOL_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.WHITE_SPACE_COLLAPSE, true);
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/WhiteSpace.java
Index: WhiteSpace.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WhiteSpace.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- WhiteSpace.java 19 Oct 2002 03:40:09 -0000 1.1.2.1
+++ WhiteSpace.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -14,7 +14,7 @@
public static final int NORMAL = 1;
public static final int PRE = 2;
public static final int NOWRAP = 3;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.WHITE_SPACE, NORMAL);
@@ -27,10 +27,10 @@
,"pre"
,"nowrap"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/WhiteSpaceTreatment.java
Index: WhiteSpaceTreatment.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WhiteSpaceTreatment.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- WhiteSpaceTreatment.java 19 Oct 2002 03:40:10 -0000 1.1.2.1
+++ WhiteSpaceTreatment.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -20,7 +20,7 @@
public static final int IGNORE_IF_BEFORE_LINEFEED = 3;
public static final int IGNORE_IF_AFTER_LINEFEED = 4;
public static final int IGNORE_IF_SURROUNDING_LINEFEED = 5;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.WHITE_SPACE_TREATMENT, PRESERVE);
@@ -43,10 +43,10 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/Widows.java
Index: Widows.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Widows.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Widows.java 19 Oct 2002 03:40:10 -0000 1.1.2.1
+++ Widows.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = INTEGER | INHERIT;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = INTEGER_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.WIDOWS, 2);
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingConditionality.java
Index: WordSpacingConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingConditionality.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- WordSpacingConditionality.java 19 Oct 2002 03:40:10 -0000 1.1.2.1
+++ WordSpacingConditionality.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = ENUM;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.WORD_SPACING_CONDITIONALITY, DISCARD);
1.1.2.2 +4 -10 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacing.java
Index: WordSpacing.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacing.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- WordSpacing.java 19 Oct 2002 03:40:10 -0000 1.1.2.1
+++ WordSpacing.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -6,27 +6,21 @@
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.fo.properties.WordSpacingCommon;
-public class WordSpacing extends Property {
+public class WordSpacing extends WordSpacingCommon {
public static final int dataTypes =
COMPOUND | LENGTH | MAPPED_LENGTH | INHERIT;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public static final int NORMAL = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(NORMAL); //normal
}
public static final int inherited = NO;
- private static final String[] rwEnums = {
- null
- ,"normal"
- };
-
- public static Numeric getMappedLength(int enum)
+ public /*static*/ Numeric getMappedLength(int enum)
throws PropertyException
{
if (enum != NORMAL)
1.1.2.2 +17 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingMaximum.java
Index: WordSpacingMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingMaximum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- WordSpacingMaximum.java 19 Oct 2002 03:40:10 -0000 1.1.2.1
+++ WordSpacingMaximum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -1,19 +1,31 @@
package org.apache.fop.fo.properties;
import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.Length;
+import org.apache.fop.fo.properties.WordSpacingCommon;
-public class WordSpacingMaximum extends Property {
+public class WordSpacingMaximum extends WordSpacingCommon {
public static final int dataTypes = LENGTH;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public static final int NORMAL = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
- return WordSpacing.getMappedLength(WordSpacing.NORMAL);
+ return getMappedLength(NORMAL);
}
public static final int inherited = COMPUTED;
+
+ public /*static*/ Numeric getMappedLength(int enum)
+ throws PropertyException
+ {
+ if (enum != NORMAL)
+ throw new PropertyException("Invalid MAPPED_LENGTH enum: "
+ + enum);
+ return Length.makeLength
+ (PropNames.WORD_SPACING_MAXIMUM, 0d, Length.PT);
+ }
}
1.1.2.2 +17 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingMinimum.java
Index: WordSpacingMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingMinimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- WordSpacingMinimum.java 19 Oct 2002 03:40:10 -0000 1.1.2.1
+++ WordSpacingMinimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -1,19 +1,31 @@
package org.apache.fop.fo.properties;
import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.Length;
+import org.apache.fop.fo.properties.WordSpacingCommon;
-public class WordSpacingMinimum extends Property {
+public class WordSpacingMinimum extends WordSpacingCommon {
public static final int dataTypes = LENGTH;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public static final int NORMAL = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
- return WordSpacing.getMappedLength(WordSpacing.NORMAL);
+ return getMappedLength(WordSpacing.NORMAL);
}
public static final int inherited = COMPUTED;
+
+ public /*static*/ Numeric getMappedLength(int enum)
+ throws PropertyException
+ {
+ if (enum != NORMAL)
+ throw new PropertyException("Invalid MAPPED_LENGTH enum: "
+ + enum);
+ return Length.makeLength
+ (PropNames.WORD_SPACING_MINIMUM, 0d, Length.PT);
+ }
}
1.1.2.2 +17 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingOptimum.java
Index: WordSpacingOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingOptimum.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- WordSpacingOptimum.java 19 Oct 2002 03:40:10 -0000 1.1.2.1
+++ WordSpacingOptimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -1,19 +1,31 @@
package org.apache.fop.fo.properties;
import org.apache.fop.fo.expr.PropertyException;
+import org.apache.fop.fo.PropNames;
import org.apache.fop.datatypes.PropertyValue;
-import org.apache.fop.fo.properties.Property;
+import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.Length;
+import org.apache.fop.fo.properties.WordSpacingCommon;
-public class WordSpacingOptimum extends Property {
+public class WordSpacingOptimum extends WordSpacingCommon {
public static final int dataTypes = LENGTH;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public static final int NORMAL = 1;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
- return WordSpacing.getMappedLength(WordSpacing.NORMAL);
+ return getMappedLength(WordSpacing.NORMAL);
}
public static final int inherited = COMPUTED;
+
+ public /*static*/ Numeric getMappedLength(int enum)
+ throws PropertyException
+ {
+ if (enum != NORMAL)
+ throw new PropertyException("Invalid MAPPED_LENGTH enum: "
+ + enum);
+ return Length.makeLength
+ (PropNames.WORD_SPACING_OPTIMUM, 0d, Length.PT);
+ }
}
1.1.2.2 +1 -1 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingPrecedence.java
Index: WordSpacingPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingPrecedence.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- WordSpacingPrecedence.java 19 Oct 2002 03:40:10 -0000 1.1.2.1
+++ WordSpacingPrecedence.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -10,7 +10,7 @@
public static final int dataTypes = INTEGER | ENUM;
public static final int traitMapping = FORMATTING;
public static final int initialValueType = ENUM_IT;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.WORD_SPACING_PRECEDENCE, FORCE);
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/WrapOption.java
Index: WrapOption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WrapOption.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- WrapOption.java 19 Oct 2002 03:40:10 -0000 1.1.2.1
+++ WrapOption.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -13,7 +13,7 @@
public static final int initialValueType = ENUM_IT;
public static final int WRAP = 1;
public static final int NO_WRAP = 2;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.WRAP_OPTION, WRAP);
@@ -25,10 +25,10 @@
,"wrap"
,"no-wrap"
};
- public /**/static/**/ int getEnumIndex(String enum) throws PropertyException {
+ public /*static*/ int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.2 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/WritingMode.java
Index: WritingMode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WritingMode.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- WritingMode.java 19 Oct 2002 03:40:10 -0000 1.1.2.1
+++ WritingMode.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
@@ -21,7 +21,7 @@
public static final int LR = 4;
public static final int RL = 5;
public static final int TB = 6;
- public /**/static/**/ PropertyValue getInitialValue(int property)
+ public /*static*/ PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.WRITING_MODE, LR_TB);
@@ -45,10 +45,10 @@
(Object) Ints.consts.get(i));
}
}
- public /**/static/**/ int getEnumIndex(String enum) {
+ public /*static*/ int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /**/static/**/ String getEnumText(int index) {
+ public /*static*/ String getEnumText(int index) {
return rwEnums[index];
}
}
No revision
No revision
1.1.2.1 +14 -0 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingCommon.java
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org