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/31 02:52:22 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/properties AbsolutePosition.java ActiveState.java AlignmentAdjust.java AlignmentBaseline.java AutoRestore.java Background.java BackgroundAttachment.java BackgroundColor.java BackgroundPosition.java BackgroundPositionHorizontal.java BackgroundPositionVertical.java BackgroundRepeat.java BaselineShift.java BlankOrNotBlank.java Border.java BorderAfterColor.java BorderAfterWidth.java BorderAfterWidthConditionality.java BorderAfterWidthLength.java BorderBeforeColor.java BorderBeforeWidth.java BorderBeforeWidthConditionality.java BorderBeforeWidthLength.java BorderBottom.java BorderBottomColor.java BorderBottomWidth.java BorderCollapse.java BorderColor.java BorderCommonStyle.java BorderCommonWidth.java BorderEndColor.java BorderEndWidth.java BorderEndWidthConditionality.java BorderEndWidthLength.java BorderLeft.java BorderLeftColor.java BorderLeftWidth.java BorderRight.java BorderRightColor.java BorderRightWidth.java BorderSeparationBlockProgressionDirection.java BorderSeparationInlineProgressionDirection.java BorderSpacing.java BorderStartColor.java BorderStartWidth.java BorderStartWidthConditionality.java BorderStartWidthLength.java BorderStyle.java BorderTop.java BorderTopColor.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 Font.java FontFamily.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 LetterSpacing.java LetterSpacingConditionality.java LetterSpacingMaximum.java LetterSpacingMinimum.java LetterSpacingOptimum.java LetterSpacingPrecedence.java LetterValue.java LineHeight.java LineHeightConditionality.java LineHeightMaximum.java LineHeightMinimum.java LineHeightOptimum.java LineHeightPrecedence.java LineHeightShiftAdjustment.java LineStackingStrategy.java LinefeedTreatment.java Margin.java MarginBottom.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 Padding.java PaddingAfter.java PaddingAfterConditionality.java PaddingAfterLength.java PaddingBefore.java PaddingBeforeConditionality.java PaddingBeforeLength.java PaddingBottom.java PaddingEnd.java PaddingEndConditionality.java PaddingEndLength.java PaddingLeft.java PaddingRight.java PaddingStart.java PaddingStartConditionality.java PaddingStartLength.java PaddingTop.java PageBreakCommon.java PageBreakInside.java PageHeightWidth.java PagePosition.java Position.java Precedence.java PrecedenceCommon.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 SpaceAfter.java SpaceAfterConditionality.java SpaceAfterMaximum.java SpaceAfterMinimum.java SpaceAfterOptimum.java SpaceAfterPrecedence.java SpaceBefore.java SpaceBeforeConditionality.java SpaceBeforeMaximum.java SpaceBeforeMinimum.java SpaceBeforeOptimum.java SpaceBeforePrecedence.java SpaceEnd.java SpaceEndConditionality.java SpaceEndMaximum.java SpaceEndMinimum.java SpaceEndOptimum.java SpaceEndPrecedence.java SpaceStart.java SpaceStartConditionality.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 WhiteSpace.java WhiteSpaceCollapse.java WhiteSpaceTreatment.java Widows.java WordSpacing.java WordSpacingConditionality.java WordSpacingMaximum.java WordSpacingMinimum.java WordSpacingOptimum.java WordSpacingPrecedence.java WrapOption.java WritingMode.java
pbwest 2002/10/30 17:52:21
Modified: src/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design
AbsolutePosition.java ActiveState.java
AlignmentAdjust.java AlignmentBaseline.java
AutoRestore.java Background.java
BackgroundAttachment.java BackgroundColor.java
BackgroundPosition.java
BackgroundPositionHorizontal.java
BackgroundPositionVertical.java
BackgroundRepeat.java BaselineShift.java
BlankOrNotBlank.java Border.java
BorderAfterColor.java BorderAfterWidth.java
BorderAfterWidthConditionality.java
BorderAfterWidthLength.java BorderBeforeColor.java
BorderBeforeWidth.java
BorderBeforeWidthConditionality.java
BorderBeforeWidthLength.java BorderBottom.java
BorderBottomColor.java BorderBottomWidth.java
BorderCollapse.java BorderColor.java
BorderCommonStyle.java BorderCommonWidth.java
BorderEndColor.java BorderEndWidth.java
BorderEndWidthConditionality.java
BorderEndWidthLength.java BorderLeft.java
BorderLeftColor.java BorderLeftWidth.java
BorderRight.java BorderRightColor.java
BorderRightWidth.java
BorderSeparationBlockProgressionDirection.java
BorderSeparationInlineProgressionDirection.java
BorderSpacing.java BorderStartColor.java
BorderStartWidth.java
BorderStartWidthConditionality.java
BorderStartWidthLength.java BorderStyle.java
BorderTop.java BorderTopColor.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 Font.java FontFamily.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
LetterSpacing.java LetterSpacingConditionality.java
LetterSpacingMaximum.java LetterSpacingMinimum.java
LetterSpacingOptimum.java
LetterSpacingPrecedence.java LetterValue.java
LineHeight.java LineHeightConditionality.java
LineHeightMaximum.java LineHeightMinimum.java
LineHeightOptimum.java LineHeightPrecedence.java
LineHeightShiftAdjustment.java
LineStackingStrategy.java LinefeedTreatment.java
Margin.java MarginBottom.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
Padding.java PaddingAfter.java
PaddingAfterConditionality.java
PaddingAfterLength.java PaddingBefore.java
PaddingBeforeConditionality.java
PaddingBeforeLength.java PaddingBottom.java
PaddingEnd.java PaddingEndConditionality.java
PaddingEndLength.java PaddingLeft.java
PaddingRight.java PaddingStart.java
PaddingStartConditionality.java
PaddingStartLength.java PaddingTop.java
PageBreakCommon.java PageBreakInside.java
PageHeightWidth.java PagePosition.java
Position.java Precedence.java PrecedenceCommon.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 SpaceAfter.java
SpaceAfterConditionality.java
SpaceAfterMaximum.java SpaceAfterMinimum.java
SpaceAfterOptimum.java SpaceAfterPrecedence.java
SpaceBefore.java SpaceBeforeConditionality.java
SpaceBeforeMaximum.java SpaceBeforeMinimum.java
SpaceBeforeOptimum.java SpaceBeforePrecedence.java
SpaceEnd.java SpaceEndConditionality.java
SpaceEndMaximum.java SpaceEndMinimum.java
SpaceEndOptimum.java SpaceEndPrecedence.java
SpaceStart.java SpaceStartConditionality.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 WhiteSpace.java
WhiteSpaceCollapse.java WhiteSpaceTreatment.java
Widows.java WordSpacing.java
WordSpacingConditionality.java
WordSpacingMaximum.java WordSpacingMinimum.java
WordSpacingOptimum.java WordSpacingPrecedence.java
WrapOption.java WritingMode.java
Log:
Static cleanup.
Revision Changes Path
No revision
No revision
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- AbsolutePosition.java 21 Oct 2002 16:31:29 -0000 1.1.2.2
+++ AbsolutePosition.java 31 Oct 2002 01:52:07 -0000 1.1.2.3
@@ -18,10 +18,10 @@
,"absolute"
,"fixed"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ActiveState.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ ActiveState.java 31 Oct 2002 01:52:07 -0000 1.1.2.3
@@ -38,10 +38,10 @@
}
}
- public /*static*/ int getEnumIndex(String enum) {
+ public int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- AlignmentAdjust.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ AlignmentAdjust.java 31 Oct 2002 01:52:07 -0000 1.1.2.3
@@ -51,10 +51,10 @@
}
}
- public /*static*/ int getEnumIndex(String enum) {
+ public int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- AlignmentBaseline.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ AlignmentBaseline.java 31 Oct 2002 01:52:07 -0000 1.1.2.3
@@ -50,10 +50,10 @@
}
}
- public /*static*/ int getEnumIndex(String enum) {
+ public int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- AutoRestore.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ AutoRestore.java 31 Oct 2002 01:52:07 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.AUTO_RESTORE, true);
1.1.2.3 +3 -3 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Background.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Background.java 31 Oct 2002 01:52:07 -0000 1.1.2.3
@@ -63,7 +63,7 @@
* @return the refined <tt>PropertyValue</tt>.
* @throws <tt>PropertyException</tt>.
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
@@ -75,7 +75,7 @@
}
}
- private /*static*/ PropertyValueList processValue
+ private PropertyValueList processValue
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
@@ -99,7 +99,7 @@
}
}
- private /*static*/ PropertyValueList processList
+ private PropertyValueList processList
(int property, FONode foNode, PropertyValueList value)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BackgroundAttachment.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BackgroundAttachment.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BackgroundColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BackgroundColor.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, "transparent");
1.1.2.3 +3 -3 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BackgroundPosition.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BackgroundPosition.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -71,7 +71,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
@@ -89,7 +89,7 @@
* @return <tt>PropertyValue</tt> the verified value
* @see #refineParsing(FOTree,PropertyValue)
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
@@ -101,7 +101,7 @@
}
}
- private /*static*/ PropertyValueList processValue
+ private PropertyValueList processValue
(FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BackgroundPositionHorizontal.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BackgroundPositionHorizontal.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Percentage.makePercentage
@@ -30,10 +30,10 @@
,"right"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BackgroundPositionVertical.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BackgroundPositionVertical.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Percentage.makePercentage
@@ -29,10 +29,10 @@
,"center"
,"bottom"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BackgroundRepeat.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BackgroundRepeat.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BaselineShift.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BaselineShift.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BlankOrNotBlank.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BlankOrNotBlank.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Border.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Border.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -22,7 +22,7 @@
public static final int initialValueType = NOTYPE_IT;
public static final int inherited = NO;
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderAfterColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderAfterColor.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderAfterWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderAfterWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -18,13 +18,13 @@
// automatically update the following initial Length PropertyValue
// if the mapping changes.
- public /*static*/ PropertyValue getInitialValue(int property)
+ public PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength (PropNames.BORDER_AFTER_WIDTH, enum);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderAfterWidthConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderAfterWidthConditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderAfterWidthLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderAfterWidthLength.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -9,7 +9,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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderBeforeColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderBeforeColor.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType(PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderBeforeWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderBeforeWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength(PropNames.BORDER_BEFORE_WIDTH, enum);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderBeforeWidthConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderBeforeWidthConditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderBeforeWidthLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderBeforeWidthLength.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -9,7 +9,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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderBottom.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderBottom.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -35,7 +35,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderBottomColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderBottomColor.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType(PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderBottomWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderBottomWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength(PropNames.BORDER_BOTTOM_WIDTH, enum);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderCollapse.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderCollapse.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +2 -2 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderColor.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -47,7 +47,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
@@ -65,7 +65,7 @@
* @return <tt>PropertyValue</tt> the verified value
* @see #refineParsing(FONode,PropertyValue)
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderCommonStyle.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderCommonStyle.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -43,10 +43,10 @@
}
}
- public /*static*/ int getEnumIndex(String enum) {
+ public int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderCommonWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderCommonWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderEndColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderEndColor.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderEndWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderEndWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength(PropNames.BORDER_END_WIDTH, enum);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderEndWidthConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderEndWidthConditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderEndWidthLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderEndWidthLength.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -9,7 +9,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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderLeft.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderLeft.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -35,7 +35,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderLeftColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderLeftColor.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderLeftWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderLeftWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength(PropNames.BORDER_LEFT_WIDTH, enum);
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderRight.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderRight.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -35,7 +35,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderRightColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderRightColor.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderRightWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderRightWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength(PropNames.BORDER_RIGHT_WIDTH, enum);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderSeparationBlockProgressionDirection.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderSeparationBlockProgressionDirection.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderSeparationInlineProgressionDirection.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderSeparationInlineProgressionDirection.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderSpacing.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderSpacing.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -33,7 +33,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderStartColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderStartColor.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderStartWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderStartWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength(PropNames.BORDER_START_WIDTH, enum);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderStartWidthConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderStartWidthConditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderStartWidthLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderStartWidthLength.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -9,7 +9,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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength
1.1.2.3 +2 -2 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderStyle.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderStyle.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -45,7 +45,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
@@ -63,7 +63,7 @@
* @return <tt>PropertyValue</tt> the verified value
* @see #refineParsing(FONode,PropertyValue)
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderTop.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderTop.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -35,7 +35,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderTopColor.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderTopColor.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType (PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderTopWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderTopWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(MEDIUM);
}
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
return getMappedLength(PropNames.BORDER_TOP_WIDTH, enum);
1.1.2.3 +2 -2 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BorderWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BorderWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -45,7 +45,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
@@ -63,7 +63,7 @@
* @return <tt>PropertyValue</tt> the verified value
* @see #refineParsing(FONode,PropertyValue)
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BreakCommon.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ BreakCommon.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -29,10 +29,10 @@
}
}
- public /*static*/ int getEnumIndex(String enum) {
+ public int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- CaptionSide.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ CaptionSide.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -25,7 +25,7 @@
public static final int LEFT = 7;
public static final int RIGHT = 8;
- public /*static*/ PropertyValue getInitialValue(int property)
+ public 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 int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Clear.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Clear.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -38,10 +38,10 @@
(Object) Ints.consts.get(i));
}
}
- public /*static*/ int getEnumIndex(String enum) {
+ public int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Clip.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Clip.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -22,7 +22,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Color.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Color.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new ColorType(PropNames.BACKGROUND_COLOR, BLACK);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ColorNonTransparent.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ ColorNonTransparent.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -25,10 +25,10 @@
}
}
- public /*static*/ int getEnumIndex(String enum) {
+ public int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ColorTransparent.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ ColorTransparent.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -25,10 +25,10 @@
}
}
- public /*static*/ int getEnumIndex(String enum) {
+ public int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ColumnCount.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ ColumnCount.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Numeric(PropNames.COLUMN_COUNT, 1d);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ColumnGap.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ ColumnGap.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.COLUMN_GAP, 12.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Conditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Conditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -14,10 +14,10 @@
,"retain"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ContentDimension.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ ContentDimension.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -11,10 +11,10 @@
,"scale-to-fit"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Cue.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Cue.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -37,7 +37,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DestinationPlacementOffset.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ DestinationPlacementOffset.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Direction.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Direction.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DisplayAlign.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ DisplayAlign.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -19,10 +19,10 @@
,"center"
,"after"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DominantBaseline.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ DominantBaseline.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -47,10 +47,10 @@
(Object) Ints.consts.get(i));
}
}
- public /*static*/ int getEnumIndex(String enum) {
+ public int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- EmptyCells.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ EmptyCells.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- EndIndent.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ EndIndent.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.END_INDENT, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- EndsRow.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ EndsRow.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.ENDS_ROW, false);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Extent.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Extent.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.EXTENT, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ExternalDestination.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ ExternalDestination.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new UriType(PropNames.EXTERNAL_DESTINATION, "");
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Float.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Float.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -36,10 +36,10 @@
(Object) Ints.consts.get(i));
}
}
- public /*static*/ int getEnumIndex(String enum) {
+ public int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FlowName.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ FlowName.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new NCName(PropNames.FLOW_NAME, "");
1.1.2.3 +2 -2 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Font.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Font.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -173,7 +173,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
@@ -217,7 +217,7 @@
}
}
- private /*static*/ PropertyValueList processValue
+ private PropertyValueList processValue
(FONode foNode, PropertyValue value)
throws PropertyException
{
1.1.2.3 +2 -2 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FontFamily.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ FontFamily.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -44,7 +44,7 @@
}
}
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
@@ -64,7 +64,7 @@
return refineParsing(propindex, foNode, value, NOT_NESTED);
}
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int property, FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FontSelectionStrategy.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ FontSelectionStrategy.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -15,10 +15,10 @@
null
,"character-by-character"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +2 -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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FontSize.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ FontSize.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -31,7 +31,7 @@
public static final int SMALLER = 9;
// N.B. This foundational value MUST be an absolute length
- public /*static*/ PropertyValue getInitialValue(int property)
+ public PropertyValue getInitialValue(int property)
throws PropertyException
{
System.out.println("font-size initial size"); //DEBUG
@@ -67,7 +67,7 @@
,0.83d // smaller
};
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
System.out.println("font-size getMappedLength " + enum + " "
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FontStretch.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ FontStretch.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FontStyle.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ FontStyle.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FontVariant.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ FontVariant.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +5 -5 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FontWeight.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ FontWeight.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -17,7 +17,7 @@
public static final int BOLDER = 3;
public static final int LIGHTER = 4;
- public /*static*/ PropertyValue getInitialValue(int property)
+ public PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.FONT_WEIGHT, 400);
@@ -39,7 +39,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
@@ -57,7 +57,7 @@
* @return <tt>PropertyValue</tt> the verified value
* @see #refineParsing(FONode,PropertyValue)
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
@@ -74,10 +74,10 @@
}
return fw;
}
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ForcePageCount.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ ForcePageCount.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -37,10 +37,10 @@
(Object) Ints.consts.get(i));
}
}
- public /*static*/ int getEnumIndex(String enum) {
+ public int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Format.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Format.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Literal(PropNames.FORMAT, "1");
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- GlyphOrientationHorizontal.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ GlyphOrientationHorizontal.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Angle
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Hyphenate.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Hyphenate.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.HYPHENATE, false);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- HyphenationCharacter.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ HyphenationCharacter.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Literal(PropNames.HYPHENATION_CHARACTER, "\u2010");
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- HyphenationKeep.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ HyphenationKeep.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -17,10 +17,10 @@
,"column"
,"page"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- HyphenationLadderCount.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ HyphenationLadderCount.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- HyphenationPushCharacterCount.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ HyphenationPushCharacterCount.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Numeric (PropNames.HYPHENATION_PUSH_CHARACTER_COUNT, 2d);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- HyphenationRemainCharacterCount.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ HyphenationRemainCharacterCount.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Numeric (PropNames.HYPHENATION_REMAIN_CHARACTER_COUNT, 2d);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- IndicateDestination.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ IndicateDestination.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.INDICATE_DESTINATION, false);
1.2.2.3 +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.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- InitialPageNumber.java 21 Oct 2002 16:31:30 -0000 1.2.2.2
+++ InitialPageNumber.java 31 Oct 2002 01:52:08 -0000 1.2.2.3
@@ -17,10 +17,10 @@
,"auto-odd"
,"auto-even"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- InternalDestination.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ InternalDestination.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Literal(PropNames.INTERNAL_DESTINATION, "");
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- IntrusionDisplace.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ IntrusionDisplace.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -19,10 +19,10 @@
,"indent"
,"block"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Keep.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Keep.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -10,10 +10,10 @@
,"always"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LastLineEndIndent.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LastLineEndIndent.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LeaderAlignment.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LeaderAlignment.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -17,10 +17,10 @@
,"reference-area"
,"page"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LeaderLengthMaximum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LeaderLengthMaximum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Percentage.makePercentage
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LeaderLengthMinimum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LeaderLengthMinimum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.LEADER_LENGTH_MINIMUM,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LeaderLengthOptimum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LeaderLengthOptimum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.LEADER_LENGTH_OPTIMUM,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LeaderPattern.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LeaderPattern.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LeaderPatternWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LeaderPatternWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LetterSpacing.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LetterSpacing.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LetterSpacingConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LetterSpacingConditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.LETTER_SPACING_CONDITIONALITY, DISCARD);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LetterSpacingMaximum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LetterSpacingMaximum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LetterSpacingMinimum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LetterSpacingMinimum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LetterSpacingOptimum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LetterSpacingOptimum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LetterSpacingPrecedence.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LetterSpacingPrecedence.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LetterValue.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LetterValue.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -17,10 +17,10 @@
,"alphabetic"
,"traditional"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LineHeight.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LineHeight.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -20,7 +20,7 @@
,"normal"
};
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
if (enum != NORMAL)
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LineHeightConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LineHeightConditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.LINE_HEIGHT_CONDITIONALITY, DISCARD);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LineHeightMaximum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LineHeightMaximum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Ems.makeEms(PropNames.LINE_HEIGHT_MAXIMUM, 1.2d);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LineHeightMinimum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LineHeightMinimum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Ems.makeEms(PropNames.LINE_HEIGHT_MINIMUM, 1.2d);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LineHeightOptimum.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LineHeightOptimum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Ems.makeEms(PropNames.LINE_HEIGHT_OPTIMUM, 1.2d);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LineHeightPrecedence.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LineHeightPrecedence.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LineHeightShiftAdjustment.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LineHeightShiftAdjustment.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LineStackingStrategy.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LineStackingStrategy.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- LinefeedTreatment.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ LinefeedTreatment.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Margin.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Margin.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -48,7 +48,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MarginBottom.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ MarginBottom.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.MARGIN_BOTTOM, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MarginLeft.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ MarginLeft.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.MARGIN_LEFT, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MarginRight.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ MarginRight.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.MARGIN_RIGHT, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MarginTop.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ MarginTop.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.MARGIN_TOP, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MarkerClassName.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ MarkerClassName.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new NCName(PropNames.MARKER_CLASS_NAME, "");
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MasterName.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ MasterName.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new NCName(PropNames.MASTER_NAME, "");
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MasterReference.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ MasterReference.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new NCName(PropNames.MASTER_REFERENCE, "");
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MaxHeight.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ MaxHeight.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.MAX_HEIGHT, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MaximumRepeats.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ MaximumRepeats.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MediaUsage.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ MediaUsage.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -19,10 +19,10 @@
,"bounded-in-one-dimension"
,"unbounded"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MinHeight.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ MinHeight.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.MIN_HEIGHT, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- NumberColumnsRepeated.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ NumberColumnsRepeated.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Numeric (PropNames.NUMBER_COLUMNS_REPEATED, 1d);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- NumberColumnsSpanned.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ NumberColumnsSpanned.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Numeric (PropNames.NUMBER_COLUMNS_SPANNED, 1d);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- NumberRowsSpanned.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ NumberRowsSpanned.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.NUMBER_ROWS_SPANNED, 1);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- OddOrEven.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ OddOrEven.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Orphans.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Orphans.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.ORPHANS, 2);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Overflow.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Overflow.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -21,10 +21,10 @@
,"scroll"
,"error-if-overflow"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Padding.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Padding.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -46,7 +46,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingAfter.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingAfter.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.PADDING_AFTER, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingAfterConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingAfterConditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.PADDING_AFTER_CONDITIONALITY, DISCARD);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingAfterLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingAfterLength.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.PADDING_AFTER_LENGTH,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingBefore.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingBefore.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.PADDING_BEFORE,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingBeforeConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingBeforeConditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.PADDING_BEFORE_CONDITIONALITY, DISCARD);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingBeforeLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingBeforeLength.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.PADDING_BEFORE_LENGTH,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingBottom.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingBottom.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingEnd.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingEnd.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.PADDING_END, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingEndConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingEndConditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.PADDING_END_CONDITIONALITY, DISCARD);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingEndLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingEndLength.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.PADDING_END_LENGTH,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingLeft.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingLeft.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.PADDING_LEFT, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingRight.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingRight.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.PADDING_RIGHT, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingStart.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingStart.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.PADDING_START, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingStartConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingStartConditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.PADDING_START_CONDITIONALITY, DISCARD);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingStartLength.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingStartLength.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.PADDING_START_LENGTH,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PaddingTop.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PaddingTop.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.PADDING_TOP, 0.0d, Length.PT);
1.1.2.3 +3 -3 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PageBreakCommon.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PageBreakCommon.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -42,10 +42,10 @@
(Object) Ints.consts.get(i));
}
}
- public /*static*/ int getEnumIndex(String enum) {
+ public int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
@@ -55,7 +55,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
1.1.2.3 +3 -3 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PageBreakInside.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PageBreakInside.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -33,7 +33,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
@@ -65,10 +65,10 @@
+ value.getClass().getName());
}
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PageHeightWidth.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PageHeightWidth.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -10,10 +10,10 @@
,"indefinite"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PagePosition.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PagePosition.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +4 -4 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Position.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Position.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.POSITION, STATIC);
@@ -44,7 +44,7 @@
* @param value <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
@@ -96,10 +96,10 @@
("Invalid value for 'position': "
+ value.getClass().getName());
}
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Precedence.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Precedence.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.PRECEDENCE, false);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PrecedenceCommon.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ PrecedenceCommon.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -12,10 +12,10 @@
,"force"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.3 +18 -18 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Property.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Property.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -252,7 +252,7 @@
* and separated by a vertical bar. Psuedo-datatypes are in upper case.
* @exception PropertyException if no matches are found.
*/
- public /**/static/**/ String listDataTypes(int datatypes)
+ public static String listDataTypes(int datatypes)
throws PropertyException
{
String typeNames = "";
@@ -335,7 +335,7 @@
* @param foNode - the <tt>FONode</tt> being built
* @param value - <tt>PropertyValue</tt> returned by the parser
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
throws PropertyException
{
@@ -352,7 +352,7 @@
* method.
* @see #refineParsing(int,FOTree,PropertyValue)
*/
- public /*static*/ PropertyValue refineParsing(int property,
+ public PropertyValue refineParsing(int property,
FONode foNode, PropertyValue value, boolean nested)
throws PropertyException
{
@@ -481,7 +481,7 @@
* @return a <tt>PropertyValueList>/tt> containing the refined property
* values.
*/
- public /*static*/ PropertyValueList refineExpansionList
+ public PropertyValueList refineExpansionList
(int propindex, FONode foNode, PropertyValueList list)
throws PropertyException
{
@@ -518,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 PropertyValueList spaceSeparatedList
(PropertyValueList list)
throws PropertyException
{
@@ -545,7 +545,7 @@
* @return <tt>EnumValue</tt> equivalent of the argument
* @exception <tt>PropertyException</tt>
*/
- protected /*static*/ EnumType getEnum(PropertyValue value,
+ protected EnumType getEnum(PropertyValue value,
int property, String type)
throws PropertyException
{
@@ -573,7 +573,7 @@
* @return <tt>int</tt> constant representing the enumeration value.
* @exception PropertyException
*/
- public /*static*/ int getEnumIndex(String enum)
+ public int getEnumIndex(String enum)
throws PropertyException
{
throw new PropertyException("ENUM not supported.");
@@ -584,7 +584,7 @@
* @return <tt>String</tt> containing the enumeration text.
* @exception PropertyException
*/
- public /*static*/ String getEnumText(int enumIndex)
+ public String getEnumText(int enumIndex)
throws PropertyException
{
throw new PropertyException("ENUM not supported.");
@@ -598,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 int enumValueToIndex(String value, String[] values)
throws PropertyException
{
for (int i = 1; i < values.length; i++) {
@@ -618,7 +618,7 @@
* @return a <tt>Numeric</tt>. This implementation never returns.
* @throws <tt>PropertyException</tt>.
*/
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
throw new PropertyException
@@ -635,7 +635,7 @@
* @exception <tt>PropertyException</tt>
* @exception <tt>PropertyNotImplementedException</tt>
*/
- public /*static*/ PropertyValue getInitialValue(int property)
+ public PropertyValue getInitialValue(int property)
throws PropertyException
{
int initialValueType =
@@ -692,7 +692,7 @@
* N.B. this is the order of elements defined in
* ShorthandPropSets.borderRightExpansion
*/
- protected /*static*/ PropertyValue borderEdge
+ protected PropertyValue borderEdge
(int propindex, FONode foNode, PropertyValue value,
int styleProp, int colorProp, int widthProp)
throws PropertyException
@@ -701,7 +701,7 @@
colorProp, widthProp, NOT_NESTED);
}
- protected /*static*/ PropertyValue borderEdge
+ protected PropertyValue borderEdge
(int propindex, FONode foNode, PropertyValue value, int styleProp,
int colorProp, int widthProp, boolean nested)
throws PropertyException
@@ -716,7 +716,7 @@
}
}
- private /*static*/ PropertyValueList processEdgeValue
+ private PropertyValueList processEdgeValue
(int propindex, FONode foNode, PropertyValue value, int styleProp,
int colorProp, int widthProp, boolean nested)
throws PropertyException
@@ -739,7 +739,7 @@
(propindex, foNode, tmpList, styleProp, colorProp, widthProp);
}
- private /*static*/ PropertyValueList processEdgeList
+ private PropertyValueList processEdgeList
(int property, FONode foNode, PropertyValueList value,
int styleProp, int colorProp, int widthProp)
throws PropertyException
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ProvisionalDistanceBetweenStarts.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ ProvisionalDistanceBetweenStarts.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ProvisionalLabelSeparation.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ ProvisionalLabelSeparation.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ReferenceOrientation.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ ReferenceOrientation.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.REFERENCE_ORIENTATION, 0);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RegionName.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ RegionName.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -40,10 +40,10 @@
(Object) Ints.consts.get(i));
}
}
- public /*static*/ int getEnumIndex(String enum) {
+ public int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RelativeAlign.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ RelativeAlign.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RelativePosition.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ RelativePosition.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RenderingIntent.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ RenderingIntent.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -34,10 +34,10 @@
(Object) Ints.consts.get(i));
}
}
- public /*static*/ int getEnumIndex(String enum) {
+ public int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RetrieveBoundary.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ RetrieveBoundary.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RetrievePosition.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ RetrievePosition.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RuleStyle.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ RuleStyle.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RuleThickness.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ RuleThickness.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Scaling.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Scaling.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ScalingMethod.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ ScalingMethod.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -17,10 +17,10 @@
,"integer-pixels"
,"resample-any-method"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ScoreSpaces.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ ScoreSpaces.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.SCORE_SPACES, true);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ShowDestination.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ ShowDestination.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Size.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ Size.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -17,10 +17,10 @@
,"landscape"
,"portrait"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SourceDocument.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ SourceDocument.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -23,7 +23,7 @@
* @param list <tt>PropertyValue</tt> returned by the parser
* @return <tt>PropertyValue</tt> the verified value
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue list)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceAfter.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ SpaceAfter.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_AFTER, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceAfterConditionality.java 21 Oct 2002 16:31:30 -0000 1.1.2.2
+++ SpaceAfterConditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.SPACE_AFTER_CONDITIONALITY, DISCARD);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceAfterMaximum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceAfterMaximum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_AFTER_MAXIMUM,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceAfterMinimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceAfterMinimum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_AFTER_MINIMUM,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceAfterOptimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceAfterOptimum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_AFTER_OPTIMUM,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceAfterPrecedence.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceAfterPrecedence.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.SPACE_AFTER_PRECEDENCE, 0);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceBefore.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceBefore.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_BEFORE, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceBeforeConditionality.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceBeforeConditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.SPACE_BEFORE_CONDITIONALITY, DISCARD);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceBeforeMaximum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceBeforeMaximum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_BEFORE_MAXIMUM,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceBeforeMinimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceBeforeMinimum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_BEFORE_MINIMUM,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceBeforeOptimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceBeforeOptimum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_BEFORE_OPTIMUM,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceBeforePrecedence.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceBeforePrecedence.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.SPACE_BEFORE_PRECEDENCE, 0);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceEnd.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceEnd.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_END, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceEndConditionality.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceEndConditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.SPACE_END_CONDITIONALITY, DISCARD);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceEndMaximum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceEndMaximum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_END_MAXIMUM,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceEndMinimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceEndMinimum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_END_MINIMUM,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceEndOptimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceEndOptimum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_END_OPTIMUM,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceEndPrecedence.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceEndPrecedence.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.SPACE_END_PRECEDENCE, 0);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceStart.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceStart.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_START, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceStartConditionality.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceStartConditionality.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.SPACE_START_CONDITIONALITY, DISCARD);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceStartMaximum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceStartMaximum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_START_MAXIMUM,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceStartMinimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceStartMinimum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_START_MINIMUM,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceStartOptimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceStartOptimum.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength(PropNames.SPACE_START_OPTIMUM,
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpaceStartPrecedence.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SpaceStartPrecedence.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.SPACE_START_PRECEDENCE, 0);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Span.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ Span.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -15,10 +15,10 @@
null
,"all"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- StartIndent.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ StartIndent.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.START_INDENT, 0.0d, Length.PT);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- StartingState.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ StartingState.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- StartsRow.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ StartsRow.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.STARTS_ROW, false);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SuppressAtLineBreak.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SuppressAtLineBreak.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -17,10 +17,10 @@
,"suppress"
,"retain"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +4 -4 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SwitchTo.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ SwitchTo.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -18,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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType (PropNames.SWITCH_TO, XSL_ANY);
@@ -32,7 +32,7 @@
,"xsl-any"
};
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue list)
throws PropertyException
{
@@ -53,10 +53,10 @@
}
return list;
}
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TableLayout.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ TableLayout.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -15,10 +15,10 @@
null
,"fixed"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TableOmitFooterAtBreak.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ TableOmitFooterAtBreak.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool (PropNames.TABLE_OMIT_FOOTER_AT_BREAK, false);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TableOmitHeaderAtBreak.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ TableOmitHeaderAtBreak.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool (PropNames.TABLE_OMIT_HEADER_AT_BREAK, false);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TargetPresentationContext.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ TargetPresentationContext.java 31 Oct 2002 01:52:08 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TargetProcessingContext.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ TargetProcessingContext.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TargetStylesheet.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ TargetStylesheet.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TextAlign.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ TextAlign.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -24,7 +24,7 @@
public static final int LEFT = 7;
public static final int RIGHT = 8;
- public /*static*/ PropertyValue getInitialValue(int property)
+ public 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 int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TextAlignLast.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ TextAlignLast.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -25,7 +25,7 @@
public static final int LEFT = 8;
public static final int RIGHT = 9;
- public /*static*/ PropertyValue getInitialValue(int property)
+ public 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 int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TextAltitude.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ TextAltitude.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
1.1.2.3 +2 -2 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TextDecoration.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ TextDecoration.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new TextDecorations
@@ -56,7 +56,7 @@
,BLINK
};
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue list)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TextDepth.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ TextDepth.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TextIndent.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ TextIndent.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return Length.makeLength (PropNames.TEXT_INDENT, 0.0d, Length.PT);
1.1.2.3 +1 -1 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TextShadow.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ TextShadow.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -28,7 +28,7 @@
* <tt>Length</tt>s may be preceded or followed by a color
* specifier.
*/
- public /*static*/ PropertyValue refineParsing
+ public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue list)
throws PropertyException
{
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- TextTransform.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ TextTransform.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -19,10 +19,10 @@
,"uppercase"
,"lowercase"
};
- public /*static*/ int getEnumIndex(String enum) throws PropertyException {
+ public int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- UnicodeBidi.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ UnicodeBidi.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- VerticalAlign.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ VerticalAlign.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Visibility.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ Visibility.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WhiteSpace.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ WhiteSpace.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WhiteSpaceCollapse.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ WhiteSpaceCollapse.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new Bool(PropNames.WHITE_SPACE_COLLAPSE, true);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WhiteSpaceTreatment.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ WhiteSpaceTreatment.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Widows.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ Widows.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new IntegerType(PropNames.WIDOWS, 2);
1.1.2.3 +2 -2 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WordSpacing.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ WordSpacing.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -13,14 +13,14 @@
COMPOUND | LENGTH | MAPPED_LENGTH | INHERIT;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /*static*/ PropertyValue getInitialValue(int property)
+ public PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(NORMAL); //normal
}
public static final int inherited = NO;
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
if (enum != NORMAL)
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WordSpacingConditionality.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ WordSpacingConditionality.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.WORD_SPACING_CONDITIONALITY, DISCARD);
1.1.2.3 +2 -2 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WordSpacingMaximum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ WordSpacingMaximum.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -11,14 +11,14 @@
public static final int dataTypes = LENGTH;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /*static*/ PropertyValue getInitialValue(int property)
+ public PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(NORMAL);
}
public static final int inherited = COMPUTED;
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
if (enum != NORMAL)
1.1.2.3 +2 -2 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WordSpacingMinimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ WordSpacingMinimum.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -11,14 +11,14 @@
public static final int dataTypes = LENGTH;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /*static*/ PropertyValue getInitialValue(int property)
+ public PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(WordSpacing.NORMAL);
}
public static final int inherited = COMPUTED;
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
if (enum != NORMAL)
1.1.2.3 +2 -2 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WordSpacingOptimum.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ WordSpacingOptimum.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -11,14 +11,14 @@
public static final int dataTypes = LENGTH;
public static final int traitMapping = DISAPPEARS;
public static final int initialValueType = LENGTH_IT;
- public /*static*/ PropertyValue getInitialValue(int property)
+ public PropertyValue getInitialValue(int property)
throws PropertyException
{
return getMappedLength(WordSpacing.NORMAL);
}
public static final int inherited = COMPUTED;
- public /*static*/ Numeric getMappedLength(int enum)
+ public Numeric getMappedLength(int enum)
throws PropertyException
{
if (enum != NORMAL)
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WordSpacingPrecedence.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ WordSpacingPrecedence.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 PropertyValue getInitialValue(int property)
throws PropertyException
{
return new EnumType(PropNames.WORD_SPACING_PRECEDENCE, FORCE);
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WrapOption.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ WrapOption.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) throws PropertyException {
return enumValueToIndex(enum, rwEnums);
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
1.1.2.3 +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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WritingMode.java 21 Oct 2002 16:31:31 -0000 1.1.2.2
+++ WritingMode.java 31 Oct 2002 01:52:09 -0000 1.1.2.3
@@ -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 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 int getEnumIndex(String enum) {
return ((Integer)(rwEnumHash.get(enum))).intValue();
}
- public /*static*/ String getEnumText(int index) {
+ public String getEnumText(int index) {
return rwEnums[index];
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org