From c8c2ca0a7d3006e121d9887363f1c01d0bbc6bd0 Mon Sep 17 00:00:00 2001 From: Peter Bernard West Date: Thu, 12 Jun 2003 18:19:38 +0000 Subject: [PATCH] Eclipse checkout. Applied Organize Imports. Fixed instances where static is referred to through an instatiated object rather then the class. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@196497 13f79535-47bb-0310-9956-ffa450edef68 --- .classpath | 10 +++ .project | 17 +++++ src/org/apache/fop/apps/Driver.java | 21 ++---- src/org/apache/fop/apps/FOInputHandler.java | 8 +-- src/org/apache/fop/apps/InputHandler.java | 9 +-- .../configuration/ConfigurationReader.java | 3 - .../fop/configuration/LanguageFileReader.java | 1 - .../fop/datastructs/CircularBuffer.java | 1 - .../fop/datatypes/AbstractPropertyValue.java | 6 +- src/org/apache/fop/datatypes/Angle.java | 4 +- src/org/apache/fop/datatypes/Auto.java | 4 +- src/org/apache/fop/datatypes/Bool.java | 4 +- src/org/apache/fop/datatypes/ColorSpace.java | 6 +- src/org/apache/fop/datatypes/ColorType.java | 5 +- src/org/apache/fop/datatypes/CountryType.java | 6 +- src/org/apache/fop/datatypes/Ems.java | 4 +- src/org/apache/fop/datatypes/EnumType.java | 8 +-- .../apache/fop/datatypes/FontFamilySet.java | 7 +- src/org/apache/fop/datatypes/Frequency.java | 4 +- src/org/apache/fop/datatypes/IntegerType.java | 4 +- src/org/apache/fop/datatypes/Ints.java | 4 +- .../apache/fop/datatypes/LanguageType.java | 6 +- src/org/apache/fop/datatypes/Literal.java | 6 +- .../apache/fop/datatypes/MappedNumeric.java | 7 +- src/org/apache/fop/datatypes/MimeType.java | 4 +- src/org/apache/fop/datatypes/NCName.java | 4 +- src/org/apache/fop/datatypes/NoType.java | 7 +- src/org/apache/fop/datatypes/None.java | 4 +- src/org/apache/fop/datatypes/Numeric.java | 9 +-- .../apache/fop/datatypes/PropertyValue.java | 3 +- .../fop/datatypes/PropertyValueList.java | 9 +-- src/org/apache/fop/datatypes/ScriptType.java | 6 +- .../apache/fop/datatypes/ShadowEffect.java | 11 +--- src/org/apache/fop/datatypes/Slash.java | 3 - src/org/apache/fop/datatypes/StringType.java | 4 +- .../apache/fop/datatypes/TextDecorator.java | 5 +- src/org/apache/fop/datatypes/Time.java | 4 +- src/org/apache/fop/datatypes/UriType.java | 4 +- .../indirect/FromNearestSpecified.java | 3 +- .../fop/datatypes/indirect/FromParent.java | 1 - .../fop/datatypes/indirect/IndirectValue.java | 7 +- .../fop/datatypes/indirect/Inherit.java | 4 +- .../datatypes/indirect/InheritedValue.java | 6 +- src/org/apache/fop/fo/FOAttributes.java | 23 +++---- src/org/apache/fop/fo/FONode.java | 40 ++++------- src/org/apache/fop/fo/FOPropertySets.java | 14 ---- src/org/apache/fop/fo/FOTree.java | 27 ++------ src/org/apache/fop/fo/FObject.java | 50 +++++++++++++- src/org/apache/fop/fo/FObjectNames.java | 4 +- src/org/apache/fop/fo/FObjectSets.java | 5 +- src/org/apache/fop/fo/FObjects.java | 7 -- src/org/apache/fop/fo/FoRoot.java | 31 ++++----- src/org/apache/fop/fo/PropNames.java | 2 +- src/org/apache/fop/fo/PropertyConsts.java | 26 ++------ src/org/apache/fop/fo/PropertySets.java | 3 +- src/org/apache/fop/fo/ReferenceAreaFO.java | 1 - src/org/apache/fop/fo/ShorthandPropSets.java | 21 ++---- .../fop/fo/declarations/FoColorProfile.java | 17 ++--- .../fop/fo/declarations/FoDeclarations.java | 16 ++--- .../apache/fop/fo/expr/PropertyParser.java | 44 ++++++------- .../apache/fop/fo/expr/PropertyTokenizer.java | 3 +- .../fop/fo/expr/SystemFontFunction.java | 6 +- src/org/apache/fop/fo/flow/Dummy.java | 1 + src/org/apache/fop/fo/flow/FoBasicLink.java | 29 ++++---- .../apache/fop/fo/flow/FoBidiOverride.java | 27 ++++---- src/org/apache/fop/fo/flow/FoBlock.java | 27 ++++---- .../apache/fop/fo/flow/FoBlockContainer.java | 26 ++++---- src/org/apache/fop/fo/flow/FoCharacter.java | 20 +++--- .../apache/fop/fo/flow/FoExternalGraphic.java | 20 +++--- src/org/apache/fop/fo/flow/FoFloat.java | 26 ++++---- src/org/apache/fop/fo/flow/FoFlow.java | 26 ++++---- src/org/apache/fop/fo/flow/FoFootnote.java | 26 ++++---- .../apache/fop/fo/flow/FoFootnoteBody.java | 27 ++++---- .../fop/fo/flow/FoInitialPropertySet.java | 20 +++--- src/org/apache/fop/fo/flow/FoInline.java | 27 ++++---- .../apache/fop/fo/flow/FoInlineContainer.java | 27 ++++---- .../fop/fo/flow/FoInstreamForeignObject.java | 20 +++--- src/org/apache/fop/fo/flow/FoLeader.java | 29 ++++---- src/org/apache/fop/fo/flow/FoListBlock.java | 26 ++++---- src/org/apache/fop/fo/flow/FoListItem.java | 28 ++++---- .../apache/fop/fo/flow/FoListItemBody.java | 28 ++++---- .../apache/fop/fo/flow/FoListItemLabel.java | 28 ++++---- src/org/apache/fop/fo/flow/FoMarker.java | 28 ++++---- src/org/apache/fop/fo/flow/FoMultiCase.java | 29 ++++---- .../apache/fop/fo/flow/FoMultiProperties.java | 26 ++++---- .../fop/fo/flow/FoMultiPropertySet.java | 19 ++---- src/org/apache/fop/fo/flow/FoMultiSwitch.java | 24 ++++--- src/org/apache/fop/fo/flow/FoMultiToggle.java | 29 ++++---- src/org/apache/fop/fo/flow/FoNoFo.java | 13 +--- src/org/apache/fop/fo/flow/FoPageNumber.java | 20 +++--- .../fop/fo/flow/FoPageNumberCitation.java | 20 +++--- .../apache/fop/fo/flow/FoPageSequence.java | 31 ++++----- src/org/apache/fop/fo/flow/FoPcdata.java | 20 +++--- .../apache/fop/fo/flow/FoRetrieveMarker.java | 19 ++---- .../apache/fop/fo/flow/FoStaticContent.java | 26 ++++---- src/org/apache/fop/fo/flow/FoTable.java | 34 +++++----- .../apache/fop/fo/flow/FoTableAndCaption.java | 28 ++++---- src/org/apache/fop/fo/flow/FoTableBody.java | 28 ++++---- .../apache/fop/fo/flow/FoTableCaption.java | 27 ++++---- src/org/apache/fop/fo/flow/FoTableCell.java | 27 ++++---- src/org/apache/fop/fo/flow/FoTableColumn.java | 20 +++--- src/org/apache/fop/fo/flow/FoTableFooter.java | 28 ++++---- src/org/apache/fop/fo/flow/FoTableHeader.java | 28 ++++---- src/org/apache/fop/fo/flow/FoTableRow.java | 24 ++++--- src/org/apache/fop/fo/flow/FoTitle.java | 29 ++++---- src/org/apache/fop/fo/flow/FoWrapper.java | 28 ++++---- .../fop/fo/pagination/FoLayoutMasterSet.java | 19 ++---- .../fo/pagination/FoPageSequenceMaster.java | 28 ++++---- .../fop/fo/pagination/FoRegionAfter.java | 7 +- .../fop/fo/pagination/FoRegionBefore.java | 7 +- .../fo/pagination/FoRegionBeforeAfter.java | 19 ++---- .../fop/fo/pagination/FoRegionBody.java | 20 +++--- .../apache/fop/fo/pagination/FoRegionEnd.java | 7 +- .../fop/fo/pagination/FoRegionStart.java | 7 +- .../fop/fo/pagination/FoRegionStartEnd.java | 19 ++---- .../fop/fo/pagination/FoSimplePageMaster.java | 35 +++++----- .../fop/fo/pagination/PageSequenceMaster.java | 32 ++++----- .../fop/fo/properties/AbsolutePosition.java | 2 - .../apache/fop/fo/properties/ActiveState.java | 10 +-- .../fop/fo/properties/AlignmentAdjust.java | 10 +-- .../fop/fo/properties/AlignmentBaseline.java | 10 +-- .../apache/fop/fo/properties/AutoRestore.java | 5 +- src/org/apache/fop/fo/properties/Azimuth.java | 2 - .../apache/fop/fo/properties/Background.java | 20 +++--- .../fo/properties/BackgroundAttachment.java | 4 +- .../fop/fo/properties/BackgroundColor.java | 4 +- .../fop/fo/properties/BackgroundImage.java | 2 - .../fop/fo/properties/BackgroundPosition.java | 15 ++--- .../BackgroundPositionHorizontal.java | 4 +- .../BackgroundPositionVertical.java | 4 +- .../fop/fo/properties/BackgroundRepeat.java | 6 +- .../fop/fo/properties/BaselineShift.java | 6 +- .../fop/fo/properties/BlankOrNotBlank.java | 6 +- .../properties/BlockProgressionDimension.java | 2 - .../BlockProgressionDimensionMaximum.java | 2 - .../BlockProgressionDimensionMinimum.java | 2 - .../BlockProgressionDimensionOptimum.java | 2 - src/org/apache/fop/fo/properties/Border.java | 15 ++--- .../fop/fo/properties/BorderAfterColor.java | 4 +- .../fo/properties/BorderAfterPrecedence.java | 1 - .../fop/fo/properties/BorderAfterStyle.java | 1 - .../fop/fo/properties/BorderAfterWidth.java | 6 +- .../BorderAfterWidthConditionality.java | 5 +- .../fo/properties/BorderAfterWidthLength.java | 3 +- .../fop/fo/properties/BorderBeforeColor.java | 4 +- .../fo/properties/BorderBeforePrecedence.java | 1 - .../fop/fo/properties/BorderBeforeStyle.java | 1 - .../fop/fo/properties/BorderBeforeWidth.java | 5 +- .../BorderBeforeWidthConditionality.java | 5 +- .../properties/BorderBeforeWidthLength.java | 3 +- .../fop/fo/properties/BorderBottom.java | 9 +-- .../fop/fo/properties/BorderBottomColor.java | 4 +- .../fop/fo/properties/BorderBottomStyle.java | 1 - .../fop/fo/properties/BorderBottomWidth.java | 5 +- .../fop/fo/properties/BorderCollapse.java | 6 +- .../apache/fop/fo/properties/BorderColor.java | 11 ++-- .../fop/fo/properties/BorderCommonStyle.java | 7 +- .../fop/fo/properties/BorderCommonWidth.java | 1 - .../fop/fo/properties/BorderEndColor.java | 4 +- .../fo/properties/BorderEndPrecedence.java | 1 - .../fop/fo/properties/BorderEndStyle.java | 1 - .../fop/fo/properties/BorderEndWidth.java | 7 +- .../BorderEndWidthConditionality.java | 5 +- .../fo/properties/BorderEndWidthLength.java | 3 +- .../apache/fop/fo/properties/BorderLeft.java | 7 +- .../fop/fo/properties/BorderLeftColor.java | 5 +- .../fop/fo/properties/BorderLeftStyle.java | 1 - .../fop/fo/properties/BorderLeftWidth.java | 5 +- .../apache/fop/fo/properties/BorderRight.java | 7 +- .../fop/fo/properties/BorderRightColor.java | 5 +- .../fop/fo/properties/BorderRightStyle.java | 1 - .../fop/fo/properties/BorderRightWidth.java | 5 +- .../fop/fo/properties/BorderSeparation.java | 2 - ...erSeparationBlockProgressionDirection.java | 5 +- ...rSeparationInlineProgressionDirection.java | 5 +- .../fop/fo/properties/BorderSpacing.java | 10 ++- .../fop/fo/properties/BorderStartColor.java | 5 +- .../fo/properties/BorderStartPrecedence.java | 1 - .../fop/fo/properties/BorderStartStyle.java | 1 - .../fop/fo/properties/BorderStartWidth.java | 5 +- .../BorderStartWidthConditionality.java | 5 +- .../fo/properties/BorderStartWidthLength.java | 3 +- .../apache/fop/fo/properties/BorderStyle.java | 15 ++--- .../apache/fop/fo/properties/BorderTop.java | 7 +- .../fop/fo/properties/BorderTopColor.java | 5 +- .../fop/fo/properties/BorderTopStyle.java | 1 - .../fop/fo/properties/BorderTopWidth.java | 7 +- .../apache/fop/fo/properties/BorderWidth.java | 15 ++--- src/org/apache/fop/fo/properties/Bottom.java | 2 - .../apache/fop/fo/properties/BreakAfter.java | 2 - .../apache/fop/fo/properties/BreakBefore.java | 2 - .../apache/fop/fo/properties/BreakCommon.java | 7 +- .../apache/fop/fo/properties/CaptionSide.java | 12 ++-- .../apache/fop/fo/properties/CaseName.java | 2 - .../apache/fop/fo/properties/CaseTitle.java | 2 - .../apache/fop/fo/properties/Character.java | 2 - src/org/apache/fop/fo/properties/Clear.java | 10 +-- src/org/apache/fop/fo/properties/Clip.java | 11 ++-- src/org/apache/fop/fo/properties/Color.java | 5 +- .../apache/fop/fo/properties/ColorCommon.java | 11 ++-- .../fo/properties/ColorNonTransparent.java | 8 +-- .../fop/fo/properties/ColorProfileName.java | 2 - .../fop/fo/properties/ColorTransparent.java | 8 +-- .../apache/fop/fo/properties/ColumnCount.java | 5 +- .../apache/fop/fo/properties/ColumnGap.java | 5 +- .../fop/fo/properties/ColumnNumber.java | 2 - .../apache/fop/fo/properties/ColumnWidth.java | 2 - .../fop/fo/properties/Conditionality.java | 2 - .../fop/fo/properties/ContentDimension.java | 1 - .../fop/fo/properties/ContentHeight.java | 2 - .../apache/fop/fo/properties/ContentType.java | 2 - .../fop/fo/properties/ContentWidth.java | 2 - src/org/apache/fop/fo/properties/Country.java | 2 - src/org/apache/fop/fo/properties/Cue.java | 7 +- .../apache/fop/fo/properties/CueAfter.java | 2 - .../apache/fop/fo/properties/CueBefore.java | 2 - .../DestinationPlacementOffset.java | 5 +- .../apache/fop/fo/properties/Direction.java | 6 +- .../fop/fo/properties/DisplayAlign.java | 2 - .../fop/fo/properties/DominantBaseline.java | 9 +-- src/org/apache/fop/fo/properties/Dummy.java | 1 + .../apache/fop/fo/properties/Elevation.java | 2 - .../apache/fop/fo/properties/EmptyCells.java | 6 +- .../apache/fop/fo/properties/EndIndent.java | 5 +- src/org/apache/fop/fo/properties/EndsRow.java | 5 +- src/org/apache/fop/fo/properties/Extent.java | 5 +- .../fo/properties/ExternalDestination.java | 3 +- src/org/apache/fop/fo/properties/Float.java | 9 +-- .../apache/fop/fo/properties/FlowName.java | 5 +- src/org/apache/fop/fo/properties/Font.java | 27 +++----- .../apache/fop/fo/properties/FontFamily.java | 18 ++--- .../fo/properties/FontSelectionStrategy.java | 2 - .../apache/fop/fo/properties/FontSize.java | 19 ++---- .../fop/fo/properties/FontSizeAdjust.java | 2 - .../apache/fop/fo/properties/FontStretch.java | 12 ++-- .../apache/fop/fo/properties/FontStyle.java | 6 +- .../apache/fop/fo/properties/FontVariant.java | 6 +- .../apache/fop/fo/properties/FontWeight.java | 8 +-- .../fop/fo/properties/ForcePageCount.java | 10 +-- src/org/apache/fop/fo/properties/Format.java | 5 +- .../GlyphOrientationHorizontal.java | 5 +- .../properties/GlyphOrientationVertical.java | 2 - .../fop/fo/properties/GroupingSeparator.java | 2 - .../fop/fo/properties/GroupingSize.java | 2 - src/org/apache/fop/fo/properties/Height.java | 2 - .../apache/fop/fo/properties/Hyphenate.java | 5 +- .../fo/properties/HyphenationCharacter.java | 5 +- .../fop/fo/properties/HyphenationKeep.java | 2 - .../fo/properties/HyphenationLadderCount.java | 6 +- .../HyphenationPushCharacterCount.java | 3 +- .../HyphenationRemainCharacterCount.java | 3 +- src/org/apache/fop/fo/properties/Id.java | 2 - .../fo/properties/IndicateDestination.java | 5 +- .../fop/fo/properties/InitialPageNumber.java | 2 - .../InlineProgressionDimension.java | 2 - .../InlineProgressionDimensionMaximum.java | 2 - .../InlineProgressionDimensionMinimum.java | 2 - .../InlineProgressionDimensionOptimum.java | 2 - .../fo/properties/InternalDestination.java | 5 +- .../fop/fo/properties/IntrusionDisplace.java | 2 - src/org/apache/fop/fo/properties/Keep.java | 1 - .../fop/fo/properties/KeepTogether.java | 2 - .../properties/KeepTogetherWithinColumn.java | 2 - .../fo/properties/KeepTogetherWithinLine.java | 2 - .../fo/properties/KeepTogetherWithinPage.java | 2 - .../fop/fo/properties/KeepWithNext.java | 2 - .../properties/KeepWithNextWithinColumn.java | 2 - .../fo/properties/KeepWithNextWithinLine.java | 2 - .../fo/properties/KeepWithNextWithinPage.java | 2 - .../fop/fo/properties/KeepWithPrevious.java | 2 - .../KeepWithPreviousWithinColumn.java | 2 - .../KeepWithPreviousWithinLine.java | 2 - .../KeepWithPreviousWithinPage.java | 2 - .../apache/fop/fo/properties/Language.java | 2 - .../fop/fo/properties/LastLineEndIndent.java | 5 +- .../fop/fo/properties/LeaderAlignment.java | 2 - .../fop/fo/properties/LeaderLength.java | 2 - .../fo/properties/LeaderLengthMaximum.java | 3 +- .../fo/properties/LeaderLengthMinimum.java | 5 +- .../fo/properties/LeaderLengthOptimum.java | 5 +- .../fop/fo/properties/LeaderPattern.java | 6 +- .../fop/fo/properties/LeaderPatternWidth.java | 6 +- src/org/apache/fop/fo/properties/Left.java | 2 - .../fop/fo/properties/LetterSpacing.java | 6 +- .../LetterSpacingConditionality.java | 5 +- .../fo/properties/LetterSpacingMaximum.java | 5 +- .../fo/properties/LetterSpacingMinimum.java | 5 +- .../fo/properties/LetterSpacingOptimum.java | 5 +- .../properties/LetterSpacingPrecedence.java | 5 +- .../apache/fop/fo/properties/LetterValue.java | 2 - .../apache/fop/fo/properties/LineHeight.java | 8 +-- .../properties/LineHeightConditionality.java | 5 +- .../fop/fo/properties/LineHeightMaximum.java | 5 +- .../fop/fo/properties/LineHeightMinimum.java | 5 +- .../fop/fo/properties/LineHeightOptimum.java | 5 +- .../fo/properties/LineHeightPrecedence.java | 5 +- .../properties/LineHeightShiftAdjustment.java | 6 +- .../fo/properties/LineStackingStrategy.java | 6 +- .../fop/fo/properties/LinefeedTreatment.java | 6 +- src/org/apache/fop/fo/properties/Margin.java | 17 +++-- .../fop/fo/properties/MarginBottom.java | 5 +- .../apache/fop/fo/properties/MarginLeft.java | 5 +- .../apache/fop/fo/properties/MarginRight.java | 5 +- .../apache/fop/fo/properties/MarginTop.java | 5 +- .../fop/fo/properties/MarkerClassName.java | 5 +- .../apache/fop/fo/properties/MasterName.java | 5 +- .../fop/fo/properties/MasterReference.java | 5 +- .../apache/fop/fo/properties/MaxHeight.java | 5 +- .../apache/fop/fo/properties/MaxWidth.java | 2 - .../fop/fo/properties/MaximumRepeats.java | 6 +- .../apache/fop/fo/properties/MediaUsage.java | 2 - .../apache/fop/fo/properties/MinHeight.java | 5 +- .../apache/fop/fo/properties/MinWidth.java | 2 - .../apache/fop/fo/properties/NoProperty.java | 3 - .../fo/properties/NumberColumnsRepeated.java | 3 +- .../fo/properties/NumberColumnsSpanned.java | 3 +- .../fop/fo/properties/NumberRowsSpanned.java | 5 +- .../apache/fop/fo/properties/OddOrEven.java | 6 +- src/org/apache/fop/fo/properties/Orphans.java | 5 +- .../apache/fop/fo/properties/Overflow.java | 2 - src/org/apache/fop/fo/properties/Padding.java | 15 ++--- .../fop/fo/properties/PaddingAfter.java | 5 +- .../PaddingAfterConditionality.java | 5 +- .../fop/fo/properties/PaddingAfterLength.java | 5 +- .../fop/fo/properties/PaddingBefore.java | 5 +- .../PaddingBeforeConditionality.java | 5 +- .../fo/properties/PaddingBeforeLength.java | 5 +- .../fop/fo/properties/PaddingBottom.java | 5 +- .../apache/fop/fo/properties/PaddingEnd.java | 5 +- .../properties/PaddingEndConditionality.java | 5 +- .../fop/fo/properties/PaddingEndLength.java | 5 +- .../apache/fop/fo/properties/PaddingLeft.java | 5 +- .../fop/fo/properties/PaddingRight.java | 5 +- .../fop/fo/properties/PaddingStart.java | 5 +- .../PaddingStartConditionality.java | 5 +- .../fop/fo/properties/PaddingStartLength.java | 5 +- .../apache/fop/fo/properties/PaddingTop.java | 5 +- .../fop/fo/properties/PageBreakAfter.java | 1 - .../fop/fo/properties/PageBreakBefore.java | 1 - .../fop/fo/properties/PageBreakCommon.java | 21 +++--- .../fop/fo/properties/PageBreakInside.java | 15 ++--- .../apache/fop/fo/properties/PageHeight.java | 3 - .../fop/fo/properties/PageHeightWidth.java | 1 - .../fop/fo/properties/PagePosition.java | 6 +- .../apache/fop/fo/properties/PageWidth.java | 2 - src/org/apache/fop/fo/properties/Pause.java | 2 - .../apache/fop/fo/properties/PauseAfter.java | 2 - .../apache/fop/fo/properties/PauseBefore.java | 2 - src/org/apache/fop/fo/properties/Pitch.java | 2 - .../apache/fop/fo/properties/PitchRange.java | 2 - .../apache/fop/fo/properties/PlayDuring.java | 2 - .../apache/fop/fo/properties/Position.java | 16 ++--- .../apache/fop/fo/properties/Precedence.java | 5 +- .../fop/fo/properties/PrecedenceCommon.java | 2 - .../apache/fop/fo/properties/Property.java | 66 +++++-------------- .../ProvisionalDistanceBetweenStarts.java | 5 +- .../ProvisionalLabelSeparation.java | 5 +- src/org/apache/fop/fo/properties/RefId.java | 2 - .../fo/properties/ReferenceOrientation.java | 5 +- .../apache/fop/fo/properties/RegionName.java | 10 +-- .../fop/fo/properties/RelativeAlign.java | 6 +- .../fop/fo/properties/RelativePosition.java | 6 +- .../fop/fo/properties/RenderingIntent.java | 10 +-- .../fop/fo/properties/RetrieveBoundary.java | 6 +- .../fop/fo/properties/RetrieveClassName.java | 2 - .../fop/fo/properties/RetrievePosition.java | 6 +- .../apache/fop/fo/properties/Richness.java | 2 - src/org/apache/fop/fo/properties/Right.java | 2 - src/org/apache/fop/fo/properties/Role.java | 2 - .../apache/fop/fo/properties/RuleStyle.java | 12 ++-- .../fop/fo/properties/RuleThickness.java | 5 +- src/org/apache/fop/fo/properties/Scaling.java | 6 +- .../fop/fo/properties/ScalingMethod.java | 2 - .../apache/fop/fo/properties/ScoreSpaces.java | 5 +- src/org/apache/fop/fo/properties/Script.java | 2 - .../fop/fo/properties/ShowDestination.java | 6 +- src/org/apache/fop/fo/properties/Size.java | 2 - .../fop/fo/properties/SourceDocument.java | 11 ++-- .../apache/fop/fo/properties/SpaceAfter.java | 5 +- .../properties/SpaceAfterConditionality.java | 5 +- .../fop/fo/properties/SpaceAfterMaximum.java | 5 +- .../fop/fo/properties/SpaceAfterMinimum.java | 5 +- .../fop/fo/properties/SpaceAfterOptimum.java | 5 +- .../fo/properties/SpaceAfterPrecedence.java | 5 +- .../apache/fop/fo/properties/SpaceBefore.java | 5 +- .../properties/SpaceBeforeConditionality.java | 5 +- .../fop/fo/properties/SpaceBeforeMaximum.java | 5 +- .../fop/fo/properties/SpaceBeforeMinimum.java | 5 +- .../fop/fo/properties/SpaceBeforeOptimum.java | 5 +- .../fo/properties/SpaceBeforePrecedence.java | 5 +- .../apache/fop/fo/properties/SpaceEnd.java | 5 +- .../fo/properties/SpaceEndConditionality.java | 5 +- .../fop/fo/properties/SpaceEndMaximum.java | 5 +- .../fop/fo/properties/SpaceEndMinimum.java | 5 +- .../fop/fo/properties/SpaceEndOptimum.java | 5 +- .../fop/fo/properties/SpaceEndPrecedence.java | 5 +- .../apache/fop/fo/properties/SpaceStart.java | 5 +- .../properties/SpaceStartConditionality.java | 5 +- .../fop/fo/properties/SpaceStartMaximum.java | 5 +- .../fop/fo/properties/SpaceStartMinimum.java | 5 +- .../fop/fo/properties/SpaceStartOptimum.java | 5 +- .../fo/properties/SpaceStartPrecedence.java | 5 +- src/org/apache/fop/fo/properties/Span.java | 2 - src/org/apache/fop/fo/properties/Speak.java | 2 - .../apache/fop/fo/properties/SpeakHeader.java | 2 - .../fop/fo/properties/SpeakNumeral.java | 2 - .../fop/fo/properties/SpeakPunctuation.java | 2 - .../apache/fop/fo/properties/SpeechRate.java | 2 - src/org/apache/fop/fo/properties/Src.java | 2 - .../apache/fop/fo/properties/StartIndent.java | 5 +- .../fop/fo/properties/StartingState.java | 6 +- .../apache/fop/fo/properties/StartsRow.java | 5 +- src/org/apache/fop/fo/properties/Stress.java | 2 - .../fo/properties/SuppressAtLineBreak.java | 2 - .../apache/fop/fo/properties/SwitchTo.java | 13 ++-- .../apache/fop/fo/properties/TableLayout.java | 2 - .../fo/properties/TableOmitFooterAtBreak.java | 5 +- .../fo/properties/TableOmitHeaderAtBreak.java | 5 +- .../properties/TargetPresentationContext.java | 6 +- .../properties/TargetProcessingContext.java | 6 +- .../fop/fo/properties/TargetStylesheet.java | 6 +- .../apache/fop/fo/properties/TextAlign.java | 11 ++-- .../fop/fo/properties/TextAlignLast.java | 13 ++-- .../fop/fo/properties/TextAltitude.java | 6 +- .../fop/fo/properties/TextDecoration.java | 17 ++--- .../apache/fop/fo/properties/TextDepth.java | 6 +- .../apache/fop/fo/properties/TextIndent.java | 5 +- .../apache/fop/fo/properties/TextShadow.java | 8 +-- .../fop/fo/properties/TextTransform.java | 2 - src/org/apache/fop/fo/properties/Top.java | 2 - .../fop/fo/properties/TreatAsWordSpace.java | 2 - .../apache/fop/fo/properties/UnicodeBidi.java | 6 +- .../UsageContextOfSuppressAtLineBreak.java | 2 - .../fop/fo/properties/VerticalAlign.java | 13 ++-- .../apache/fop/fo/properties/Visibility.java | 6 +- .../apache/fop/fo/properties/VoiceFamily.java | 2 - src/org/apache/fop/fo/properties/Volume.java | 2 - .../apache/fop/fo/properties/WhiteSpace.java | 6 +- .../fop/fo/properties/WhiteSpaceCollapse.java | 5 +- .../fo/properties/WhiteSpaceTreatment.java | 13 ++-- src/org/apache/fop/fo/properties/Widows.java | 5 +- src/org/apache/fop/fo/properties/Width.java | 2 - .../apache/fop/fo/properties/WordSpacing.java | 8 +-- .../fop/fo/properties/WordSpacingCommon.java | 1 - .../properties/WordSpacingConditionality.java | 5 +- .../fop/fo/properties/WordSpacingMaximum.java | 11 ++-- .../fop/fo/properties/WordSpacingMinimum.java | 11 ++-- .../fop/fo/properties/WordSpacingOptimum.java | 11 ++-- .../fo/properties/WordSpacingPrecedence.java | 5 +- .../apache/fop/fo/properties/WrapOption.java | 6 +- .../apache/fop/fo/properties/WritingMode.java | 13 ++-- src/org/apache/fop/fo/properties/XmlLang.java | 2 - src/org/apache/fop/fo/properties/ZIndex.java | 2 - .../apache/fop/tools/DocumentInputSource.java | 5 +- src/org/apache/fop/tools/DocumentReader.java | 19 ++++-- src/org/apache/fop/xml/FoXMLEvent.java | 4 +- src/org/apache/fop/xml/FoXMLEventPool.java | 4 -- .../apache/fop/xml/FoXMLSerialHandler.java | 21 +++--- .../fop/xml/SyncedFoXmlEventsBuffer.java | 14 ++-- src/org/apache/fop/xml/XMLEvent.java | 6 +- src/org/apache/fop/xml/XMLEventPool.java | 6 +- src/org/apache/fop/xml/XMLNamespaces.java | 6 +- 462 files changed, 1399 insertions(+), 2318 deletions(-) create mode 100644 .classpath create mode 100644 .project diff --git a/.classpath b/.classpath new file mode 100644 index 000000000..fe49e4da9 --- /dev/null +++ b/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 000000000..d22aa0da3 --- /dev/null +++ b/.project @@ -0,0 +1,17 @@ + + + fop-alt.design + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/src/org/apache/fop/apps/Driver.java b/src/org/apache/fop/apps/Driver.java index 3cd4842c5..6706eaaf0 100644 --- a/src/org/apache/fop/apps/Driver.java +++ b/src/org/apache/fop/apps/Driver.java @@ -53,25 +53,16 @@ package org.apache.fop.apps; // FOP +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; + +import org.apache.fop.configuration.Configuration; import org.apache.fop.fo.FOTree; import org.apache.fop.layout.AreaTree; +import org.apache.fop.messaging.MessageHandler; import org.apache.fop.xml.FoXMLSerialHandler; import org.apache.fop.xml.SyncedFoXmlEventsBuffer; -import org.apache.fop.configuration.Configuration; -import org.apache.fop.messaging.MessageHandler; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.expr.PropertyException; - -// DOM - -// SAX -import org.xml.sax.XMLReader; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; - -// Java -import java.io.*; -import java.util.*; public class Driver { /** diff --git a/src/org/apache/fop/apps/FOInputHandler.java b/src/org/apache/fop/apps/FOInputHandler.java index f535813b2..3d52b34d2 100644 --- a/src/org/apache/fop/apps/FOInputHandler.java +++ b/src/org/apache/fop/apps/FOInputHandler.java @@ -53,15 +53,11 @@ package org.apache.fop.apps; // Imported SAX classes +import java.io.File; + import org.xml.sax.InputSource; import org.xml.sax.XMLReader; -// fop -import org.apache.fop.messaging.MessageHandler; - -// java -import java.io.File; - /** * Manages input if it is an xsl:fo file */ diff --git a/src/org/apache/fop/apps/InputHandler.java b/src/org/apache/fop/apps/InputHandler.java index 24bd0b887..7dfe138cf 100644 --- a/src/org/apache/fop/apps/InputHandler.java +++ b/src/org/apache/fop/apps/InputHandler.java @@ -53,16 +53,13 @@ package org.apache.fop.apps; // SAX +import java.io.File; +import java.net.URL; + import org.xml.sax.InputSource; import org.xml.sax.XMLReader; -// Java -import java.net.URL; -import java.io.File; - -// FOP import org.apache.fop.messaging.MessageHandler; -import org.apache.fop.configuration.Configuration; abstract public class InputHandler { diff --git a/src/org/apache/fop/configuration/ConfigurationReader.java b/src/org/apache/fop/configuration/ConfigurationReader.java index bcb2471d1..f02c6205e 100644 --- a/src/org/apache/fop/configuration/ConfigurationReader.java +++ b/src/org/apache/fop/configuration/ConfigurationReader.java @@ -52,8 +52,6 @@ package org.apache.fop.configuration; -// sax -import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.XMLReader; import org.xml.sax.SAXException; import java.io.IOException; @@ -63,7 +61,6 @@ import org.xml.sax.InputSource; import org.apache.fop.apps.Driver; import org.apache.fop.messaging.MessageHandler; import org.apache.fop.apps.FOPException; -import org.apache.fop.configuration.Configuration; /** * entry class for reading configuration from file and creating a configuration diff --git a/src/org/apache/fop/configuration/LanguageFileReader.java b/src/org/apache/fop/configuration/LanguageFileReader.java index e855dc768..8dd23d939 100644 --- a/src/org/apache/fop/configuration/LanguageFileReader.java +++ b/src/org/apache/fop/configuration/LanguageFileReader.java @@ -68,7 +68,6 @@ import org.apache.fop.configuration.ConfigurationReader; import java.io.IOException; import java.util.HashMap; -import java.util.ArrayList; /** */ diff --git a/src/org/apache/fop/datastructs/CircularBuffer.java b/src/org/apache/fop/datastructs/CircularBuffer.java index 6a952a06f..c33af0dca 100644 --- a/src/org/apache/fop/datastructs/CircularBuffer.java +++ b/src/org/apache/fop/datastructs/CircularBuffer.java @@ -58,7 +58,6 @@ package org.apache.fop.datastructs; import java.util.NoSuchElementException; -import java.lang.IndexOutOfBoundsException; /** * A general circular buffer class. It stores and returns Object diff --git a/src/org/apache/fop/datatypes/AbstractPropertyValue.java b/src/org/apache/fop/datatypes/AbstractPropertyValue.java index d4a31a9f5..5146d1df8 100644 --- a/src/org/apache/fop/datatypes/AbstractPropertyValue.java +++ b/src/org/apache/fop/datatypes/AbstractPropertyValue.java @@ -55,12 +55,10 @@ */ package org.apache.fop.datatypes; -import org.apache.fop.fo.PropertyConsts; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.*; -import org.apache.fop.fo.FONode; +import org.apache.fop.fo.PropertyConsts; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.properties.Property; /** * Base abstract class for all property value types. diff --git a/src/org/apache/fop/datatypes/Angle.java b/src/org/apache/fop/datatypes/Angle.java index 3071b58b4..d7b2866f5 100644 --- a/src/org/apache/fop/datatypes/Angle.java +++ b/src/org/apache/fop/datatypes/Angle.java @@ -53,9 +53,7 @@ package org.apache.fop.datatypes; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.fo.properties.*; +import org.apache.fop.fo.properties.Property; public class Angle extends AbstractPropertyValue { diff --git a/src/org/apache/fop/datatypes/Auto.java b/src/org/apache/fop/datatypes/Auto.java index 6d9eac129..02445e620 100644 --- a/src/org/apache/fop/datatypes/Auto.java +++ b/src/org/apache/fop/datatypes/Auto.java @@ -56,10 +56,8 @@ */ package org.apache.fop.datatypes; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.AbstractPropertyValue; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.*; +import org.apache.fop.fo.properties.Property; /** * Class for "auto" objects. diff --git a/src/org/apache/fop/datatypes/Bool.java b/src/org/apache/fop/datatypes/Bool.java index 366469633..61dda976f 100644 --- a/src/org/apache/fop/datatypes/Bool.java +++ b/src/org/apache/fop/datatypes/Bool.java @@ -56,9 +56,7 @@ package org.apache.fop.datatypes; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.fo.properties.*; +import org.apache.fop.fo.properties.Property; /** * Boolean property value. May take values of "true" or "false". diff --git a/src/org/apache/fop/datatypes/ColorSpace.java b/src/org/apache/fop/datatypes/ColorSpace.java index e6dc7bbe9..7395f3c82 100644 --- a/src/org/apache/fop/datatypes/ColorSpace.java +++ b/src/org/apache/fop/datatypes/ColorSpace.java @@ -126,11 +126,11 @@ public class ColorSpace { // shouldn't this be a select-case? I can never remember // the syntax for that. - if (this.currentColorSpace == this.DEVICE_RGB) { + if (this.currentColorSpace == ColorSpace.DEVICE_RGB) { return ("DeviceRGB"); - } else if (this.currentColorSpace == this.DEVICE_CMYK) { + } else if (this.currentColorSpace == ColorSpace.DEVICE_CMYK) { return ("DeviceCMYK"); - } else if (this.currentColorSpace == this.DEVICE_GRAY) { + } else if (this.currentColorSpace == ColorSpace.DEVICE_GRAY) { return ("DeviceGray"); } else { // unknown... Error. Tell them it's RGB and hope they don't notice. return ("DeviceRGB"); diff --git a/src/org/apache/fop/datatypes/ColorType.java b/src/org/apache/fop/datatypes/ColorType.java index f1b8f2de9..a82a23a2b 100644 --- a/src/org/apache/fop/datatypes/ColorType.java +++ b/src/org/apache/fop/datatypes/ColorType.java @@ -54,11 +54,8 @@ package org.apache.fop.datatypes; import java.util.HashMap; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.AbstractPropertyValue; +import org.apache.fop.fo.expr.PropertyException; /** * A base datatype class; colour in XSL diff --git a/src/org/apache/fop/datatypes/CountryType.java b/src/org/apache/fop/datatypes/CountryType.java index 73144504f..f68390514 100644 --- a/src/org/apache/fop/datatypes/CountryType.java +++ b/src/org/apache/fop/datatypes/CountryType.java @@ -53,11 +53,9 @@ */ package org.apache.fop.datatypes; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.properties.*; -import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.properties.Property; /** * A class for country specifiers. diff --git a/src/org/apache/fop/datatypes/Ems.java b/src/org/apache/fop/datatypes/Ems.java index 981c34f71..735b92bc5 100644 --- a/src/org/apache/fop/datatypes/Ems.java +++ b/src/org/apache/fop/datatypes/Ems.java @@ -54,10 +54,10 @@ package org.apache.fop.datatypes; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.PropNames; import org.apache.fop.fo.FONode; +import org.apache.fop.fo.PropNames; import org.apache.fop.fo.PropertyConsts; +import org.apache.fop.fo.expr.PropertyException; /** * Constructor class for relative lengths measured in ems. Constructs diff --git a/src/org/apache/fop/datatypes/EnumType.java b/src/org/apache/fop/datatypes/EnumType.java index fb1f9addf..31ad9c513 100644 --- a/src/org/apache/fop/datatypes/EnumType.java +++ b/src/org/apache/fop/datatypes/EnumType.java @@ -54,13 +54,9 @@ */ package org.apache.fop.datatypes; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.AbstractPropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.properties.*; -import org.apache.fop.messaging.MessageHandler; -import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.properties.Property; /** * Base class for representing enumerated values. The value is maintained as diff --git a/src/org/apache/fop/datatypes/FontFamilySet.java b/src/org/apache/fop/datatypes/FontFamilySet.java index 167f1c5a6..f331b71ab 100644 --- a/src/org/apache/fop/datatypes/FontFamilySet.java +++ b/src/org/apache/fop/datatypes/FontFamilySet.java @@ -60,12 +60,9 @@ package org.apache.fop.datatypes; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.properties.*; -import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.properties.Property; /** * A base class for representing a set of font family names. diff --git a/src/org/apache/fop/datatypes/Frequency.java b/src/org/apache/fop/datatypes/Frequency.java index eba58a1d7..172619ca7 100644 --- a/src/org/apache/fop/datatypes/Frequency.java +++ b/src/org/apache/fop/datatypes/Frequency.java @@ -53,9 +53,7 @@ package org.apache.fop.datatypes; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.properties.*; +import org.apache.fop.fo.properties.Property; public class Frequency extends AbstractPropertyValue { diff --git a/src/org/apache/fop/datatypes/IntegerType.java b/src/org/apache/fop/datatypes/IntegerType.java index 03a15c09b..bcbd11ecf 100644 --- a/src/org/apache/fop/datatypes/IntegerType.java +++ b/src/org/apache/fop/datatypes/IntegerType.java @@ -56,9 +56,7 @@ package org.apache.fop.datatypes; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.properties.*; +import org.apache.fop.fo.properties.Property; public class IntegerType extends AbstractPropertyValue { diff --git a/src/org/apache/fop/datatypes/Ints.java b/src/org/apache/fop/datatypes/Ints.java index 8a2faf496..7f8557f83 100644 --- a/src/org/apache/fop/datatypes/Ints.java +++ b/src/org/apache/fop/datatypes/Ints.java @@ -57,9 +57,9 @@ package org.apache.fop.datatypes; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FObjectNames; import org.apache.fop.datastructs.ROIntegerArray; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; /** * Data class of pre-initialised Integer objects. diff --git a/src/org/apache/fop/datatypes/LanguageType.java b/src/org/apache/fop/datatypes/LanguageType.java index 6cd7ca7d9..29dafca75 100644 --- a/src/org/apache/fop/datatypes/LanguageType.java +++ b/src/org/apache/fop/datatypes/LanguageType.java @@ -57,11 +57,9 @@ package org.apache.fop.datatypes; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.properties.*; -import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.properties.Property; /** * A class for language specifiers. diff --git a/src/org/apache/fop/datatypes/Literal.java b/src/org/apache/fop/datatypes/Literal.java index 8db1a0dfc..1d5f35e8d 100644 --- a/src/org/apache/fop/datatypes/Literal.java +++ b/src/org/apache/fop/datatypes/Literal.java @@ -56,11 +56,9 @@ package org.apache.fop.datatypes; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.*; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.properties.Property; /** * Class to represent Literal values. Subclass of StringType. diff --git a/src/org/apache/fop/datatypes/MappedNumeric.java b/src/org/apache/fop/datatypes/MappedNumeric.java index d66e2d2be..da47cba93 100644 --- a/src/org/apache/fop/datatypes/MappedNumeric.java +++ b/src/org/apache/fop/datatypes/MappedNumeric.java @@ -55,12 +55,9 @@ */ package org.apache.fop.datatypes; -import org.apache.fop.datatypes.EnumType; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.properties.*; import org.apache.fop.fo.FONode; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.properties.Property; /** * Class to represent an enumerated type whose values map onto a diff --git a/src/org/apache/fop/datatypes/MimeType.java b/src/org/apache/fop/datatypes/MimeType.java index 0c62fcd09..8435dd5c5 100644 --- a/src/org/apache/fop/datatypes/MimeType.java +++ b/src/org/apache/fop/datatypes/MimeType.java @@ -57,9 +57,7 @@ package org.apache.fop.datatypes; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.properties.*; +import org.apache.fop.fo.properties.Property; /** * Class for mime-type subset of content-type. diff --git a/src/org/apache/fop/datatypes/NCName.java b/src/org/apache/fop/datatypes/NCName.java index 509a106c3..291162c1d 100644 --- a/src/org/apache/fop/datatypes/NCName.java +++ b/src/org/apache/fop/datatypes/NCName.java @@ -58,9 +58,7 @@ package org.apache.fop.datatypes; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.*; -import org.apache.fop.datatypes.StringType; -import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.properties.Property; /** * An NCName. NCName may be instantiated directly, and it also serves as a diff --git a/src/org/apache/fop/datatypes/NoType.java b/src/org/apache/fop/datatypes/NoType.java index 037ecfd34..55b438f44 100644 --- a/src/org/apache/fop/datatypes/NoType.java +++ b/src/org/apache/fop/datatypes/NoType.java @@ -56,12 +56,9 @@ */ package org.apache.fop.datatypes; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.*; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertyConsts; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.properties.Property; /** * Class for dummy property values; e.g. unsupported properties or null diff --git a/src/org/apache/fop/datatypes/None.java b/src/org/apache/fop/datatypes/None.java index 0b9fc5313..4a80d639c 100644 --- a/src/org/apache/fop/datatypes/None.java +++ b/src/org/apache/fop/datatypes/None.java @@ -56,10 +56,8 @@ */ package org.apache.fop.datatypes; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.AbstractPropertyValue; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.*; +import org.apache.fop.fo.properties.Property; /** * Class for property values of "none". diff --git a/src/org/apache/fop/datatypes/Numeric.java b/src/org/apache/fop/datatypes/Numeric.java index 6a2745e01..151da013c 100644 --- a/src/org/apache/fop/datatypes/Numeric.java +++ b/src/org/apache/fop/datatypes/Numeric.java @@ -55,14 +55,9 @@ package org.apache.fop.datatypes; -import java.lang.Number; - -import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.properties.*; -import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.properties.Property; /** diff --git a/src/org/apache/fop/datatypes/PropertyValue.java b/src/org/apache/fop/datatypes/PropertyValue.java index 395232fe7..a58dd1d82 100644 --- a/src/org/apache/fop/datatypes/PropertyValue.java +++ b/src/org/apache/fop/datatypes/PropertyValue.java @@ -56,9 +56,8 @@ */ package org.apache.fop.datatypes; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.FONode; import org.apache.fop.datastructs.ROStringArray; +import org.apache.fop.fo.expr.PropertyException; /** * Base interface for all property value types. diff --git a/src/org/apache/fop/datatypes/PropertyValueList.java b/src/org/apache/fop/datatypes/PropertyValueList.java index 8d8a45fa4..ffd8d1c43 100644 --- a/src/org/apache/fop/datatypes/PropertyValueList.java +++ b/src/org/apache/fop/datatypes/PropertyValueList.java @@ -57,17 +57,14 @@ package org.apache.fop.datatypes; import java.lang.reflect.InvocationTargetException; - -import java.util.LinkedList; import java.util.Collection; import java.util.Iterator; +import java.util.LinkedList; -import org.apache.fop.fo.properties.*; -import org.apache.fop.fo.PropertyConsts; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FONode; -import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.PropertyConsts; import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.properties.Property; /** * A list of PropertyValue elements. diff --git a/src/org/apache/fop/datatypes/ScriptType.java b/src/org/apache/fop/datatypes/ScriptType.java index 755dcbedd..2b5e318a3 100644 --- a/src/org/apache/fop/datatypes/ScriptType.java +++ b/src/org/apache/fop/datatypes/ScriptType.java @@ -56,11 +56,9 @@ */ package org.apache.fop.datatypes; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.properties.*; -import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.properties.Property; /** * A class for script specifiers. diff --git a/src/org/apache/fop/datatypes/ShadowEffect.java b/src/org/apache/fop/datatypes/ShadowEffect.java index eba90d111..f2190bb96 100644 --- a/src/org/apache/fop/datatypes/ShadowEffect.java +++ b/src/org/apache/fop/datatypes/ShadowEffect.java @@ -54,16 +54,11 @@ */ package org.apache.fop.datatypes; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.*; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.PropNames; - import java.util.Iterator; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; + /** * Class to represent ShadowEffect values. This class is a holder for a * set of PropertyValue objects, and will be placed in a PropertyValueList, diff --git a/src/org/apache/fop/datatypes/Slash.java b/src/org/apache/fop/datatypes/Slash.java index 7a5aeaebc..0b873be37 100644 --- a/src/org/apache/fop/datatypes/Slash.java +++ b/src/org/apache/fop/datatypes/Slash.java @@ -55,9 +55,6 @@ package org.apache.fop.datatypes; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.fo.properties.*; /** * A datatype representing an isolated forward slash character. diff --git a/src/org/apache/fop/datatypes/StringType.java b/src/org/apache/fop/datatypes/StringType.java index 760e66396..82dd0ebf5 100644 --- a/src/org/apache/fop/datatypes/StringType.java +++ b/src/org/apache/fop/datatypes/StringType.java @@ -58,9 +58,7 @@ package org.apache.fop.datatypes; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.fo.properties.*; +import org.apache.fop.fo.properties.Property; /** * StringType is not intended to be instantiated directly. It diff --git a/src/org/apache/fop/datatypes/TextDecorator.java b/src/org/apache/fop/datatypes/TextDecorator.java index 995d10a1a..e8b203fbd 100644 --- a/src/org/apache/fop/datatypes/TextDecorator.java +++ b/src/org/apache/fop/datatypes/TextDecorator.java @@ -55,11 +55,8 @@ */ package org.apache.fop.datatypes; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.*; import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; /** * Class for "text-decoration" specification. This class specifies the diff --git a/src/org/apache/fop/datatypes/Time.java b/src/org/apache/fop/datatypes/Time.java index 42e2835ee..a74b41128 100644 --- a/src/org/apache/fop/datatypes/Time.java +++ b/src/org/apache/fop/datatypes/Time.java @@ -55,9 +55,7 @@ package org.apache.fop.datatypes; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.fo.properties.*; +import org.apache.fop.fo.properties.Property; public class Time extends AbstractPropertyValue { diff --git a/src/org/apache/fop/datatypes/UriType.java b/src/org/apache/fop/datatypes/UriType.java index 827fe1419..384d7f4fb 100644 --- a/src/org/apache/fop/datatypes/UriType.java +++ b/src/org/apache/fop/datatypes/UriType.java @@ -56,10 +56,8 @@ */ package org.apache.fop.datatypes; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.AbstractPropertyValue; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.*; +import org.apache.fop.fo.properties.Property; /** * Class for URLs specified with uri() function. diff --git a/src/org/apache/fop/datatypes/indirect/FromNearestSpecified.java b/src/org/apache/fop/datatypes/indirect/FromNearestSpecified.java index 9e7d48782..b3891872c 100644 --- a/src/org/apache/fop/datatypes/indirect/FromNearestSpecified.java +++ b/src/org/apache/fop/datatypes/indirect/FromNearestSpecified.java @@ -51,11 +51,10 @@ */ package org.apache.fop.datatypes.indirect; -import org.apache.fop.datatypes.indirect.IndirectValue; import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.FONode; import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.properties.Property; -import org.apache.fop.fo.FONode; /** * A pseudo-class to represent a call to the core function diff --git a/src/org/apache/fop/datatypes/indirect/FromParent.java b/src/org/apache/fop/datatypes/indirect/FromParent.java index 2342cae6e..8e31396ed 100644 --- a/src/org/apache/fop/datatypes/indirect/FromParent.java +++ b/src/org/apache/fop/datatypes/indirect/FromParent.java @@ -51,7 +51,6 @@ */ package org.apache.fop.datatypes.indirect; -import org.apache.fop.datatypes.indirect.IndirectValue; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.properties.Property; diff --git a/src/org/apache/fop/datatypes/indirect/IndirectValue.java b/src/org/apache/fop/datatypes/indirect/IndirectValue.java index 9aa899a97..2efe03c03 100644 --- a/src/org/apache/fop/datatypes/indirect/IndirectValue.java +++ b/src/org/apache/fop/datatypes/indirect/IndirectValue.java @@ -54,13 +54,12 @@ */ package org.apache.fop.datatypes.indirect; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.properties.Property; -import org.apache.fop.fo.PropNames; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.FONode; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; /** * A superclass for objects which may have deferred PropertyValue diff --git a/src/org/apache/fop/datatypes/indirect/Inherit.java b/src/org/apache/fop/datatypes/indirect/Inherit.java index b409d7240..b00d3e6ad 100644 --- a/src/org/apache/fop/datatypes/indirect/Inherit.java +++ b/src/org/apache/fop/datatypes/indirect/Inherit.java @@ -56,11 +56,9 @@ */ package org.apache.fop.datatypes.indirect; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.properties.Property; -import org.apache.fop.fo.FONode; -import org.apache.fop.datatypes.indirect.IndirectValue; /** * A class representing the inherit keyword. This keyword is diff --git a/src/org/apache/fop/datatypes/indirect/InheritedValue.java b/src/org/apache/fop/datatypes/indirect/InheritedValue.java index f85d442cb..d356f9822 100644 --- a/src/org/apache/fop/datatypes/indirect/InheritedValue.java +++ b/src/org/apache/fop/datatypes/indirect/InheritedValue.java @@ -54,12 +54,10 @@ */ package org.apache.fop.datatypes.indirect; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.properties.Property; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.datatypes.indirect.IndirectValue; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.properties.Property; /** * A class representing an unresolved inherited value. It may be created as diff --git a/src/org/apache/fop/fo/FOAttributes.java b/src/org/apache/fop/fo/FOAttributes.java index 0cac00db3..52e91cd5f 100644 --- a/src/org/apache/fop/fo/FOAttributes.java +++ b/src/org/apache/fop/fo/FOAttributes.java @@ -57,25 +57,20 @@ */ package org.apache.fop.fo; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import org.xml.sax.Attributes; + import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.FObjectNames; import org.apache.fop.datatypes.Ints; -import org.apache.fop.messaging.MessageHandler; +import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.xml.FoXMLEvent; import org.apache.fop.xml.XMLNamespaces; -import org.xml.sax.Attributes; - -import java.util.Iterator; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Collections; -import java.util.Arrays; - /** * The FO Attributes data structures and methods needed to manage the * Attributes associated with FO nodes. diff --git a/src/org/apache/fop/fo/FONode.java b/src/org/apache/fop/fo/FONode.java index 943f33288..143b5c392 100644 --- a/src/org/apache/fop/fo/FONode.java +++ b/src/org/apache/fop/fo/FONode.java @@ -56,40 +56,28 @@ */ package org.apache.fop.fo; -import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.FOAttributes; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FOPropertySets; -import org.apache.fop.fo.properties.Property; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.expr.PropertyParser; -import org.apache.fop.fo.expr.FunctionNotImplementedException; -import org.apache.fop.datatypes.Ints; +import java.util.BitSet; +import java.util.HashMap; +import java.util.Iterator; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.Node; +import org.apache.fop.datastructs.ROBitSet; +import org.apache.fop.datastructs.TreeException; +import org.apache.fop.datatypes.Numeric; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.Numeric; import org.apache.fop.datatypes.TextDecorations; -import org.apache.fop.datatypes.indirect.Inherit; import org.apache.fop.datatypes.indirect.IndirectValue; -import org.apache.fop.datastructs.Node; -import org.apache.fop.datastructs.Node.*; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datastructs.ROBitSet; -import org.apache.fop.apps.FOPException; +import org.apache.fop.fo.expr.FunctionNotImplementedException; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.expr.PropertyParser; +import org.apache.fop.fo.properties.Property; +import org.apache.fop.messaging.MessageHandler; import org.apache.fop.xml.FoXMLEvent; import org.apache.fop.xml.FoXMLEventPool; import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.XMLNamespaces; -import org.apache.fop.messaging.MessageHandler; - -import org.xml.sax.Attributes; - -import java.util.BitSet; -import java.util.Iterator; -import java.util.ArrayList; -import java.util.HashMap; -import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; /** * Class for nodes in the FO tree. diff --git a/src/org/apache/fop/fo/FOPropertySets.java b/src/org/apache/fop/fo/FOPropertySets.java index b8cc2099d..cae648845 100644 --- a/src/org/apache/fop/fo/FOPropertySets.java +++ b/src/org/apache/fop/fo/FOPropertySets.java @@ -55,23 +55,9 @@ package org.apache.fop.fo; -import java.lang.Character; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.StringTokenizer; - -// Only for tree property set partitions import java.util.BitSet; -import java.util.Iterator; import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FONode; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.datastructs.ROIntArray; import org.apache.fop.datastructs.ROBitSet; /** diff --git a/src/org/apache/fop/fo/FOTree.java b/src/org/apache/fop/fo/FOTree.java index a217da2bd..2aa35e44f 100644 --- a/src/org/apache/fop/fo/FOTree.java +++ b/src/org/apache/fop/fo/FOTree.java @@ -56,32 +56,15 @@ */ package org.apache.fop.fo; +import org.apache.fop.apps.Driver; +import org.apache.fop.configuration.Configuration; import org.apache.fop.datastructs.Tree; -import org.apache.fop.datastructs.Node; -import org.apache.fop.datastructs.Node.*; -import org.apache.fop.datatypes.Ints; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.datatypes.CountryLanguageScript; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.xml.XMLNamespaces; -import org.apache.fop.xml.SyncedFoXmlEventsBuffer; -import org.apache.fop.apps.Driver; -import org.apache.fop.apps.FOPException; -import org.apache.fop.configuration.Configuration; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.PropNames; import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.expr.PropertyParser; - -import org.xml.sax.InputSource; -import org.xml.sax.XMLReader; - -import java.util.HashMap; -import java.util.ArrayList; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; +import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; /** * FOTree is the class that generates and maintains the FO Tree. @@ -175,7 +158,7 @@ public class FOTree extends Tree implements Runnable { foRoot.buildFoTree(); System.out.println("Back from buildFoTree"); // Clean up the fo:root event - event = xmlevents.getEndElement(xmlevents.DISCARD_EV, event); + event = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, event); // Get the end of document xmlevents.getEndDocument(); } catch (Exception e) { diff --git a/src/org/apache/fop/fo/FObject.java b/src/org/apache/fop/fo/FObject.java index 22d435152..b93441e65 100644 --- a/src/org/apache/fop/fo/FObject.java +++ b/src/org/apache/fop/fo/FObject.java @@ -2,15 +2,59 @@ * FObject.java * Created: Sun Jan 27 01:35:24 2002 * + * ============================================================================ + * The Apache Software License, Version 1.1 + * ============================================================================ + * + * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modifica- + * tion, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3. The end-user documentation included with the redistribution, if any, must + * include the following acknowledgment: "This product includes software + * developed by the Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, if + * and wherever such third-party acknowledgments normally appear. + * + * 4. The names "FOP" and "Apache Software Foundation" must not be used to + * endorse or promote products derived from this software without prior + * written permission. For written permission, please contact + * apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache", nor may + * "Apache" appear in their name, without prior written permission of the + * Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- + * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This software consists of voluntary contributions made by many individuals + * on behalf of the Apache Software Foundation and was originally created by + * James Tauber . For more information on the Apache + * Software Foundation, please see . + * * @author Peter B. West * @version $Revision$ $Name$ */ package org.apache.fop.fo; -import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.FObjects; /** * Base class for all Flow Objects diff --git a/src/org/apache/fop/fo/FObjectNames.java b/src/org/apache/fop/fo/FObjectNames.java index 74f919a0d..cd8b81d43 100644 --- a/src/org/apache/fop/fo/FObjectNames.java +++ b/src/org/apache/fop/fo/FObjectNames.java @@ -55,11 +55,11 @@ package org.apache.fop.fo; +import java.util.HashMap; + import org.apache.fop.apps.FOPException; import org.apache.fop.datatypes.Ints; -import java.util.HashMap; - /** * Data class containing the Flow Object names and associated integer * constants. diff --git a/src/org/apache/fop/fo/FObjectSets.java b/src/org/apache/fop/fo/FObjectSets.java index 3657d1b16..9ddfb9d88 100644 --- a/src/org/apache/fop/fo/FObjectSets.java +++ b/src/org/apache/fop/fo/FObjectSets.java @@ -55,11 +55,10 @@ package org.apache.fop.fo; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.datastructs.ROBitSet; - import java.util.BitSet; +import org.apache.fop.datastructs.ROBitSet; + /** * Data class containing sets of Flow Objects included in certain FO set * specifications. diff --git a/src/org/apache/fop/fo/FObjects.java b/src/org/apache/fop/fo/FObjects.java index b15689c45..765fd72ff 100644 --- a/src/org/apache/fop/fo/FObjects.java +++ b/src/org/apache/fop/fo/FObjects.java @@ -55,19 +55,12 @@ package org.apache.fop.fo; -import java.lang.Character; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; - import java.util.HashMap; import java.util.StringTokenizer; -// Only for tree property set partitions - import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.PropNames; import org.apache.fop.datatypes.Ints; import org.apache.fop.xml.FoXMLEvent; diff --git a/src/org/apache/fop/fo/FoRoot.java b/src/org/apache/fop/fo/FoRoot.java index df5321536..a471c6bb0 100644 --- a/src/org/apache/fop/fo/FoRoot.java +++ b/src/org/apache/fop/fo/FoRoot.java @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ============================================================================ @@ -55,26 +55,19 @@ package org.apache.fop.fo; +import java.util.Arrays; +import java.util.HashMap; +import java.util.NoSuchElementException; + import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.FObjectNames; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.FONode; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.pagination.FoLayoutMasterSet; import org.apache.fop.fo.declarations.FoDeclarations; +import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.flow.FoPageSequence; +import org.apache.fop.fo.pagination.FoLayoutMasterSet; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.xml.XMLEvent; -import org.apache.fop.xml.XMLNamespaces; import org.apache.fop.xml.SyncedFoXmlEventsBuffer; - -import org.xml.sax.Attributes; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.NoSuchElementException; +import org.apache.fop.xml.XMLEvent; /** * FoRoot is the class which processes the fo:root start element @@ -181,7 +174,7 @@ public class FoRoot extends FONode { new FoLayoutMasterSet(getFOTree(), this, ev); // Clean up the fo:layout-master-set event pageSequenceMasters = layoutMasters.getPageSequenceMasters(); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); layoutMasters.deleteSubTree(); @@ -193,7 +186,7 @@ public class FoRoot extends FONode { // process the declarations declarations = numChildren(); new FoDeclarations(getFOTree(), this, ev); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -206,14 +199,14 @@ public class FoRoot extends FONode { throw new FOPException("No page-sequence found."); firstPageSeq = numChildren(); new FoPageSequence(getFOTree(), this, ev); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); while ((ev = xmlevents.expectStartElement (FObjectNames.PAGE_SEQUENCE, XMLEvent.DISCARD_W_SPACE)) != null) { // Loop over remaining fo:page-sequences new FoPageSequence(getFOTree(), this, ev); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } catch (NoSuchElementException e) { diff --git a/src/org/apache/fop/fo/PropNames.java b/src/org/apache/fop/fo/PropNames.java index 373bd485e..920984568 100644 --- a/src/org/apache/fop/fo/PropNames.java +++ b/src/org/apache/fop/fo/PropNames.java @@ -56,8 +56,8 @@ package org.apache.fop.fo; import java.util.HashMap; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.Ints; +import org.apache.fop.fo.expr.PropertyException; /** * A class of constants; an array of all property names and the constants diff --git a/src/org/apache/fop/fo/PropertyConsts.java b/src/org/apache/fop/fo/PropertyConsts.java index bf9a047cf..368b8cb19 100644 --- a/src/org/apache/fop/fo/PropertyConsts.java +++ b/src/org/apache/fop/fo/PropertyConsts.java @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ============================================================================ @@ -55,30 +55,16 @@ package org.apache.fop.fo; -import java.lang.Character; -import java.lang.reflect.Method; -import java.lang.reflect.InvocationTargetException; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.List; -import java.util.HashSet; -import java.util.LinkedList; import java.util.BitSet; +import java.util.HashMap; import java.util.StringTokenizer; -import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.FONode; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.Numeric; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.datastructs.ROIntArray; import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.datastructs.ROBitSet; +import org.apache.fop.datatypes.Ints; +import org.apache.fop.datatypes.Numeric; import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.properties.Property; /** * This class contains a number of arrays containing values indexed by the diff --git a/src/org/apache/fop/fo/PropertySets.java b/src/org/apache/fop/fo/PropertySets.java index c1c591b82..19b10da86 100644 --- a/src/org/apache/fop/fo/PropertySets.java +++ b/src/org/apache/fop/fo/PropertySets.java @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ============================================================================ @@ -57,7 +57,6 @@ package org.apache.fop.fo; import java.util.BitSet; -import org.apache.fop.fo.PropNames; import org.apache.fop.datastructs.ROBitSet; /** diff --git a/src/org/apache/fop/fo/ReferenceAreaFO.java b/src/org/apache/fop/fo/ReferenceAreaFO.java index 5030811d3..6fa0bef5f 100644 --- a/src/org/apache/fop/fo/ReferenceAreaFO.java +++ b/src/org/apache/fop/fo/ReferenceAreaFO.java @@ -54,7 +54,6 @@ */ package org.apache.fop.fo; -import org.apache.fop.fo.expr.PropertyException; /** * Base interface for all FOs which are generate reference areas. diff --git a/src/org/apache/fop/fo/ShorthandPropSets.java b/src/org/apache/fop/fo/ShorthandPropSets.java index bb1d00377..f357397ee 100644 --- a/src/org/apache/fop/fo/ShorthandPropSets.java +++ b/src/org/apache/fop/fo/ShorthandPropSets.java @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ============================================================================ @@ -55,26 +55,17 @@ package org.apache.fop.fo; -import java.lang.CloneNotSupportedException; - -import java.util.Set; import java.util.BitSet; -import java.util.HashSet; import java.util.HashMap; -import java.util.List; -import java.util.ListIterator; import java.util.Iterator; -import java.util.Arrays; -import java.util.Collections; +import java.util.ListIterator; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.datastructs.ROIntArray; import org.apache.fop.datastructs.ROBitSet; +import org.apache.fop.datastructs.ROIntArray; import org.apache.fop.datatypes.Ints; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; +import org.apache.fop.fo.expr.PropertyException; /** * This class contains ROIntArrays which encode the various sets of diff --git a/src/org/apache/fop/fo/declarations/FoColorProfile.java b/src/org/apache/fop/fo/declarations/FoColorProfile.java index c0ea117ab..00cec9246 100644 --- a/src/org/apache/fop/fo/declarations/FoColorProfile.java +++ b/src/org/apache/fop/fo/declarations/FoColorProfile.java @@ -55,20 +55,15 @@ package org.apache.fop.fo.declarations; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:simple-page-master flow object diff --git a/src/org/apache/fop/fo/declarations/FoDeclarations.java b/src/org/apache/fop/fo/declarations/FoDeclarations.java index a0d6d31b4..c8f843a2c 100644 --- a/src/org/apache/fop/fo/declarations/FoDeclarations.java +++ b/src/org/apache/fop/fo/declarations/FoDeclarations.java @@ -55,20 +55,18 @@ package org.apache.fop.fo.declarations; import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; import java.util.NoSuchElementException; import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FOTree; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; +import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.xml.XMLEvent; import org.apache.fop.xml.SyncedFoXmlEventsBuffer; -import org.apache.fop.datastructs.TreeException; +import org.apache.fop.xml.XMLEvent; /** * FoLayoutMasterSet is the class which processes the @@ -126,7 +124,7 @@ public class FoDeclarations extends FONode { throw new FOPException ("No fo:color-profile in fo:declarations."); new FoColorProfile(foTree, this, ev); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); do { ev = xmlevents.expectStartElement @@ -134,7 +132,7 @@ public class FoDeclarations extends FONode { if (ev == null) break; // No instance of these elements found new FoColorProfile(foTree, this, ev); // Flush the master event - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } while (true); } catch (NoSuchElementException e) { diff --git a/src/org/apache/fop/fo/expr/PropertyParser.java b/src/org/apache/fop/fo/expr/PropertyParser.java index b94614bc7..0e43ba6f9 100644 --- a/src/org/apache/fop/fo/expr/PropertyParser.java +++ b/src/org/apache/fop/fo/expr/PropertyParser.java @@ -52,39 +52,35 @@ package org.apache.fop.fo.expr; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.properties.Property; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.FONode; -import org.apache.fop.fo.expr.SystemFontFunction; - -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.Numeric; -import org.apache.fop.datatypes.Literal; -import org.apache.fop.datatypes.NCName; -import org.apache.fop.datatypes.Percentage; +import org.apache.fop.datatypes.Angle; +import org.apache.fop.datatypes.Auto; +import org.apache.fop.datatypes.Bool; +import org.apache.fop.datatypes.ColorType; import org.apache.fop.datatypes.Ems; +import org.apache.fop.datatypes.Frequency; import org.apache.fop.datatypes.IntegerType; import org.apache.fop.datatypes.Length; -import org.apache.fop.datatypes.Time; -import org.apache.fop.datatypes.Frequency; -import org.apache.fop.datatypes.Angle; -import org.apache.fop.datatypes.Bool; -import org.apache.fop.datatypes.Auto; +import org.apache.fop.datatypes.Literal; +import org.apache.fop.datatypes.MimeType; +import org.apache.fop.datatypes.NCName; import org.apache.fop.datatypes.None; +import org.apache.fop.datatypes.Numeric; +import org.apache.fop.datatypes.Percentage; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; import org.apache.fop.datatypes.Slash; -import org.apache.fop.datatypes.ColorType; import org.apache.fop.datatypes.StringType; -import org.apache.fop.datatypes.MimeType; +import org.apache.fop.datatypes.Time; import org.apache.fop.datatypes.UriType; +import org.apache.fop.datatypes.indirect.FromNearestSpecified; +import org.apache.fop.datatypes.indirect.FromParent; import org.apache.fop.datatypes.indirect.Inherit; import org.apache.fop.datatypes.indirect.InheritedValue; -import org.apache.fop.datatypes.indirect.FromParent; -import org.apache.fop.datatypes.indirect.FromNearestSpecified; - -import java.util.HashMap; +import org.apache.fop.fo.FONode; +import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertyConsts; +import org.apache.fop.fo.properties.Property; /** * Class to parse XSL FO property expression. diff --git a/src/org/apache/fop/fo/expr/PropertyTokenizer.java b/src/org/apache/fop/fo/expr/PropertyTokenizer.java index cbc4fc637..5c2da1fad 100644 --- a/src/org/apache/fop/fo/expr/PropertyTokenizer.java +++ b/src/org/apache/fop/fo/expr/PropertyTokenizer.java @@ -52,9 +52,8 @@ package org.apache.fop.fo.expr; -import org.apache.fop.datatypes.Numeric; -import org.apache.fop.datatypes.Length; import org.apache.fop.datatypes.Frequency; +import org.apache.fop.datatypes.Length; import org.apache.fop.datatypes.Time; /** diff --git a/src/org/apache/fop/fo/expr/SystemFontFunction.java b/src/org/apache/fop/fo/expr/SystemFontFunction.java index 9f0a046a3..81eaf16e6 100644 --- a/src/org/apache/fop/fo/expr/SystemFontFunction.java +++ b/src/org/apache/fop/fo/expr/SystemFontFunction.java @@ -7,14 +7,10 @@ */ package org.apache.fop.fo.expr; -import org.apache.fop.fo.properties.Font; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.expr.FunctionNotImplementedException; import org.apache.fop.datastructs.ROIntArray; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.PropertyValueList; +import org.apache.fop.fo.ShorthandPropSets; /** * Implement the system font function. diff --git a/src/org/apache/fop/fo/flow/Dummy.java b/src/org/apache/fop/fo/flow/Dummy.java index 34a2cf102..62ce84b8e 100644 --- a/src/org/apache/fop/fo/flow/Dummy.java +++ b/src/org/apache/fop/fo/flow/Dummy.java @@ -1,5 +1,6 @@ package org.apache.fop.fo.flow; + import org.apache.fop.fo.flow.FoBasicLink; import org.apache.fop.fo.flow.FoBidiOverride; import org.apache.fop.fo.flow.FoBlockContainer; diff --git a/src/org/apache/fop/fo/flow/FoBasicLink.java b/src/org/apache/fop/fo/flow/FoBasicLink.java index de16ea9c1..8e8d10a09 100644 --- a/src/org/apache/fop/fo/flow/FoBasicLink.java +++ b/src/org/apache/fop/fo/flow/FoBasicLink.java @@ -55,24 +55,21 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; +import org.apache.fop.messaging.MessageHandler; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.messaging.MessageHandler; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:basic-link flow object. @@ -172,7 +169,7 @@ public class FoBasicLink extends FONode { FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); if (ev.getFoType() != FObjectNames.PCDATA) - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } catch(UnexpectedStartElementException e) { @@ -180,7 +177,7 @@ public class FoBasicLink extends FONode { MessageHandler.logln ("Ignoring unexpected Start Element: " + ev.getQName()); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoBidiOverride.java b/src/org/apache/fop/fo/flow/FoBidiOverride.java index ce2df3853..c59c51edb 100644 --- a/src/org/apache/fop/fo/flow/FoBidiOverride.java +++ b/src/org/apache/fop/fo/flow/FoBidiOverride.java @@ -55,24 +55,21 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FObjects; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; +import org.apache.fop.messaging.MessageHandler; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.messaging.MessageHandler; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:bidi-override flow object. @@ -158,7 +155,7 @@ public class FoBidiOverride extends FONode { FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); if (ev.getFoType() != FObjectNames.PCDATA) - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } catch(UnexpectedStartElementException e) { @@ -166,7 +163,7 @@ public class FoBidiOverride extends FONode { MessageHandler.logln ("Ignoring unexpected Start Element: " + ev.getQName()); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoBlock.java b/src/org/apache/fop/fo/flow/FoBlock.java index 5552825ff..9720f5d7f 100644 --- a/src/org/apache/fop/fo/flow/FoBlock.java +++ b/src/org/apache/fop/fo/flow/FoBlock.java @@ -55,24 +55,21 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FObjects; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; +import org.apache.fop.messaging.MessageHandler; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.messaging.MessageHandler; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:block flow object. @@ -184,7 +181,7 @@ public class FoBlock extends FONode { FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); if (ev.getFoType() != FObjectNames.PCDATA) { - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); } pool.surrenderEvent(ev); } @@ -193,7 +190,7 @@ public class FoBlock extends FONode { MessageHandler.logln ("Ignoring unexpected Start Element: " + ev.getQName()); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoBlockContainer.java b/src/org/apache/fop/fo/flow/FoBlockContainer.java index 3a05bc4ff..eb08bd99e 100644 --- a/src/org/apache/fop/fo/flow/FoBlockContainer.java +++ b/src/org/apache/fop/fo/flow/FoBlockContainer.java @@ -55,24 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FObjects; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.messaging.MessageHandler; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:block-container flow object. @@ -175,7 +171,7 @@ public class FoBlockContainer extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags); // Clear the blockage - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); // Get the rest of the %block;s do { @@ -187,7 +183,7 @@ public class FoBlockContainer extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoCharacter.java b/src/org/apache/fop/fo/flow/FoCharacter.java index 298ef7881..a90d2c53f 100644 --- a/src/org/apache/fop/fo/flow/FoCharacter.java +++ b/src/org/apache/fop/fo/flow/FoCharacter.java @@ -55,21 +55,17 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:character flow object. diff --git a/src/org/apache/fop/fo/flow/FoExternalGraphic.java b/src/org/apache/fop/fo/flow/FoExternalGraphic.java index b68c2ff9b..4a34f40f6 100644 --- a/src/org/apache/fop/fo/flow/FoExternalGraphic.java +++ b/src/org/apache/fop/fo/flow/FoExternalGraphic.java @@ -55,21 +55,17 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:external-graphic flow object. diff --git a/src/org/apache/fop/fo/flow/FoFloat.java b/src/org/apache/fop/fo/flow/FoFloat.java index 58a897386..fbe659c4c 100644 --- a/src/org/apache/fop/fo/flow/FoFloat.java +++ b/src/org/apache/fop/fo/flow/FoFloat.java @@ -55,23 +55,19 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:float flow object. @@ -152,7 +148,7 @@ public class FoFloat extends FONode { FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags | FONode.MC_FLOAT); // Clear the blockage - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); // Get the rest of the %block;s do { @@ -164,7 +160,7 @@ public class FoFloat extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags | FONode.MC_FLOAT); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoFlow.java b/src/org/apache/fop/fo/flow/FoFlow.java index 6a8bbcbb2..a87ab42f1 100644 --- a/src/org/apache/fop/fo/flow/FoFlow.java +++ b/src/org/apache/fop/fo/flow/FoFlow.java @@ -55,23 +55,19 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:simple-page-master flow object @@ -135,7 +131,7 @@ public class FoFlow extends FONode { FObjects.fobjects.makeFlowObject (foTree, this, ev, FONode.FLOW_SET); // Clear the blockage - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); // Get the rest of the %block;s do { @@ -146,7 +142,7 @@ public class FoFlow extends FONode { //("Generating subsequent block for flow."); FObjects.fobjects.makeFlowObject (foTree, this, ev, FONode.FLOW_SET); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoFootnote.java b/src/org/apache/fop/fo/flow/FoFootnote.java index 81822e91f..54c77c2d2 100644 --- a/src/org/apache/fop/fo/flow/FoFootnote.java +++ b/src/org/apache/fop/fo/flow/FoFootnote.java @@ -55,22 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; +import org.apache.fop.xml.XMLEvent; /** * Implements the fo:footnote flow object. @@ -156,7 +154,7 @@ public class FoFootnote extends FONode { throw new FOPException("No inline in footnote."); new FoInline (getFOTree(), this, ev, stateFlags | FONode.MC_FOOTNOTE); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); // Look for the footnote-body @@ -166,7 +164,7 @@ public class FoFootnote extends FONode { throw new FOPException("No footnote-body in footnote."); new FoFootnoteBody (getFOTree(), this, ev, stateFlags | FONode.MC_FOOTNOTE); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); /* diff --git a/src/org/apache/fop/fo/flow/FoFootnoteBody.java b/src/org/apache/fop/fo/flow/FoFootnoteBody.java index f11970fb6..8719e9b93 100644 --- a/src/org/apache/fop/fo/flow/FoFootnoteBody.java +++ b/src/org/apache/fop/fo/flow/FoFootnoteBody.java @@ -55,23 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:footnote-body flow object. @@ -148,7 +145,7 @@ public class FoFootnoteBody extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags); // Clear the blockage - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); // Get the rest of the %block;s do { @@ -160,7 +157,7 @@ public class FoFootnoteBody extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoInitialPropertySet.java b/src/org/apache/fop/fo/flow/FoInitialPropertySet.java index 25f15c6a6..f26c53f5b 100644 --- a/src/org/apache/fop/fo/flow/FoInitialPropertySet.java +++ b/src/org/apache/fop/fo/flow/FoInitialPropertySet.java @@ -55,21 +55,17 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:initial-property-set flow object. diff --git a/src/org/apache/fop/fo/flow/FoInline.java b/src/org/apache/fop/fo/flow/FoInline.java index d1662552c..b84c0110d 100644 --- a/src/org/apache/fop/fo/flow/FoInline.java +++ b/src/org/apache/fop/fo/flow/FoInline.java @@ -55,24 +55,21 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FObjects; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; +import org.apache.fop.messaging.MessageHandler; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.messaging.MessageHandler; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:inline flow object. @@ -173,7 +170,7 @@ public class FoInline extends FONode { FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); if (ev.getFoType() != FObjectNames.PCDATA) { - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); } pool.surrenderEvent(ev); } @@ -182,7 +179,7 @@ public class FoInline extends FONode { MessageHandler.logln ("Ignoring unexpected Start Element: " + ev.getQName()); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoInlineContainer.java b/src/org/apache/fop/fo/flow/FoInlineContainer.java index 042ccf8b9..d975b7522 100644 --- a/src/org/apache/fop/fo/flow/FoInlineContainer.java +++ b/src/org/apache/fop/fo/flow/FoInlineContainer.java @@ -55,23 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:inline-container flow object. @@ -170,7 +167,7 @@ public class FoInlineContainer extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags); // Clear the blockage - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); // Get the rest of the %block;s do { @@ -182,7 +179,7 @@ public class FoInlineContainer extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java b/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java index bac28ec6d..a207c37c2 100644 --- a/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java +++ b/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java @@ -55,21 +55,17 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:instream-foreign-object flow object. diff --git a/src/org/apache/fop/fo/flow/FoLeader.java b/src/org/apache/fop/fo/flow/FoLeader.java index 552f8096f..b44f0cb57 100644 --- a/src/org/apache/fop/fo/flow/FoLeader.java +++ b/src/org/apache/fop/fo/flow/FoLeader.java @@ -55,24 +55,21 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; +import org.apache.fop.messaging.MessageHandler; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.messaging.MessageHandler; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:leader flow object. @@ -176,7 +173,7 @@ public class FoLeader extends FONode { FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); if (ev.getFoType() != FObjectNames.PCDATA) { - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); } pool.surrenderEvent(ev); } @@ -185,7 +182,7 @@ public class FoLeader extends FONode { MessageHandler.logln ("Ignoring unexpected Start Element: " + ev.getQName()); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoListBlock.java b/src/org/apache/fop/fo/flow/FoListBlock.java index 685b309fe..c7400898b 100644 --- a/src/org/apache/fop/fo/flow/FoListBlock.java +++ b/src/org/apache/fop/fo/flow/FoListBlock.java @@ -55,22 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; +import org.apache.fop.xml.XMLEvent; /** * Implements the fo:list-block flow object. @@ -166,7 +164,7 @@ public class FoListBlock extends FONode { != null) { new FoMarker(getFOTree(), this, ev, stateFlags); numMarkers++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -177,7 +175,7 @@ public class FoListBlock extends FONode { != null) { new FoListItem(getFOTree(), this, ev, stateFlags); numItems++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } diff --git a/src/org/apache/fop/fo/flow/FoListItem.java b/src/org/apache/fop/fo/flow/FoListItem.java index 925ba4d7e..1ddc5ef37 100644 --- a/src/org/apache/fop/fo/flow/FoListItem.java +++ b/src/org/apache/fop/fo/flow/FoListItem.java @@ -55,22 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; +import org.apache.fop.xml.XMLEvent; /** * Implements the fo:list-item flow object. @@ -160,7 +158,7 @@ public class FoListItem extends FONode { != null) { new FoMarker(getFOTree(), this, ev, stateFlags); numMarkers++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -172,7 +170,7 @@ public class FoListItem extends FONode { throw new FOPException ("No list-item-label in list-item."); new FoListItemLabel(getFOTree(), this, ev, stateFlags); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); // Look for one list-item-body @@ -183,7 +181,7 @@ public class FoListItem extends FONode { throw new FOPException ("No list-item-body in list-item."); new FoListItemBody(getFOTree(), this, ev, stateFlags); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); /* diff --git a/src/org/apache/fop/fo/flow/FoListItemBody.java b/src/org/apache/fop/fo/flow/FoListItemBody.java index 474ad3fc3..669aa306d 100644 --- a/src/org/apache/fop/fo/flow/FoListItemBody.java +++ b/src/org/apache/fop/fo/flow/FoListItemBody.java @@ -55,24 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:list-item-body flow object. @@ -151,7 +147,7 @@ public class FoListItemBody extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags); // Clear the blockage - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); // Get the rest of the %block;s do { @@ -163,7 +159,7 @@ public class FoListItemBody extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoListItemLabel.java b/src/org/apache/fop/fo/flow/FoListItemLabel.java index 12585f601..25220118c 100644 --- a/src/org/apache/fop/fo/flow/FoListItemLabel.java +++ b/src/org/apache/fop/fo/flow/FoListItemLabel.java @@ -55,24 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:list-item-label flow object. @@ -151,7 +147,7 @@ public class FoListItemLabel extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags); // Clear the blockage - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); // Get the rest of the %block;s do { @@ -163,7 +159,7 @@ public class FoListItemLabel extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoMarker.java b/src/org/apache/fop/fo/flow/FoMarker.java index 7286d9dba..ef7f336b9 100644 --- a/src/org/apache/fop/fo/flow/FoMarker.java +++ b/src/org/apache/fop/fo/flow/FoMarker.java @@ -55,24 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; +import org.apache.fop.messaging.MessageHandler; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.messaging.MessageHandler; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:marker flow object. @@ -144,7 +140,7 @@ public class FoMarker extends FONode { FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); if (ev.getFoType() != FObjectNames.PCDATA) { - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); } pool.surrenderEvent(ev); } @@ -153,7 +149,7 @@ public class FoMarker extends FONode { MessageHandler.logln ("Ignoring unexpected Start Element: " + ev.getQName()); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoMultiCase.java b/src/org/apache/fop/fo/flow/FoMultiCase.java index 9528ead0b..181c3281c 100644 --- a/src/org/apache/fop/fo/flow/FoMultiCase.java +++ b/src/org/apache/fop/fo/flow/FoMultiCase.java @@ -55,24 +55,21 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; +import org.apache.fop.messaging.MessageHandler; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.messaging.MessageHandler; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:multi-case flow object. @@ -156,7 +153,7 @@ public class FoMultiCase extends FONode { FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); if (ev.getFoType() != FObjectNames.PCDATA) { - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); } pool.surrenderEvent(ev); } @@ -165,7 +162,7 @@ public class FoMultiCase extends FONode { MessageHandler.logln ("Ignoring unexpected Start Element: " + ev.getQName()); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoMultiProperties.java b/src/org/apache/fop/fo/flow/FoMultiProperties.java index 68a001366..e388f895c 100644 --- a/src/org/apache/fop/fo/flow/FoMultiProperties.java +++ b/src/org/apache/fop/fo/flow/FoMultiProperties.java @@ -55,22 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; +import org.apache.fop.xml.XMLEvent; /** * Implements the fo:multi-properties flow object. @@ -147,7 +145,7 @@ public class FoMultiProperties extends FONode { != null) { new FoMultiPropertySet(getFOTree(), this, ev, stateFlags); numSets++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -162,7 +160,7 @@ public class FoMultiProperties extends FONode { throw new FOPException ("No wrapper in multi-properties."); new FoWrapper(getFOTree(), this, ev, stateFlags); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); /* diff --git a/src/org/apache/fop/fo/flow/FoMultiPropertySet.java b/src/org/apache/fop/fo/flow/FoMultiPropertySet.java index f66c372a4..167158489 100644 --- a/src/org/apache/fop/fo/flow/FoMultiPropertySet.java +++ b/src/org/apache/fop/fo/flow/FoMultiPropertySet.java @@ -55,21 +55,16 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:multi-property-set flow object. diff --git a/src/org/apache/fop/fo/flow/FoMultiSwitch.java b/src/org/apache/fop/fo/flow/FoMultiSwitch.java index d86a67ff0..27e88443a 100644 --- a/src/org/apache/fop/fo/flow/FoMultiSwitch.java +++ b/src/org/apache/fop/fo/flow/FoMultiSwitch.java @@ -55,22 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; +import org.apache.fop.xml.XMLEvent; /** * Implements the fo:multi-switch flow object. @@ -147,7 +145,7 @@ public class FoMultiSwitch extends FONode { != null) { new FoMultiCase(getFOTree(), this, ev, stateFlags); numCases++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } diff --git a/src/org/apache/fop/fo/flow/FoMultiToggle.java b/src/org/apache/fop/fo/flow/FoMultiToggle.java index ed1d83b26..6e94feba5 100644 --- a/src/org/apache/fop/fo/flow/FoMultiToggle.java +++ b/src/org/apache/fop/fo/flow/FoMultiToggle.java @@ -55,24 +55,21 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; +import org.apache.fop.messaging.MessageHandler; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.messaging.MessageHandler; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:multi-toggle flow object. @@ -153,7 +150,7 @@ public class FoMultiToggle extends FONode { FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); if (ev.getFoType() != FObjectNames.PCDATA) { - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); } pool.surrenderEvent(ev); } @@ -162,7 +159,7 @@ public class FoMultiToggle extends FONode { MessageHandler.logln ("Ignoring unexpected Start Element: " + ev.getQName()); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoNoFo.java b/src/org/apache/fop/fo/flow/FoNoFo.java index a3cfe43c2..3cd0f3058 100644 --- a/src/org/apache/fop/fo/flow/FoNoFo.java +++ b/src/org/apache/fop/fo/flow/FoNoFo.java @@ -55,21 +55,10 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import org.apache.fop.apps.FOPException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:no-fo flow object. diff --git a/src/org/apache/fop/fo/flow/FoPageNumber.java b/src/org/apache/fop/fo/flow/FoPageNumber.java index 30e72be98..d07021da1 100644 --- a/src/org/apache/fop/fo/flow/FoPageNumber.java +++ b/src/org/apache/fop/fo/flow/FoPageNumber.java @@ -55,21 +55,17 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:page-number flow object. diff --git a/src/org/apache/fop/fo/flow/FoPageNumberCitation.java b/src/org/apache/fop/fo/flow/FoPageNumberCitation.java index 52a850ca1..57538d4e9 100644 --- a/src/org/apache/fop/fo/flow/FoPageNumberCitation.java +++ b/src/org/apache/fop/fo/flow/FoPageNumberCitation.java @@ -55,21 +55,17 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:page-number-citation flow object. diff --git a/src/org/apache/fop/fo/flow/FoPageSequence.java b/src/org/apache/fop/fo/flow/FoPageSequence.java index 431deb09e..4e77153d7 100644 --- a/src/org/apache/fop/fo/flow/FoPageSequence.java +++ b/src/org/apache/fop/fo/flow/FoPageSequence.java @@ -55,23 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; +import java.util.NoSuchElementException; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; -import java.util.NoSuchElementException; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; +import org.apache.fop.xml.XMLEvent; /** * Implements the fo:simple-page-master flow object @@ -155,7 +152,7 @@ public class FoPageSequence extends FONode { // process the title title = numChildren(); new FoTitle(getFOTree(), this, ev); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } // else ignore @@ -168,7 +165,7 @@ public class FoPageSequence extends FONode { if (firstStaticContent != -1) firstStaticContent = numChildren(); new FoStaticContent(getFOTree(), this, ev); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -181,14 +178,14 @@ public class FoPageSequence extends FONode { throw new FOPException("No flow found."); firstFlow = numChildren(); new FoFlow(getFOTree(), this, ev); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); while ((ev = xmlevents.expectStartElement (FObjectNames.FLOW, XMLEvent.DISCARD_W_SPACE)) != null) { // Loop over remaining fo:page-sequences new FoFlow(getFOTree(), this, ev); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } catch (NoSuchElementException e) { diff --git a/src/org/apache/fop/fo/flow/FoPcdata.java b/src/org/apache/fop/fo/flow/FoPcdata.java index bdafa5a7e..31fd0aeef 100644 --- a/src/org/apache/fop/fo/flow/FoPcdata.java +++ b/src/org/apache/fop/fo/flow/FoPcdata.java @@ -55,21 +55,17 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements #PcdATA within page-sequence flow objects. diff --git a/src/org/apache/fop/fo/flow/FoRetrieveMarker.java b/src/org/apache/fop/fo/flow/FoRetrieveMarker.java index 7552afce0..52deff1cd 100644 --- a/src/org/apache/fop/fo/flow/FoRetrieveMarker.java +++ b/src/org/apache/fop/fo/flow/FoRetrieveMarker.java @@ -55,21 +55,16 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:retrieve-marker flow object. diff --git a/src/org/apache/fop/fo/flow/FoStaticContent.java b/src/org/apache/fop/fo/flow/FoStaticContent.java index 52940cb49..01e3cfb0d 100644 --- a/src/org/apache/fop/fo/flow/FoStaticContent.java +++ b/src/org/apache/fop/fo/flow/FoStaticContent.java @@ -55,23 +55,19 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:simple-page-master flow object @@ -137,7 +133,7 @@ public class FoStaticContent extends FONode { FObjects.fobjects.makeFlowObject (foTree, this, ev, FONode.STATIC_SET); // Clear the blockage - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); // Get the rest of the %block;s while ((ev = xmlevents.expectBlock()) != null) { @@ -146,7 +142,7 @@ public class FoStaticContent extends FONode { //("Generating subsequent block for static-content."); FObjects.fobjects.makeFlowObject (foTree, this, ev, FONode.STATIC_SET); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } catch(UnexpectedStartElementException e) { diff --git a/src/org/apache/fop/fo/flow/FoTable.java b/src/org/apache/fop/fo/flow/FoTable.java index 995d5644e..c5fdc4b91 100644 --- a/src/org/apache/fop/fo/flow/FoTable.java +++ b/src/org/apache/fop/fo/flow/FoTable.java @@ -55,22 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; +import org.apache.fop.xml.XMLEvent; /** * Implements the fo:table flow object. @@ -188,7 +186,7 @@ public class FoTable extends FONode { != null) { new FoMarker(getFOTree(), this, ev, stateFlags); numMarkers++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -199,7 +197,7 @@ public class FoTable extends FONode { != null) { new FoTableColumn(getFOTree(), this, ev, stateFlags); numColumns++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -210,7 +208,7 @@ public class FoTable extends FONode { != null) { headerOffset = numChildren(); new FoTableHeader(getFOTree(), this, ev, stateFlags); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -221,7 +219,7 @@ public class FoTable extends FONode { != null) { footerOffset = numChildren(); new FoTableFooter(getFOTree(), this, ev, stateFlags); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -235,7 +233,7 @@ public class FoTable extends FONode { firstBodyOffset = numChildren(); new FoTableBody(getFOTree(), this, ev, stateFlags); numBodies++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); while ((ev = xmlevents.expectStartElement (FObjectNames.TABLE_BODY, XMLEvent.DISCARD_W_SPACE)) @@ -243,7 +241,7 @@ public class FoTable extends FONode { // Loop over remaining fo:table-body's new FoTableBody(getFOTree(), this, ev, stateFlags); numBodies++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } diff --git a/src/org/apache/fop/fo/flow/FoTableAndCaption.java b/src/org/apache/fop/fo/flow/FoTableAndCaption.java index 83222f248..aa463cbf1 100644 --- a/src/org/apache/fop/fo/flow/FoTableAndCaption.java +++ b/src/org/apache/fop/fo/flow/FoTableAndCaption.java @@ -55,22 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; +import org.apache.fop.xml.XMLEvent; /** * Implements the fo:table-and-caption flow object. @@ -168,7 +166,7 @@ public class FoTableAndCaption extends FONode { != null) { new FoMarker(getFOTree(), this, ev, stateFlags); numMarkers++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -179,7 +177,7 @@ public class FoTableAndCaption extends FONode { != null) { new FoTableCaption(getFOTree(), this, ev, stateFlags); captionOffset = numMarkers; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -191,7 +189,7 @@ public class FoTableAndCaption extends FONode { throw new FOPException("No table found."); tableOffset = numChildren(); new FoTable(getFOTree(), this, ev, stateFlags); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); /* diff --git a/src/org/apache/fop/fo/flow/FoTableBody.java b/src/org/apache/fop/fo/flow/FoTableBody.java index cfdf58a10..274ba8da3 100644 --- a/src/org/apache/fop/fo/flow/FoTableBody.java +++ b/src/org/apache/fop/fo/flow/FoTableBody.java @@ -55,22 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; +import org.apache.fop.xml.XMLEvent; /** * Implements the fo:table-body flow object. @@ -169,7 +167,7 @@ public class FoTableBody extends FONode { != null) { new FoMarker(getFOTree(), this, ev, stateFlags); numMarkers++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -180,7 +178,7 @@ public class FoTableBody extends FONode { != null) { new FoTableRow(getFOTree(), this, ev, stateFlags); numRows++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -194,7 +192,7 @@ public class FoTableBody extends FONode { != null) { new FoTableCell(getFOTree(), this, ev, stateFlags); numCells++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } if (numCells == 0) diff --git a/src/org/apache/fop/fo/flow/FoTableCaption.java b/src/org/apache/fop/fo/flow/FoTableCaption.java index 958aaff3b..606b9aeb8 100644 --- a/src/org/apache/fop/fo/flow/FoTableCaption.java +++ b/src/org/apache/fop/fo/flow/FoTableCaption.java @@ -55,23 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:table-caption flow object. @@ -160,7 +157,7 @@ public class FoTableCaption extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags); // Clear the blockage - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); // Get the rest of the %block;s do { @@ -172,7 +169,7 @@ public class FoTableCaption extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoTableCell.java b/src/org/apache/fop/fo/flow/FoTableCell.java index a0b4b6a7a..1224115e7 100644 --- a/src/org/apache/fop/fo/flow/FoTableCell.java +++ b/src/org/apache/fop/fo/flow/FoTableCell.java @@ -55,23 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:table-cell flow object. @@ -169,7 +166,7 @@ public class FoTableCell extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject(foTree, this, ev, stateFlags); // Clear the blockage - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); // Get the rest of the %block;s do { @@ -181,7 +178,7 @@ public class FoTableCell extends FONode { // Generate the flow object FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoTableColumn.java b/src/org/apache/fop/fo/flow/FoTableColumn.java index 0144a043d..d555acd3a 100644 --- a/src/org/apache/fop/fo/flow/FoTableColumn.java +++ b/src/org/apache/fop/fo/flow/FoTableColumn.java @@ -55,21 +55,17 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:table-column flow object. diff --git a/src/org/apache/fop/fo/flow/FoTableFooter.java b/src/org/apache/fop/fo/flow/FoTableFooter.java index f5a197953..3eb8b21e6 100644 --- a/src/org/apache/fop/fo/flow/FoTableFooter.java +++ b/src/org/apache/fop/fo/flow/FoTableFooter.java @@ -55,22 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; +import org.apache.fop.xml.XMLEvent; /** * Implements the fo:table-footer flow object. @@ -169,7 +167,7 @@ public class FoTableFooter extends FONode { != null) { new FoMarker(getFOTree(), this, ev, stateFlags); numMarkers++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -180,7 +178,7 @@ public class FoTableFooter extends FONode { != null) { new FoTableRow(getFOTree(), this, ev, stateFlags); numRows++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -194,7 +192,7 @@ public class FoTableFooter extends FONode { != null) { new FoTableCell(getFOTree(), this, ev, stateFlags); numCells++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } if (numCells == 0) diff --git a/src/org/apache/fop/fo/flow/FoTableHeader.java b/src/org/apache/fop/fo/flow/FoTableHeader.java index 171fb63f5..e94bef759 100644 --- a/src/org/apache/fop/fo/flow/FoTableHeader.java +++ b/src/org/apache/fop/fo/flow/FoTableHeader.java @@ -55,22 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; +import org.apache.fop.xml.XMLEvent; /** * Implements the fo:table-header flow object. @@ -169,7 +167,7 @@ public class FoTableHeader extends FONode { != null) { new FoMarker(getFOTree(), this, ev, stateFlags); numMarkers++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -180,7 +178,7 @@ public class FoTableHeader extends FONode { != null) { new FoTableRow(getFOTree(), this, ev, stateFlags); numRows++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } @@ -194,7 +192,7 @@ public class FoTableHeader extends FONode { != null) { new FoTableCell(getFOTree(), this, ev, stateFlags); numCells++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } if (numCells == 0) diff --git a/src/org/apache/fop/fo/flow/FoTableRow.java b/src/org/apache/fop/fo/flow/FoTableRow.java index 5e6a88df5..016ac0d82 100644 --- a/src/org/apache/fop/fo/flow/FoTableRow.java +++ b/src/org/apache/fop/fo/flow/FoTableRow.java @@ -55,22 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; +import org.apache.fop.xml.XMLEvent; /** * Implements the fo:table-row flow object. @@ -166,7 +164,7 @@ public class FoTableRow extends FONode { != null) { new FoTableCell(getFOTree(), this, ev, stateFlags); numCells++; - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } if (numCells == 0) diff --git a/src/org/apache/fop/fo/flow/FoTitle.java b/src/org/apache/fop/fo/flow/FoTitle.java index ef744901e..9ac5841ad 100644 --- a/src/org/apache/fop/fo/flow/FoTitle.java +++ b/src/org/apache/fop/fo/flow/FoTitle.java @@ -55,26 +55,21 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.xml.XMLEvent; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; +import org.apache.fop.messaging.MessageHandler; import org.apache.fop.xml.FoXMLEvent; import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.messaging.MessageHandler; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:simple-page-master flow object @@ -155,7 +150,7 @@ public class FoTitle extends FONode { FObjects.fobjects.makeFlowObject (foTree, this, ev, FONode.TITLE_SET); if (ev.getFoType() != FObjectNames.PCDATA) - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } catch(UnexpectedStartElementException e) { @@ -163,7 +158,7 @@ public class FoTitle extends FONode { MessageHandler.logln ("Ignoring unexpected Start Element: " + ev.getQName()); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/flow/FoWrapper.java b/src/org/apache/fop/fo/flow/FoWrapper.java index 8cb592aff..3f666eabc 100644 --- a/src/org/apache/fop/fo/flow/FoWrapper.java +++ b/src/org/apache/fop/fo/flow/FoWrapper.java @@ -55,24 +55,20 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FObjects; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.FObjects; +import org.apache.fop.fo.PropNames; +import org.apache.fop.messaging.MessageHandler; import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; import org.apache.fop.xml.UnexpectedStartElementException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.messaging.MessageHandler; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:wrapper flow object. @@ -141,7 +137,7 @@ public class FoWrapper extends FONode { FObjects.fobjects.makeFlowObject (foTree, this, ev, stateFlags); if (ev.getFoType() != FObjectNames.PCDATA) - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } catch(UnexpectedStartElementException e) { @@ -149,7 +145,7 @@ public class FoWrapper extends FONode { MessageHandler.logln ("Ignoring unexpected Start Element: " + ev.getQName()); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } } while (ev != null); diff --git a/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java b/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java index f844acf8f..0413b9753 100644 --- a/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java +++ b/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java @@ -54,27 +54,22 @@ */ package org.apache.fop.fo.pagination; -import java.util.Collection; import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; -import java.util.LinkedList; import java.util.Iterator; import java.util.NoSuchElementException; import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FOTree; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; +import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.xml.XMLEvent; -import org.apache.fop.xml.UriLocalName; -import org.apache.fop.xml.XMLNamespaces; import org.apache.fop.xml.SyncedFoXmlEventsBuffer; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.fo.pagination.FoPageSequenceMaster; -import org.apache.fop.fo.pagination.PageSequenceMaster; +import org.apache.fop.xml.XMLEvent; /** * FoLayoutMasterSet is the class which processes the @@ -220,7 +215,7 @@ public class FoLayoutMasterSet extends FONode { throw new FOPException ("Aargh! expectStartElement(events, list)"); // Flush the master event - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } while (true); } catch (NoSuchElementException e) { diff --git a/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java b/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java index a441df681..63c6a6e01 100644 --- a/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java +++ b/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java @@ -55,27 +55,21 @@ package org.apache.fop.fo.pagination; import java.util.Arrays; -import java.util.HashMap; import java.util.BitSet; import java.util.NoSuchElementException; -// FOP -import org.apache.fop.fo.FOAttributes; -import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.xml.XMLEvent; -import org.apache.fop.xml.XMLNamespaces; -import org.apache.fop.xml.UriLocalName; import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.FONode; import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.NCName; -import org.apache.fop.datatypes.Ints; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.FONode; +import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; +import org.apache.fop.xml.XMLEvent; /** * Implements the fo:page-sequence-master flow object. These Fos are @@ -258,7 +252,7 @@ public class FoPageSequenceMaster extends FONode { } else throw new FOPException ("Aargh! expectStartElement(events, list)"); - ev = xmlevents.getEndElement(xmlevents.DISCARD_EV, ev); + ev = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, ev); pool.surrenderEvent(ev); } while (true); } catch (NoSuchElementException e) { @@ -349,7 +343,7 @@ public class FoPageSequenceMaster extends FONode { // ("Found conditional-page-master-reference"); new FoConditionalPageMasterReference(foTree, this, ev); ev = this.xmlevents.getEndElement - (this.xmlevents.DISCARD_EV, ev); + (SyncedFoXmlEventsBuffer.DISCARD_EV, ev); this.pool.surrenderEvent(ev); } while (true); } catch (NoSuchElementException e) { diff --git a/src/org/apache/fop/fo/pagination/FoRegionAfter.java b/src/org/apache/fop/fo/pagination/FoRegionAfter.java index 2583729ef..9887fef0b 100644 --- a/src/org/apache/fop/fo/pagination/FoRegionAfter.java +++ b/src/org/apache/fop/fo/pagination/FoRegionAfter.java @@ -55,13 +55,12 @@ package org.apache.fop.fo.pagination; // FOP -import org.apache.fop.fo.FObjectNames; +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; /** * Implements the fo:simple-page-master flow object diff --git a/src/org/apache/fop/fo/pagination/FoRegionBefore.java b/src/org/apache/fop/fo/pagination/FoRegionBefore.java index c748d1354..316efa92a 100644 --- a/src/org/apache/fop/fo/pagination/FoRegionBefore.java +++ b/src/org/apache/fop/fo/pagination/FoRegionBefore.java @@ -55,13 +55,12 @@ package org.apache.fop.fo.pagination; // FOP -import org.apache.fop.fo.FObjectNames; +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; /** * Implements the fo:simple-page-master flow object diff --git a/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java b/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java index 1190d4c61..c9e40fd44 100644 --- a/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java +++ b/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java @@ -55,21 +55,16 @@ package org.apache.fop.fo.pagination; // FOP -import org.apache.fop.fo.FOAttributes; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:simple-page-master flow object diff --git a/src/org/apache/fop/fo/pagination/FoRegionBody.java b/src/org/apache/fop/fo/pagination/FoRegionBody.java index 8941413d9..93c2e37b0 100644 --- a/src/org/apache/fop/fo/pagination/FoRegionBody.java +++ b/src/org/apache/fop/fo/pagination/FoRegionBody.java @@ -55,21 +55,17 @@ package org.apache.fop.fo.pagination; // FOP -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:simple-page-master flow object diff --git a/src/org/apache/fop/fo/pagination/FoRegionEnd.java b/src/org/apache/fop/fo/pagination/FoRegionEnd.java index e3664ff83..6364c78b4 100644 --- a/src/org/apache/fop/fo/pagination/FoRegionEnd.java +++ b/src/org/apache/fop/fo/pagination/FoRegionEnd.java @@ -55,13 +55,12 @@ package org.apache.fop.fo.pagination; // FOP -import org.apache.fop.fo.FObjectNames; +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; /** diff --git a/src/org/apache/fop/fo/pagination/FoRegionStart.java b/src/org/apache/fop/fo/pagination/FoRegionStart.java index 91caa15cf..0ba7a75a0 100644 --- a/src/org/apache/fop/fo/pagination/FoRegionStart.java +++ b/src/org/apache/fop/fo/pagination/FoRegionStart.java @@ -55,13 +55,12 @@ package org.apache.fop.fo.pagination; // FOP -import org.apache.fop.fo.FObjectNames; +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.FObjectNames; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; /** * Implements the fo:simple-page-master flow object diff --git a/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java b/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java index 543fba519..90d651fd0 100644 --- a/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java +++ b/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java @@ -55,21 +55,16 @@ package org.apache.fop.fo.pagination; // FOP -import org.apache.fop.fo.FOAttributes; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import java.util.Arrays; +import java.util.BitSet; + +import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.TreeException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.apps.FOPException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; /** * Implements the fo:simple-page-master flow object diff --git a/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java b/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java index 792689051..b7b5ffb15 100644 --- a/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java +++ b/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java @@ -55,24 +55,21 @@ package org.apache.fop.fo.pagination; // FOP -import org.apache.fop.fo.FOAttributes; -import org.apache.fop.fo.PropNames; -import org.apache.fop.xml.XMLEvent; -import org.apache.fop.xml.FoXMLEvent; +import java.util.Arrays; +import java.util.BitSet; + import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.PropertySets; -import org.apache.fop.fo.FObjectNames; +import org.apache.fop.datastructs.TreeException; +import org.apache.fop.datatypes.NCName; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FOTree; +import org.apache.fop.fo.FObjectNames; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertySets; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.TreeException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.NCName; -import org.apache.fop.datatypes.Ints; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.BitSet; +import org.apache.fop.xml.FoXMLEvent; +import org.apache.fop.xml.SyncedFoXmlEventsBuffer; +import org.apache.fop.xml.XMLEvent; /** * Implements the fo:simple-page-master flow object @@ -149,7 +146,7 @@ public class FoSimplePageMaster extends FONode { + getMasterName()); // Process region-body regionBody = new FoRegionBody(foTree, this, regionEv); - regionEv = xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv); + regionEv = xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv); pool.surrenderEvent(regionEv); // Remaining regions are optional @@ -159,7 +156,7 @@ public class FoSimplePageMaster extends FONode { { regionBefore = new FoRegionBefore(foTree, this, regionEv); regionEv = - xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv); + xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv); pool.surrenderEvent(regionEv); } @@ -169,7 +166,7 @@ public class FoSimplePageMaster extends FONode { { regionAfter = new FoRegionAfter(foTree, this, regionEv); regionEv = - xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv); + xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv); pool.surrenderEvent(regionEv); } @@ -179,7 +176,7 @@ public class FoSimplePageMaster extends FONode { { regionStart = new FoRegionStart(foTree, this, regionEv); regionEv = - xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv); + xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv); pool.surrenderEvent(regionEv); } @@ -189,7 +186,7 @@ public class FoSimplePageMaster extends FONode { { regionEnd = new FoRegionEnd(foTree, this, regionEv); regionEv = - xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv); + xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv); pool.surrenderEvent(regionEv); } diff --git a/src/org/apache/fop/fo/pagination/PageSequenceMaster.java b/src/org/apache/fop/fo/pagination/PageSequenceMaster.java index 83c42b527..05720c6bb 100644 --- a/src/org/apache/fop/fo/pagination/PageSequenceMaster.java +++ b/src/org/apache/fop/fo/pagination/PageSequenceMaster.java @@ -55,33 +55,23 @@ package org.apache.fop.fo.pagination; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; -import java.util.Set; -import java.util.Iterator; -// FOP -import org.apache.fop.fo.properties.Property; -import org.apache.fop.fo.properties.*; +import org.apache.fop.apps.FOPException; +import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.IntegerType; +import org.apache.fop.datatypes.NCName; +import org.apache.fop.datatypes.Numeric; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.PropNames; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.NCName; -import org.apache.fop.datatypes.Numeric; -import org.apache.fop.datatypes.EnumType; -import org.apache.fop.datatypes.IntegerType; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.pagination.FoPageSequenceMaster; -import org.apache.fop.fo.pagination.FoPageSequenceMaster - .FoSinglePageMasterReference; -import org.apache.fop.fo.pagination.FoPageSequenceMaster - .FoRepeatablePageMasterReference; -import org.apache.fop.fo.pagination.FoPageSequenceMaster - .FoRepeatablePageMasterAlternatives; -import org.apache.fop.fo.pagination.FoPageSequenceMaster - .FoRepeatablePageMasterAlternatives.FoConditionalPageMasterReference; +import org.apache.fop.fo.pagination.FoPageSequenceMaster.FoRepeatablePageMasterAlternatives.FoConditionalPageMasterReference; +import org.apache.fop.fo.properties.BlankOrNotBlank; +import org.apache.fop.fo.properties.MaximumRepeats; +import org.apache.fop.fo.properties.OddOrEven; +import org.apache.fop.fo.properties.PagePosition; /** * Encodes an fo:page-sequence-master and associated diff --git a/src/org/apache/fop/fo/properties/AbsolutePosition.java b/src/org/apache/fop/fo/properties/AbsolutePosition.java index bcf7112d1..ac16b458a 100644 --- a/src/org/apache/fop/fo/properties/AbsolutePosition.java +++ b/src/org/apache/fop/fo/properties/AbsolutePosition.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; -import org.apache.fop.datastructs.ROStringArray; public class AbsolutePosition extends Property { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/ActiveState.java b/src/org/apache/fop/fo/properties/ActiveState.java index 989fe4db7..2d33e4f56 100644 --- a/src/org/apache/fop/fo/properties/ActiveState.java +++ b/src/org/apache/fop/fo/properties/ActiveState.java @@ -51,14 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.datatypes.Ints; - import java.util.HashMap; -import java.util.Map; -import java.util.Collections; + +import org.apache.fop.datatypes.Ints; +import org.apache.fop.fo.expr.PropertyException; public class ActiveState extends Property { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/AlignmentAdjust.java b/src/org/apache/fop/fo/properties/AlignmentAdjust.java index eeededee4..11162dfb7 100644 --- a/src/org/apache/fop/fo/properties/AlignmentAdjust.java +++ b/src/org/apache/fop/fo/properties/AlignmentAdjust.java @@ -51,14 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.datatypes.Ints; - import java.util.HashMap; -import java.util.Map; -import java.util.Collections; + +import org.apache.fop.datatypes.Ints; +import org.apache.fop.fo.expr.PropertyException; public class AlignmentAdjust extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/AlignmentBaseline.java b/src/org/apache/fop/fo/properties/AlignmentBaseline.java index 2f8fb5116..07dec7f2f 100644 --- a/src/org/apache/fop/fo/properties/AlignmentBaseline.java +++ b/src/org/apache/fop/fo/properties/AlignmentBaseline.java @@ -51,14 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.datatypes.Ints; - import java.util.HashMap; -import java.util.Map; -import java.util.Collections; + +import org.apache.fop.datatypes.Ints; +import org.apache.fop.fo.expr.PropertyException; public class AlignmentBaseline extends Property { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/AutoRestore.java b/src/org/apache/fop/fo/properties/AutoRestore.java index d75018883..7c6a569b2 100644 --- a/src/org/apache/fop/fo/properties/AutoRestore.java +++ b/src/org/apache/fop/fo/properties/AutoRestore.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.datatypes.Bool; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Bool; public class AutoRestore extends Property { public static final int dataTypes = BOOL; diff --git a/src/org/apache/fop/fo/properties/Azimuth.java b/src/org/apache/fop/fo/properties/Azimuth.java index fdb1732f2..f041086bb 100644 --- a/src/org/apache/fop/fo/properties/Azimuth.java +++ b/src/org/apache/fop/fo/properties/Azimuth.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Azimuth extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/Background.java b/src/org/apache/fop/fo/properties/Background.java index fa7d3874f..e0f483189 100644 --- a/src/org/apache/fop/fo/properties/Background.java +++ b/src/org/apache/fop/fo/properties/Background.java @@ -51,24 +51,22 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.*; +import java.util.Iterator; +import java.util.ListIterator; + +import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.NCName; +import org.apache.fop.datatypes.Numeric; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; import org.apache.fop.fo.PropertyConsts; import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Length; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.EnumType; -import org.apache.fop.datatypes.ColorType; -import org.apache.fop.datatypes.NCName; -import org.apache.fop.datatypes.Numeric; import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.messaging.MessageHandler; -import java.util.ListIterator; -import java.util.Iterator; - public class Background extends Property { public static final int dataTypes = SHORTHAND | INHERIT; public static final int traitMapping = SHORTHAND_MAP; diff --git a/src/org/apache/fop/fo/properties/BackgroundAttachment.java b/src/org/apache/fop/fo/properties/BackgroundAttachment.java index af6f83c9a..44287d72a 100644 --- a/src/org/apache/fop/fo/properties/BackgroundAttachment.java +++ b/src/org/apache/fop/fo/properties/BackgroundAttachment.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; import org.apache.fop.datatypes.EnumType; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BackgroundAttachment extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BackgroundColor.java b/src/org/apache/fop/fo/properties/BackgroundColor.java index 96931e04b..5b935b331 100644 --- a/src/org/apache/fop/fo/properties/BackgroundColor.java +++ b/src/org/apache/fop/fo/properties/BackgroundColor.java @@ -51,10 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class BackgroundColor extends ColorTransparent { public static final int dataTypes = ENUM | COLOR_TRANS | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BackgroundImage.java b/src/org/apache/fop/fo/properties/BackgroundImage.java index 27b870029..db04b79d5 100644 --- a/src/org/apache/fop/fo/properties/BackgroundImage.java +++ b/src/org/apache/fop/fo/properties/BackgroundImage.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class BackgroundImage extends Property { public static final int dataTypes = URI_SPECIFICATION | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BackgroundPosition.java b/src/org/apache/fop/fo/properties/BackgroundPosition.java index c8a116134..ef7bc1b13 100644 --- a/src/org/apache/fop/fo/properties/BackgroundPosition.java +++ b/src/org/apache/fop/fo/properties/BackgroundPosition.java @@ -51,20 +51,19 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.Length; +import java.util.Iterator; + +import org.apache.fop.datastructs.ROStringArray; import org.apache.fop.datatypes.NCName; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.Percentage; import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; +import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertyConsts; import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.Property; -import java.util.Iterator; +import org.apache.fop.fo.expr.PropertyException; public class BackgroundPosition extends Property { public static final int dataTypes = SHORTHAND; diff --git a/src/org/apache/fop/fo/properties/BackgroundPositionHorizontal.java b/src/org/apache/fop/fo/properties/BackgroundPositionHorizontal.java index 329be9660..c1f627495 100644 --- a/src/org/apache/fop/fo/properties/BackgroundPositionHorizontal.java +++ b/src/org/apache/fop/fo/properties/BackgroundPositionHorizontal.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.Percentage; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BackgroundPositionHorizontal extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/BackgroundPositionVertical.java b/src/org/apache/fop/fo/properties/BackgroundPositionVertical.java index 2192d8502..cf02ae916 100644 --- a/src/org/apache/fop/fo/properties/BackgroundPositionVertical.java +++ b/src/org/apache/fop/fo/properties/BackgroundPositionVertical.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.Percentage; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BackgroundPositionVertical extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/BackgroundRepeat.java b/src/org/apache/fop/fo/properties/BackgroundRepeat.java index f7178f171..207091d2a 100644 --- a/src/org/apache/fop/fo/properties/BackgroundRepeat.java +++ b/src/org/apache/fop/fo/properties/BackgroundRepeat.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BackgroundRepeat extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BaselineShift.java b/src/org/apache/fop/fo/properties/BaselineShift.java index 85d35f466..ff9a4fcf6 100644 --- a/src/org/apache/fop/fo/properties/BaselineShift.java +++ b/src/org/apache/fop/fo/properties/BaselineShift.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BaselineShift extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/BlankOrNotBlank.java b/src/org/apache/fop/fo/properties/BlankOrNotBlank.java index a3e3dc50e..42f4959b9 100644 --- a/src/org/apache/fop/fo/properties/BlankOrNotBlank.java +++ b/src/org/apache/fop/fo/properties/BlankOrNotBlank.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BlankOrNotBlank extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BlockProgressionDimension.java b/src/org/apache/fop/fo/properties/BlockProgressionDimension.java index 75434d947..9d5574ef4 100644 --- a/src/org/apache/fop/fo/properties/BlockProgressionDimension.java +++ b/src/org/apache/fop/fo/properties/BlockProgressionDimension.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class BlockProgressionDimension extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/BlockProgressionDimensionMaximum.java b/src/org/apache/fop/fo/properties/BlockProgressionDimensionMaximum.java index 66ea5f53f..a18f30602 100644 --- a/src/org/apache/fop/fo/properties/BlockProgressionDimensionMaximum.java +++ b/src/org/apache/fop/fo/properties/BlockProgressionDimensionMaximum.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class BlockProgressionDimensionMaximum extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | AUTO; diff --git a/src/org/apache/fop/fo/properties/BlockProgressionDimensionMinimum.java b/src/org/apache/fop/fo/properties/BlockProgressionDimensionMinimum.java index 25175922c..18022a8cc 100644 --- a/src/org/apache/fop/fo/properties/BlockProgressionDimensionMinimum.java +++ b/src/org/apache/fop/fo/properties/BlockProgressionDimensionMinimum.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class BlockProgressionDimensionMinimum extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | AUTO; diff --git a/src/org/apache/fop/fo/properties/BlockProgressionDimensionOptimum.java b/src/org/apache/fop/fo/properties/BlockProgressionDimensionOptimum.java index 1b5af5cf1..feeeeb64d 100644 --- a/src/org/apache/fop/fo/properties/BlockProgressionDimensionOptimum.java +++ b/src/org/apache/fop/fo/properties/BlockProgressionDimensionOptimum.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class BlockProgressionDimensionOptimum extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | AUTO; diff --git a/src/org/apache/fop/fo/properties/Border.java b/src/org/apache/fop/fo/properties/Border.java index e822a348d..1c68ec8ec 100644 --- a/src/org/apache/fop/fo/properties/Border.java +++ b/src/org/apache/fop/fo/properties/Border.java @@ -51,22 +51,17 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.fo.expr.PropertyException; +import java.util.Iterator; + import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.PropertyValueList; +import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.messaging.MessageHandler; -import java.util.Iterator; -import java.util.HashMap; -import java.util.Map; - public class Border extends Property { public static final int dataTypes = SHORTHAND; public static final int traitMapping = SHORTHAND_MAP; diff --git a/src/org/apache/fop/fo/properties/BorderAfterColor.java b/src/org/apache/fop/fo/properties/BorderAfterColor.java index 0ae4a0fee..abd437b88 100644 --- a/src/org/apache/fop/fo/properties/BorderAfterColor.java +++ b/src/org/apache/fop/fo/properties/BorderAfterColor.java @@ -51,10 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class BorderAfterColor extends ColorTransparent { public static final int dataTypes = ENUM | COLOR_T | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderAfterPrecedence.java b/src/org/apache/fop/fo/properties/BorderAfterPrecedence.java index c66225226..2cb012387 100644 --- a/src/org/apache/fop/fo/properties/BorderAfterPrecedence.java +++ b/src/org/apache/fop/fo/properties/BorderAfterPrecedence.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.PrecedenceCommon; public class BorderAfterPrecedence extends PrecedenceCommon { public static final int dataTypes = INTEGER | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderAfterStyle.java b/src/org/apache/fop/fo/properties/BorderAfterStyle.java index 20cc4e6e3..cdd02e6e0 100644 --- a/src/org/apache/fop/fo/properties/BorderAfterStyle.java +++ b/src/org/apache/fop/fo/properties/BorderAfterStyle.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.BorderCommonStyle; public class BorderAfterStyle extends BorderCommonStyle { public static final int dataTypes = ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderAfterWidth.java b/src/org/apache/fop/fo/properties/BorderAfterWidth.java index 9ca6855ea..a5d914de2 100644 --- a/src/org/apache/fop/fo/properties/BorderAfterWidth.java +++ b/src/org/apache/fop/fo/properties/BorderAfterWidth.java @@ -52,12 +52,10 @@ package org.apache.fop.fo.properties; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.datatypes.Length; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.PropNames; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.BorderCommonWidth; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class BorderAfterWidth extends BorderCommonWidth { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/BorderAfterWidthConditionality.java b/src/org/apache/fop/fo/properties/BorderAfterWidthConditionality.java index 3f58a333e..1e55e9a62 100644 --- a/src/org/apache/fop/fo/properties/BorderAfterWidthConditionality.java +++ b/src/org/apache/fop/fo/properties/BorderAfterWidthConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BorderAfterWidthConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/BorderAfterWidthLength.java b/src/org/apache/fop/fo/properties/BorderAfterWidthLength.java index 5a7e04a84..f33a9970d 100644 --- a/src/org/apache/fop/fo/properties/BorderAfterWidthLength.java +++ b/src/org/apache/fop/fo/properties/BorderAfterWidthLength.java @@ -51,10 +51,9 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.BorderCommonWidth; +import org.apache.fop.fo.expr.PropertyException; public class BorderAfterWidthLength extends BorderCommonWidth { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/BorderBeforeColor.java b/src/org/apache/fop/fo/properties/BorderBeforeColor.java index e673c9aca..6fa55c08d 100644 --- a/src/org/apache/fop/fo/properties/BorderBeforeColor.java +++ b/src/org/apache/fop/fo/properties/BorderBeforeColor.java @@ -51,10 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class BorderBeforeColor extends ColorTransparent { public static final int dataTypes = ENUM | COLOR_T | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderBeforePrecedence.java b/src/org/apache/fop/fo/properties/BorderBeforePrecedence.java index 6bd7557fe..071b0bf56 100644 --- a/src/org/apache/fop/fo/properties/BorderBeforePrecedence.java +++ b/src/org/apache/fop/fo/properties/BorderBeforePrecedence.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.PrecedenceCommon; public class BorderBeforePrecedence extends PrecedenceCommon { public static final int dataTypes = INTEGER | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderBeforeStyle.java b/src/org/apache/fop/fo/properties/BorderBeforeStyle.java index 4a6db73a0..e40bef4e3 100644 --- a/src/org/apache/fop/fo/properties/BorderBeforeStyle.java +++ b/src/org/apache/fop/fo/properties/BorderBeforeStyle.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.BorderCommonStyle; public class BorderBeforeStyle extends BorderCommonStyle { public static final int dataTypes = ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderBeforeWidth.java b/src/org/apache/fop/fo/properties/BorderBeforeWidth.java index 9da900606..de5ea2c66 100644 --- a/src/org/apache/fop/fo/properties/BorderBeforeWidth.java +++ b/src/org/apache/fop/fo/properties/BorderBeforeWidth.java @@ -52,11 +52,10 @@ package org.apache.fop.fo.properties; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.PropNames; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.BorderCommonWidth; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class BorderBeforeWidth extends BorderCommonWidth { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/BorderBeforeWidthConditionality.java b/src/org/apache/fop/fo/properties/BorderBeforeWidthConditionality.java index 3620b9ba9..3f6bd5fb4 100644 --- a/src/org/apache/fop/fo/properties/BorderBeforeWidthConditionality.java +++ b/src/org/apache/fop/fo/properties/BorderBeforeWidthConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BorderBeforeWidthConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/BorderBeforeWidthLength.java b/src/org/apache/fop/fo/properties/BorderBeforeWidthLength.java index c260f82c2..131f39f9e 100644 --- a/src/org/apache/fop/fo/properties/BorderBeforeWidthLength.java +++ b/src/org/apache/fop/fo/properties/BorderBeforeWidthLength.java @@ -51,10 +51,9 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.BorderCommonWidth; +import org.apache.fop.fo.expr.PropertyException; public class BorderBeforeWidthLength extends BorderCommonWidth { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/BorderBottom.java b/src/org/apache/fop/fo/properties/BorderBottom.java index e5dfa48c8..82378d292 100644 --- a/src/org/apache/fop/fo/properties/BorderBottom.java +++ b/src/org/apache/fop/fo/properties/BorderBottom.java @@ -51,15 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.EnumType; -import org.apache.fop.datatypes.ColorType; -import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.PropNames; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class BorderBottom extends Property { public static final int dataTypes = SHORTHAND; diff --git a/src/org/apache/fop/fo/properties/BorderBottomColor.java b/src/org/apache/fop/fo/properties/BorderBottomColor.java index a33e9ff63..0d33c4e1e 100644 --- a/src/org/apache/fop/fo/properties/BorderBottomColor.java +++ b/src/org/apache/fop/fo/properties/BorderBottomColor.java @@ -51,10 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class BorderBottomColor extends ColorTransparent { public static final int dataTypes = ENUM | COLOR_T | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderBottomStyle.java b/src/org/apache/fop/fo/properties/BorderBottomStyle.java index ada98a848..64cb382e2 100644 --- a/src/org/apache/fop/fo/properties/BorderBottomStyle.java +++ b/src/org/apache/fop/fo/properties/BorderBottomStyle.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.BorderCommonStyle; public class BorderBottomStyle extends BorderCommonStyle { public static final int dataTypes = ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderBottomWidth.java b/src/org/apache/fop/fo/properties/BorderBottomWidth.java index 300a3a29d..fa4b1bc17 100644 --- a/src/org/apache/fop/fo/properties/BorderBottomWidth.java +++ b/src/org/apache/fop/fo/properties/BorderBottomWidth.java @@ -52,11 +52,10 @@ package org.apache.fop.fo.properties; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.PropNames; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.BorderCommonWidth; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class BorderBottomWidth extends BorderCommonWidth { public static final int dataTypes = LENGTH | MAPPED_LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderCollapse.java b/src/org/apache/fop/fo/properties/BorderCollapse.java index aabaa8890..a35e217db 100644 --- a/src/org/apache/fop/fo/properties/BorderCollapse.java +++ b/src/org/apache/fop/fo/properties/BorderCollapse.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BorderCollapse extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderColor.java b/src/org/apache/fop/fo/properties/BorderColor.java index f3388a0f1..79548d255 100644 --- a/src/org/apache/fop/fo/properties/BorderColor.java +++ b/src/org/apache/fop/fo/properties/BorderColor.java @@ -51,16 +51,15 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; +import java.util.Iterator; + import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; import org.apache.fop.fo.ShorthandPropSets; - -import java.util.Map; -import java.util.Iterator; +import org.apache.fop.fo.expr.PropertyException; public class BorderColor extends ColorTransparent { public static final int dataTypes = SHORTHAND; diff --git a/src/org/apache/fop/fo/properties/BorderCommonStyle.java b/src/org/apache/fop/fo/properties/BorderCommonStyle.java index d74f6d5f0..0cdff0c9a 100644 --- a/src/org/apache/fop/fo/properties/BorderCommonStyle.java +++ b/src/org/apache/fop/fo/properties/BorderCommonStyle.java @@ -51,12 +51,11 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; -import org.apache.fop.datatypes.Ints; - import java.util.HashMap; +import org.apache.fop.datatypes.Ints; +import org.apache.fop.fo.expr.PropertyException; + /** * Pseudo-property class for common border style values occurring in a * number of classes. diff --git a/src/org/apache/fop/fo/properties/BorderCommonWidth.java b/src/org/apache/fop/fo/properties/BorderCommonWidth.java index fd51d42b0..c8cc74a1c 100644 --- a/src/org/apache/fop/fo/properties/BorderCommonWidth.java +++ b/src/org/apache/fop/fo/properties/BorderCommonWidth.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.Property; import org.apache.fop.datatypes.Length; import org.apache.fop.datatypes.Numeric; import org.apache.fop.fo.FONode; diff --git a/src/org/apache/fop/fo/properties/BorderEndColor.java b/src/org/apache/fop/fo/properties/BorderEndColor.java index 3554cb0d6..6dee2414b 100644 --- a/src/org/apache/fop/fo/properties/BorderEndColor.java +++ b/src/org/apache/fop/fo/properties/BorderEndColor.java @@ -51,10 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class BorderEndColor extends ColorTransparent { public static final int dataTypes = ENUM | COLOR_T | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderEndPrecedence.java b/src/org/apache/fop/fo/properties/BorderEndPrecedence.java index 334e4a390..e4b601f3a 100644 --- a/src/org/apache/fop/fo/properties/BorderEndPrecedence.java +++ b/src/org/apache/fop/fo/properties/BorderEndPrecedence.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.PrecedenceCommon; public class BorderEndPrecedence extends PrecedenceCommon { public static final int dataTypes = INTEGER | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderEndStyle.java b/src/org/apache/fop/fo/properties/BorderEndStyle.java index ba67b5307..b75b53770 100644 --- a/src/org/apache/fop/fo/properties/BorderEndStyle.java +++ b/src/org/apache/fop/fo/properties/BorderEndStyle.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.BorderCommonStyle; public class BorderEndStyle extends BorderCommonStyle { public static final int dataTypes = ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderEndWidth.java b/src/org/apache/fop/fo/properties/BorderEndWidth.java index 28b7b32aa..3c0a9d1d3 100644 --- a/src/org/apache/fop/fo/properties/BorderEndWidth.java +++ b/src/org/apache/fop/fo/properties/BorderEndWidth.java @@ -51,12 +51,11 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.PropNames; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.BorderCommonWidth; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class BorderEndWidth extends BorderCommonWidth { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/BorderEndWidthConditionality.java b/src/org/apache/fop/fo/properties/BorderEndWidthConditionality.java index 7f84cd757..9d72ab8aa 100644 --- a/src/org/apache/fop/fo/properties/BorderEndWidthConditionality.java +++ b/src/org/apache/fop/fo/properties/BorderEndWidthConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Conditionality; +import org.apache.fop.fo.expr.PropertyException; public class BorderEndWidthConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/BorderEndWidthLength.java b/src/org/apache/fop/fo/properties/BorderEndWidthLength.java index a4ddc5132..e1bab7d57 100644 --- a/src/org/apache/fop/fo/properties/BorderEndWidthLength.java +++ b/src/org/apache/fop/fo/properties/BorderEndWidthLength.java @@ -51,10 +51,9 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.BorderCommonWidth; +import org.apache.fop.fo.expr.PropertyException; public class BorderEndWidthLength extends BorderCommonWidth { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/BorderLeft.java b/src/org/apache/fop/fo/properties/BorderLeft.java index 1e1dad9cc..d94e987dc 100644 --- a/src/org/apache/fop/fo/properties/BorderLeft.java +++ b/src/org/apache/fop/fo/properties/BorderLeft.java @@ -51,15 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.EnumType; -import org.apache.fop.datatypes.ColorType; -import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BorderLeft extends Property { public static final int dataTypes = SHORTHAND; diff --git a/src/org/apache/fop/fo/properties/BorderLeftColor.java b/src/org/apache/fop/fo/properties/BorderLeftColor.java index 8896f145a..09488f9de 100644 --- a/src/org/apache/fop/fo/properties/BorderLeftColor.java +++ b/src/org/apache/fop/fo/properties/BorderLeftColor.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.ColorTransparent; +import org.apache.fop.fo.expr.PropertyException; public class BorderLeftColor extends ColorTransparent { public static final int dataTypes = ENUM | COLOR_T | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderLeftStyle.java b/src/org/apache/fop/fo/properties/BorderLeftStyle.java index 7aaf4f2dc..632b5eef0 100644 --- a/src/org/apache/fop/fo/properties/BorderLeftStyle.java +++ b/src/org/apache/fop/fo/properties/BorderLeftStyle.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.BorderCommonStyle; public class BorderLeftStyle extends BorderCommonStyle { public static final int dataTypes = ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderLeftWidth.java b/src/org/apache/fop/fo/properties/BorderLeftWidth.java index df76acf63..2be18a313 100644 --- a/src/org/apache/fop/fo/properties/BorderLeftWidth.java +++ b/src/org/apache/fop/fo/properties/BorderLeftWidth.java @@ -52,11 +52,10 @@ package org.apache.fop.fo.properties; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.PropNames; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.BorderCommonWidth; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class BorderLeftWidth extends BorderCommonWidth { public static final int dataTypes = LENGTH | MAPPED_LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderRight.java b/src/org/apache/fop/fo/properties/BorderRight.java index 34e744812..80e2e3cef 100644 --- a/src/org/apache/fop/fo/properties/BorderRight.java +++ b/src/org/apache/fop/fo/properties/BorderRight.java @@ -51,15 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.EnumType; -import org.apache.fop.datatypes.ColorType; -import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BorderRight extends Property { public static final int dataTypes = SHORTHAND; diff --git a/src/org/apache/fop/fo/properties/BorderRightColor.java b/src/org/apache/fop/fo/properties/BorderRightColor.java index a71053e9d..8e04123ac 100644 --- a/src/org/apache/fop/fo/properties/BorderRightColor.java +++ b/src/org/apache/fop/fo/properties/BorderRightColor.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.ColorTransparent; +import org.apache.fop.fo.expr.PropertyException; public class BorderRightColor extends ColorTransparent { public static final int dataTypes = ENUM | COLOR_T | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderRightStyle.java b/src/org/apache/fop/fo/properties/BorderRightStyle.java index 38c694215..361078ef6 100644 --- a/src/org/apache/fop/fo/properties/BorderRightStyle.java +++ b/src/org/apache/fop/fo/properties/BorderRightStyle.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.BorderCommonStyle; public class BorderRightStyle extends BorderCommonStyle { public static final int dataTypes = ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderRightWidth.java b/src/org/apache/fop/fo/properties/BorderRightWidth.java index 43f6809b3..9d1ec75d9 100644 --- a/src/org/apache/fop/fo/properties/BorderRightWidth.java +++ b/src/org/apache/fop/fo/properties/BorderRightWidth.java @@ -52,11 +52,10 @@ package org.apache.fop.fo.properties; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.PropNames; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.BorderCommonWidth; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class BorderRightWidth extends BorderCommonWidth { public static final int dataTypes = LENGTH | MAPPED_LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderSeparation.java b/src/org/apache/fop/fo/properties/BorderSeparation.java index d6ac1a4ae..2687440e7 100644 --- a/src/org/apache/fop/fo/properties/BorderSeparation.java +++ b/src/org/apache/fop/fo/properties/BorderSeparation.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class BorderSeparation extends Property { public static final int dataTypes = COMPOUND | LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderSeparationBlockProgressionDirection.java b/src/org/apache/fop/fo/properties/BorderSeparationBlockProgressionDirection.java index 4f3a823df..c68a0b287 100644 --- a/src/org/apache/fop/fo/properties/BorderSeparationBlockProgressionDirection.java +++ b/src/org/apache/fop/fo/properties/BorderSeparationBlockProgressionDirection.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BorderSeparationBlockProgressionDirection extends Property { diff --git a/src/org/apache/fop/fo/properties/BorderSeparationInlineProgressionDirection.java b/src/org/apache/fop/fo/properties/BorderSeparationInlineProgressionDirection.java index 46c73014d..538e0bb37 100644 --- a/src/org/apache/fop/fo/properties/BorderSeparationInlineProgressionDirection.java +++ b/src/org/apache/fop/fo/properties/BorderSeparationInlineProgressionDirection.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BorderSeparationInlineProgressionDirection extends Property { diff --git a/src/org/apache/fop/fo/properties/BorderSpacing.java b/src/org/apache/fop/fo/properties/BorderSpacing.java index fd3521d68..74190309b 100644 --- a/src/org/apache/fop/fo/properties/BorderSpacing.java +++ b/src/org/apache/fop/fo/properties/BorderSpacing.java @@ -51,15 +51,13 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.Length; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.PropNames; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; import org.apache.fop.fo.FONode; +import org.apache.fop.fo.PropNames; import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BorderSpacing extends Property { public static final int dataTypes = SHORTHAND; diff --git a/src/org/apache/fop/fo/properties/BorderStartColor.java b/src/org/apache/fop/fo/properties/BorderStartColor.java index 7cd66705d..24af134ef 100644 --- a/src/org/apache/fop/fo/properties/BorderStartColor.java +++ b/src/org/apache/fop/fo/properties/BorderStartColor.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.ColorTransparent; +import org.apache.fop.fo.expr.PropertyException; public class BorderStartColor extends ColorTransparent { public static final int dataTypes = ENUM | COLOR_T | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderStartPrecedence.java b/src/org/apache/fop/fo/properties/BorderStartPrecedence.java index 56fa2abaa..03ed718db 100644 --- a/src/org/apache/fop/fo/properties/BorderStartPrecedence.java +++ b/src/org/apache/fop/fo/properties/BorderStartPrecedence.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.PrecedenceCommon; public class BorderStartPrecedence extends PrecedenceCommon { public static final int dataTypes = INTEGER | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderStartStyle.java b/src/org/apache/fop/fo/properties/BorderStartStyle.java index 8ddb2ff4b..42e9266c7 100644 --- a/src/org/apache/fop/fo/properties/BorderStartStyle.java +++ b/src/org/apache/fop/fo/properties/BorderStartStyle.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.BorderCommonStyle; public class BorderStartStyle extends BorderCommonStyle { public static final int dataTypes = ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderStartWidth.java b/src/org/apache/fop/fo/properties/BorderStartWidth.java index 982f0b76e..4c66b82ec 100644 --- a/src/org/apache/fop/fo/properties/BorderStartWidth.java +++ b/src/org/apache/fop/fo/properties/BorderStartWidth.java @@ -52,11 +52,10 @@ package org.apache.fop.fo.properties; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.PropNames; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.BorderCommonWidth; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class BorderStartWidth extends BorderCommonWidth { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/BorderStartWidthConditionality.java b/src/org/apache/fop/fo/properties/BorderStartWidthConditionality.java index 5ee3b20b1..b1370b446 100644 --- a/src/org/apache/fop/fo/properties/BorderStartWidthConditionality.java +++ b/src/org/apache/fop/fo/properties/BorderStartWidthConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Conditionality; +import org.apache.fop.fo.expr.PropertyException; public class BorderStartWidthConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/BorderStartWidthLength.java b/src/org/apache/fop/fo/properties/BorderStartWidthLength.java index fc3eff720..d681ddfb7 100644 --- a/src/org/apache/fop/fo/properties/BorderStartWidthLength.java +++ b/src/org/apache/fop/fo/properties/BorderStartWidthLength.java @@ -51,10 +51,9 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.BorderCommonWidth; +import org.apache.fop.fo.expr.PropertyException; public class BorderStartWidthLength extends BorderCommonWidth { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/BorderStyle.java b/src/org/apache/fop/fo/properties/BorderStyle.java index 2fe0d4e9f..8284c1990 100644 --- a/src/org/apache/fop/fo/properties/BorderStyle.java +++ b/src/org/apache/fop/fo/properties/BorderStyle.java @@ -51,19 +51,16 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; +import java.util.Iterator; + import org.apache.fop.datatypes.EnumType; import org.apache.fop.datatypes.NCName; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; +import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.BorderCommonStyle; - -import java.util.Map; -import java.util.Iterator; +import org.apache.fop.fo.expr.PropertyException; public class BorderStyle extends BorderCommonStyle { public static final int dataTypes = SHORTHAND; diff --git a/src/org/apache/fop/fo/properties/BorderTop.java b/src/org/apache/fop/fo/properties/BorderTop.java index 1a669f3de..1d1393b14 100644 --- a/src/org/apache/fop/fo/properties/BorderTop.java +++ b/src/org/apache/fop/fo/properties/BorderTop.java @@ -51,15 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.EnumType; -import org.apache.fop.datatypes.ColorType; -import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class BorderTop extends Property { public static final int dataTypes = SHORTHAND; diff --git a/src/org/apache/fop/fo/properties/BorderTopColor.java b/src/org/apache/fop/fo/properties/BorderTopColor.java index ba911720d..a1487966c 100644 --- a/src/org/apache/fop/fo/properties/BorderTopColor.java +++ b/src/org/apache/fop/fo/properties/BorderTopColor.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.ColorTransparent; +import org.apache.fop.fo.expr.PropertyException; public class BorderTopColor extends ColorTransparent { public static final int dataTypes = ENUM | COLOR_T | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderTopStyle.java b/src/org/apache/fop/fo/properties/BorderTopStyle.java index b4ea4918d..6f397caad 100644 --- a/src/org/apache/fop/fo/properties/BorderTopStyle.java +++ b/src/org/apache/fop/fo/properties/BorderTopStyle.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.BorderCommonStyle; public class BorderTopStyle extends BorderCommonStyle { public static final int dataTypes = ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderTopWidth.java b/src/org/apache/fop/fo/properties/BorderTopWidth.java index fdf6b2cc6..4733a3b73 100644 --- a/src/org/apache/fop/fo/properties/BorderTopWidth.java +++ b/src/org/apache/fop/fo/properties/BorderTopWidth.java @@ -51,12 +51,11 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.PropNames; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.BorderCommonWidth; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class BorderTopWidth extends BorderCommonWidth { public static final int dataTypes = LENGTH | MAPPED_LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BorderWidth.java b/src/org/apache/fop/fo/properties/BorderWidth.java index a436f38f8..6138aa590 100644 --- a/src/org/apache/fop/fo/properties/BorderWidth.java +++ b/src/org/apache/fop/fo/properties/BorderWidth.java @@ -51,18 +51,17 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.Numeric; +import java.util.Iterator; + import org.apache.fop.datatypes.MappedNumeric; import org.apache.fop.datatypes.NCName; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.datatypes.Numeric; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; +import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.Property; - -import java.util.Iterator; +import org.apache.fop.fo.expr.PropertyException; public class BorderWidth extends BorderCommonWidth { // Below is a special case defying the general rule that shorthands do diff --git a/src/org/apache/fop/fo/properties/Bottom.java b/src/org/apache/fop/fo/properties/Bottom.java index a112797fc..ba786a058 100644 --- a/src/org/apache/fop/fo/properties/Bottom.java +++ b/src/org/apache/fop/fo/properties/Bottom.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Bottom extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/BreakAfter.java b/src/org/apache/fop/fo/properties/BreakAfter.java index e7c923e06..bd003c6e2 100644 --- a/src/org/apache/fop/fo/properties/BreakAfter.java +++ b/src/org/apache/fop/fo/properties/BreakAfter.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.BreakCommon; public class BreakAfter extends BreakCommon { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BreakBefore.java b/src/org/apache/fop/fo/properties/BreakBefore.java index 18e8f983a..40450e35b 100644 --- a/src/org/apache/fop/fo/properties/BreakBefore.java +++ b/src/org/apache/fop/fo/properties/BreakBefore.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.BreakCommon; public class BreakBefore extends BreakCommon { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/BreakCommon.java b/src/org/apache/fop/fo/properties/BreakCommon.java index d76d323cc..8d53cd2b9 100644 --- a/src/org/apache/fop/fo/properties/BreakCommon.java +++ b/src/org/apache/fop/fo/properties/BreakCommon.java @@ -51,12 +51,11 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.fo.properties.Property; - import java.util.HashMap; +import org.apache.fop.datatypes.Ints; +import org.apache.fop.fo.expr.PropertyException; + public class BreakCommon extends Property { public static final int COLUMN = 1; public static final int PAGE = 2; diff --git a/src/org/apache/fop/fo/properties/CaptionSide.java b/src/org/apache/fop/fo/properties/CaptionSide.java index 476954780..cc9ea4a01 100644 --- a/src/org/apache/fop/fo/properties/CaptionSide.java +++ b/src/org/apache/fop/fo/properties/CaptionSide.java @@ -51,17 +51,13 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; +import java.util.HashMap; + import org.apache.fop.datatypes.EnumType; import org.apache.fop.datatypes.Ints; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; - -import java.util.HashMap; -import java.util.Map; -import java.util.Collections; +import org.apache.fop.fo.expr.PropertyException; public class CaptionSide extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/CaseName.java b/src/org/apache/fop/fo/properties/CaseName.java index ae665eb9a..6a4fae7ca 100644 --- a/src/org/apache/fop/fo/properties/CaseName.java +++ b/src/org/apache/fop/fo/properties/CaseName.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class CaseName extends Property { public static final int dataTypes = NCNAME; diff --git a/src/org/apache/fop/fo/properties/CaseTitle.java b/src/org/apache/fop/fo/properties/CaseTitle.java index d0c690766..4ee843c30 100644 --- a/src/org/apache/fop/fo/properties/CaseTitle.java +++ b/src/org/apache/fop/fo/properties/CaseTitle.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class CaseTitle extends Property { public static final int dataTypes = STRING; diff --git a/src/org/apache/fop/fo/properties/Character.java b/src/org/apache/fop/fo/properties/Character.java index ed7dea414..04cd52964 100644 --- a/src/org/apache/fop/fo/properties/Character.java +++ b/src/org/apache/fop/fo/properties/Character.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Character extends Property { public static final int dataTypes = CHARACTER_T; diff --git a/src/org/apache/fop/fo/properties/Clear.java b/src/org/apache/fop/fo/properties/Clear.java index 96e3d2a2c..aa3998766 100644 --- a/src/org/apache/fop/fo/properties/Clear.java +++ b/src/org/apache/fop/fo/properties/Clear.java @@ -51,14 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.fo.properties.Property; - import java.util.HashMap; -import java.util.Map; -import java.util.Collections; + +import org.apache.fop.datatypes.Ints; +import org.apache.fop.fo.expr.PropertyException; public class Clear extends Property { public static final int dataTypes = ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Clip.java b/src/org/apache/fop/fo/properties/Clip.java index d1c9a36e1..5f6603038 100644 --- a/src/org/apache/fop/fo/properties/Clip.java +++ b/src/org/apache/fop/fo/properties/Clip.java @@ -51,15 +51,14 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.fo.expr.PropertyException; +import java.util.Iterator; + import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; import org.apache.fop.fo.FONode; - -import java.util.Iterator; +import org.apache.fop.fo.expr.PropertyException; public class Clip extends Property { public static final int dataTypes = AUTO | COMPLEX | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Color.java b/src/org/apache/fop/fo/properties/Color.java index 667656ba2..04b066d7d 100644 --- a/src/org/apache/fop/fo/properties/Color.java +++ b/src/org/apache/fop/fo/properties/Color.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.ColorNonTransparent; +import org.apache.fop.fo.expr.PropertyException; public class Color extends ColorNonTransparent { public static final int dataTypes = ENUM | COLOR_T | INHERIT; diff --git a/src/org/apache/fop/fo/properties/ColorCommon.java b/src/org/apache/fop/fo/properties/ColorCommon.java index 85edf127f..ae47a7dcf 100644 --- a/src/org/apache/fop/fo/properties/ColorCommon.java +++ b/src/org/apache/fop/fo/properties/ColorCommon.java @@ -51,16 +51,13 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FONode; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.ColorType; import org.apache.fop.datatypes.EnumType; import org.apache.fop.datatypes.NCName; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.datatypes.Ints; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.FONode; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.messaging.MessageHandler; /** diff --git a/src/org/apache/fop/fo/properties/ColorNonTransparent.java b/src/org/apache/fop/fo/properties/ColorNonTransparent.java index 2c6587d24..77f8efd3e 100644 --- a/src/org/apache/fop/fo/properties/ColorNonTransparent.java +++ b/src/org/apache/fop/fo/properties/ColorNonTransparent.java @@ -51,13 +51,11 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.fo.properties.ColorCommon; - import java.util.HashMap; +import org.apache.fop.datatypes.Ints; +import org.apache.fop.fo.expr.PropertyException; + /** * Pseudo-property class for common color values occurring in a * number of classes. diff --git a/src/org/apache/fop/fo/properties/ColorProfileName.java b/src/org/apache/fop/fo/properties/ColorProfileName.java index 598f3a946..533b2a1a1 100644 --- a/src/org/apache/fop/fo/properties/ColorProfileName.java +++ b/src/org/apache/fop/fo/properties/ColorProfileName.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class ColorProfileName extends Property { public static final int dataTypes = NCNAME | INHERIT; diff --git a/src/org/apache/fop/fo/properties/ColorTransparent.java b/src/org/apache/fop/fo/properties/ColorTransparent.java index b77896252..37ed1d553 100644 --- a/src/org/apache/fop/fo/properties/ColorTransparent.java +++ b/src/org/apache/fop/fo/properties/ColorTransparent.java @@ -51,13 +51,11 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.fo.properties.ColorCommon; - import java.util.HashMap; +import org.apache.fop.datatypes.Ints; +import org.apache.fop.fo.expr.PropertyException; + /** * Pseudo-property class for common color values, and the special value * "transparent", occurring in a number of classes. diff --git a/src/org/apache/fop/fo/properties/ColumnCount.java b/src/org/apache/fop/fo/properties/ColumnCount.java index 113942d1d..78b50cccf 100644 --- a/src/org/apache/fop/fo/properties/ColumnCount.java +++ b/src/org/apache/fop/fo/properties/ColumnCount.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Numeric; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class ColumnCount extends Property { public static final int dataTypes = NUMBER | INHERIT; diff --git a/src/org/apache/fop/fo/properties/ColumnGap.java b/src/org/apache/fop/fo/properties/ColumnGap.java index 8e62863a8..2074a2da6 100644 --- a/src/org/apache/fop/fo/properties/ColumnGap.java +++ b/src/org/apache/fop/fo/properties/ColumnGap.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class ColumnGap extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/ColumnNumber.java b/src/org/apache/fop/fo/properties/ColumnNumber.java index 0f246da76..80991b8ff 100644 --- a/src/org/apache/fop/fo/properties/ColumnNumber.java +++ b/src/org/apache/fop/fo/properties/ColumnNumber.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class ColumnNumber extends Property { public static final int dataTypes = NUMBER; diff --git a/src/org/apache/fop/fo/properties/ColumnWidth.java b/src/org/apache/fop/fo/properties/ColumnWidth.java index 88b524482..441435e4c 100644 --- a/src/org/apache/fop/fo/properties/ColumnWidth.java +++ b/src/org/apache/fop/fo/properties/ColumnWidth.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class ColumnWidth extends Property { public static final int dataTypes = PERCENTAGE | LENGTH; diff --git a/src/org/apache/fop/fo/properties/Conditionality.java b/src/org/apache/fop/fo/properties/Conditionality.java index 519d9af7e..4b4f248c6 100644 --- a/src/org/apache/fop/fo/properties/Conditionality.java +++ b/src/org/apache/fop/fo/properties/Conditionality.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class Conditionality extends Property { public static final int DISCARD = 1; diff --git a/src/org/apache/fop/fo/properties/ContentDimension.java b/src/org/apache/fop/fo/properties/ContentDimension.java index 5cafa795c..47828c946 100644 --- a/src/org/apache/fop/fo/properties/ContentDimension.java +++ b/src/org/apache/fop/fo/properties/ContentDimension.java @@ -52,7 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class ContentDimension extends Property { public static final int SCALE_TO_FIT = 1; diff --git a/src/org/apache/fop/fo/properties/ContentHeight.java b/src/org/apache/fop/fo/properties/ContentHeight.java index e0fca3a65..647318278 100644 --- a/src/org/apache/fop/fo/properties/ContentHeight.java +++ b/src/org/apache/fop/fo/properties/ContentHeight.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.ContentDimension; public class ContentHeight extends ContentDimension { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/ContentType.java b/src/org/apache/fop/fo/properties/ContentType.java index 73af8eac0..0e747dc7b 100644 --- a/src/org/apache/fop/fo/properties/ContentType.java +++ b/src/org/apache/fop/fo/properties/ContentType.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class ContentType extends Property { public static final int dataTypes = NCNAME | MIMETYPE | AUTO; diff --git a/src/org/apache/fop/fo/properties/ContentWidth.java b/src/org/apache/fop/fo/properties/ContentWidth.java index 17e3a5517..e771c40c7 100644 --- a/src/org/apache/fop/fo/properties/ContentWidth.java +++ b/src/org/apache/fop/fo/properties/ContentWidth.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.ContentDimension; public class ContentWidth extends ContentDimension { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/Country.java b/src/org/apache/fop/fo/properties/Country.java index b1610a61b..f2f6938c8 100644 --- a/src/org/apache/fop/fo/properties/Country.java +++ b/src/org/apache/fop/fo/properties/Country.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Country extends Property { public static final int dataTypes = COUNTRY_T | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Cue.java b/src/org/apache/fop/fo/properties/Cue.java index ef13a4426..6031e494c 100644 --- a/src/org/apache/fop/fo/properties/Cue.java +++ b/src/org/apache/fop/fo/properties/Cue.java @@ -51,13 +51,12 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.PropNames; +import org.apache.fop.datatypes.PropertyValueList; import org.apache.fop.fo.FONode; +import org.apache.fop.fo.PropNames; import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class Cue extends Property { public static final int dataTypes = SHORTHAND; diff --git a/src/org/apache/fop/fo/properties/CueAfter.java b/src/org/apache/fop/fo/properties/CueAfter.java index 39f342f8a..aaaaa4eda 100644 --- a/src/org/apache/fop/fo/properties/CueAfter.java +++ b/src/org/apache/fop/fo/properties/CueAfter.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class CueAfter extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/CueBefore.java b/src/org/apache/fop/fo/properties/CueBefore.java index c809eed4b..d20c960db 100644 --- a/src/org/apache/fop/fo/properties/CueBefore.java +++ b/src/org/apache/fop/fo/properties/CueBefore.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class CueBefore extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/DestinationPlacementOffset.java b/src/org/apache/fop/fo/properties/DestinationPlacementOffset.java index 18f6373a7..2fc46b890 100644 --- a/src/org/apache/fop/fo/properties/DestinationPlacementOffset.java +++ b/src/org/apache/fop/fo/properties/DestinationPlacementOffset.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class DestinationPlacementOffset extends Property { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/Direction.java b/src/org/apache/fop/fo/properties/Direction.java index fba982ca8..4d0c4e939 100644 --- a/src/org/apache/fop/fo/properties/Direction.java +++ b/src/org/apache/fop/fo/properties/Direction.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class Direction extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/DisplayAlign.java b/src/org/apache/fop/fo/properties/DisplayAlign.java index 11924e022..cee0dee54 100644 --- a/src/org/apache/fop/fo/properties/DisplayAlign.java +++ b/src/org/apache/fop/fo/properties/DisplayAlign.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class DisplayAlign extends Property { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/DominantBaseline.java b/src/org/apache/fop/fo/properties/DominantBaseline.java index 05e6e271c..df1081f89 100644 --- a/src/org/apache/fop/fo/properties/DominantBaseline.java +++ b/src/org/apache/fop/fo/properties/DominantBaseline.java @@ -51,13 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.fo.properties.Property; -import java.util.Map; import java.util.HashMap; -import java.util.Collections; + +import org.apache.fop.datatypes.Ints; +import org.apache.fop.fo.expr.PropertyException; public class DominantBaseline extends Property { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Dummy.java b/src/org/apache/fop/fo/properties/Dummy.java index 81575f5d7..3a5eb6673 100644 --- a/src/org/apache/fop/fo/properties/Dummy.java +++ b/src/org/apache/fop/fo/properties/Dummy.java @@ -1,5 +1,6 @@ package org.apache.fop.fo.properties; + import org.apache.fop.fo.properties.AbsolutePosition; import org.apache.fop.fo.properties.ActiveState; import org.apache.fop.fo.properties.AlignmentAdjust; diff --git a/src/org/apache/fop/fo/properties/Elevation.java b/src/org/apache/fop/fo/properties/Elevation.java index ec7f813dd..66a948dd8 100644 --- a/src/org/apache/fop/fo/properties/Elevation.java +++ b/src/org/apache/fop/fo/properties/Elevation.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Elevation extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/EmptyCells.java b/src/org/apache/fop/fo/properties/EmptyCells.java index 7177a6257..7064fdde5 100644 --- a/src/org/apache/fop/fo/properties/EmptyCells.java +++ b/src/org/apache/fop/fo/properties/EmptyCells.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class EmptyCells extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/EndIndent.java b/src/org/apache/fop/fo/properties/EndIndent.java index e69fd6768..a95ab6ef7 100644 --- a/src/org/apache/fop/fo/properties/EndIndent.java +++ b/src/org/apache/fop/fo/properties/EndIndent.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class EndIndent extends Property { public static final int dataTypes = LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/EndsRow.java b/src/org/apache/fop/fo/properties/EndsRow.java index 181f7f742..68fdd1b19 100644 --- a/src/org/apache/fop/fo/properties/EndsRow.java +++ b/src/org/apache/fop/fo/properties/EndsRow.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Bool; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class EndsRow extends Property { public static final int dataTypes = BOOL; diff --git a/src/org/apache/fop/fo/properties/Extent.java b/src/org/apache/fop/fo/properties/Extent.java index 6b8304a60..fb8982256 100644 --- a/src/org/apache/fop/fo/properties/Extent.java +++ b/src/org/apache/fop/fo/properties/Extent.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class Extent extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/ExternalDestination.java b/src/org/apache/fop/fo/properties/ExternalDestination.java index 9a6697d3c..4081ea3a6 100644 --- a/src/org/apache/fop/fo/properties/ExternalDestination.java +++ b/src/org/apache/fop/fo/properties/ExternalDestination.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.UriType; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class ExternalDestination extends Property { public static final int dataTypes = URI_SPECIFICATION; diff --git a/src/org/apache/fop/fo/properties/Float.java b/src/org/apache/fop/fo/properties/Float.java index 5fcdd0c27..f3f583376 100644 --- a/src/org/apache/fop/fo/properties/Float.java +++ b/src/org/apache/fop/fo/properties/Float.java @@ -51,13 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.fo.properties.Property; -import java.util.Map; import java.util.HashMap; -import java.util.Collections; + +import org.apache.fop.datatypes.Ints; +import org.apache.fop.fo.expr.PropertyException; public class Float extends Property { public static final int dataTypes = ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/FlowName.java b/src/org/apache/fop/fo/properties/FlowName.java index e3f541157..7e5332665 100644 --- a/src/org/apache/fop/fo/properties/FlowName.java +++ b/src/org/apache/fop/fo/properties/FlowName.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.NCName; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class FlowName extends Property { public static final int dataTypes = NCNAME; diff --git a/src/org/apache/fop/fo/properties/Font.java b/src/org/apache/fop/fo/properties/Font.java index f99606883..fe61897d5 100644 --- a/src/org/apache/fop/fo/properties/Font.java +++ b/src/org/apache/fop/fo/properties/Font.java @@ -51,33 +51,24 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.Length; -import org.apache.fop.datatypes.NCName; +import java.util.HashMap; + import org.apache.fop.datatypes.EnumType; -import org.apache.fop.datatypes.Numeric; -import org.apache.fop.datatypes.MappedNumeric; -import org.apache.fop.datatypes.Ems; -import org.apache.fop.datatypes.IntegerType; -import org.apache.fop.datatypes.StringType; import org.apache.fop.datatypes.FontFamilySet; import org.apache.fop.datatypes.Ints; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.expr.SystemFontFunction; +import org.apache.fop.datatypes.MappedNumeric; +import org.apache.fop.datatypes.NCName; +import org.apache.fop.datatypes.Numeric; import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; +import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.FONode; import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.expr.SystemFontFunction; import org.apache.fop.messaging.MessageHandler; -import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; -import java.util.Collections; - public class Font extends Property { public static final int dataTypes = SHORTHAND; public static final int traitMapping = SHORTHAND_MAP; diff --git a/src/org/apache/fop/fo/properties/FontFamily.java b/src/org/apache/fop/fo/properties/FontFamily.java index 3d8df6a6f..99b03e3a1 100644 --- a/src/org/apache/fop/fo/properties/FontFamily.java +++ b/src/org/apache/fop/fo/properties/FontFamily.java @@ -51,21 +51,17 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; +import java.util.HashMap; +import java.util.Iterator; + import org.apache.fop.datatypes.FontFamilySet; -import org.apache.fop.datatypes.StringType; import org.apache.fop.datatypes.Ints; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; +import org.apache.fop.datatypes.StringType; import org.apache.fop.datatypes.indirect.Inherit; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.Property; - -import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; -import java.util.Collections; +import org.apache.fop.fo.expr.PropertyException; public class FontFamily extends Property { public static final int dataTypes = COMPLEX | INHERIT | FONTSET; diff --git a/src/org/apache/fop/fo/properties/FontSelectionStrategy.java b/src/org/apache/fop/fo/properties/FontSelectionStrategy.java index fd38f7c3e..ec89b3854 100644 --- a/src/org/apache/fop/fo/properties/FontSelectionStrategy.java +++ b/src/org/apache/fop/fo/properties/FontSelectionStrategy.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class FontSelectionStrategy extends Property { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/FontSize.java b/src/org/apache/fop/fo/properties/FontSize.java index e17383054..a28b28dc3 100644 --- a/src/org/apache/fop/fo/properties/FontSize.java +++ b/src/org/apache/fop/fo/properties/FontSize.java @@ -51,21 +51,16 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.Numeric; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Numeric; +import java.util.HashMap; + import org.apache.fop.datatypes.Ems; -import org.apache.fop.datatypes.Length; import org.apache.fop.datatypes.Ints; -import org.apache.fop.fo.PropNames; +import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.Numeric; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.Property; - -import java.util.Map; -import java.util.HashMap; -import java.util.Collections; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class FontSize extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/FontSizeAdjust.java b/src/org/apache/fop/fo/properties/FontSizeAdjust.java index 3ff1e3436..9e778f548 100644 --- a/src/org/apache/fop/fo/properties/FontSizeAdjust.java +++ b/src/org/apache/fop/fo/properties/FontSizeAdjust.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class FontSizeAdjust extends Property { public static final int dataTypes = NUMBER | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/FontStretch.java b/src/org/apache/fop/fo/properties/FontStretch.java index 60a81d7a3..c70a348e2 100644 --- a/src/org/apache/fop/fo/properties/FontStretch.java +++ b/src/org/apache/fop/fo/properties/FontStretch.java @@ -51,17 +51,13 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; +import java.util.HashMap; + import org.apache.fop.datatypes.EnumType; import org.apache.fop.datatypes.Ints; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; - -import java.util.Map; -import java.util.HashMap; -import java.util.Collections; +import org.apache.fop.fo.expr.PropertyException; public class FontStretch extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/FontStyle.java b/src/org/apache/fop/fo/properties/FontStyle.java index 26c96618f..4f79c62f4 100644 --- a/src/org/apache/fop/fo/properties/FontStyle.java +++ b/src/org/apache/fop/fo/properties/FontStyle.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class FontStyle extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/FontVariant.java b/src/org/apache/fop/fo/properties/FontVariant.java index 12cda3838..48cc03b83 100644 --- a/src/org/apache/fop/fo/properties/FontVariant.java +++ b/src/org/apache/fop/fo/properties/FontVariant.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class FontVariant extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/FontWeight.java b/src/org/apache/fop/fo/properties/FontWeight.java index 6413f763c..1de0dcfc5 100644 --- a/src/org/apache/fop/fo/properties/FontWeight.java +++ b/src/org/apache/fop/fo/properties/FontWeight.java @@ -51,13 +51,11 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.IntegerType; -import org.apache.fop.fo.PropNames; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class FontWeight extends Property { public static final int dataTypes = INTEGER | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/ForcePageCount.java b/src/org/apache/fop/fo/properties/ForcePageCount.java index fb6b3493a..ac8d820f1 100644 --- a/src/org/apache/fop/fo/properties/ForcePageCount.java +++ b/src/org/apache/fop/fo/properties/ForcePageCount.java @@ -51,14 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.fo.properties.Property; - -import java.util.Map; import java.util.HashMap; -import java.util.Collections; + +import org.apache.fop.datatypes.Ints; +import org.apache.fop.fo.expr.PropertyException; public class ForcePageCount extends Property { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Format.java b/src/org/apache/fop/fo/properties/Format.java index edabc952a..339691cef 100644 --- a/src/org/apache/fop/fo/properties/Format.java +++ b/src/org/apache/fop/fo/properties/Format.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Literal; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class Format extends Property { public static final int dataTypes = STRING; diff --git a/src/org/apache/fop/fo/properties/GlyphOrientationHorizontal.java b/src/org/apache/fop/fo/properties/GlyphOrientationHorizontal.java index 3e9fe0e50..9ba161d8d 100644 --- a/src/org/apache/fop/fo/properties/GlyphOrientationHorizontal.java +++ b/src/org/apache/fop/fo/properties/GlyphOrientationHorizontal.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Angle; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class GlyphOrientationHorizontal extends Property { public static final int dataTypes = ANGLE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/GlyphOrientationVertical.java b/src/org/apache/fop/fo/properties/GlyphOrientationVertical.java index 316b22397..899505bf0 100644 --- a/src/org/apache/fop/fo/properties/GlyphOrientationVertical.java +++ b/src/org/apache/fop/fo/properties/GlyphOrientationVertical.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class GlyphOrientationVertical extends Property { public static final int dataTypes = ANGLE | AUTO | INHERIT; diff --git a/src/org/apache/fop/fo/properties/GroupingSeparator.java b/src/org/apache/fop/fo/properties/GroupingSeparator.java index 9964b465a..854666319 100644 --- a/src/org/apache/fop/fo/properties/GroupingSeparator.java +++ b/src/org/apache/fop/fo/properties/GroupingSeparator.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class GroupingSeparator extends Property { public static final int dataTypes = CHARACTER_T; diff --git a/src/org/apache/fop/fo/properties/GroupingSize.java b/src/org/apache/fop/fo/properties/GroupingSize.java index 4fac19950..ad6c5f791 100644 --- a/src/org/apache/fop/fo/properties/GroupingSize.java +++ b/src/org/apache/fop/fo/properties/GroupingSize.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class GroupingSize extends Property { public static final int dataTypes = NUMBER; diff --git a/src/org/apache/fop/fo/properties/Height.java b/src/org/apache/fop/fo/properties/Height.java index 0f3ee9963..3c0818b89 100644 --- a/src/org/apache/fop/fo/properties/Height.java +++ b/src/org/apache/fop/fo/properties/Height.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Height extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/Hyphenate.java b/src/org/apache/fop/fo/properties/Hyphenate.java index 4f6ae2800..dc7f35178 100644 --- a/src/org/apache/fop/fo/properties/Hyphenate.java +++ b/src/org/apache/fop/fo/properties/Hyphenate.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Bool; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class Hyphenate extends Property { public static final int dataTypes = BOOL | INHERIT; diff --git a/src/org/apache/fop/fo/properties/HyphenationCharacter.java b/src/org/apache/fop/fo/properties/HyphenationCharacter.java index 13a164813..ac1708779 100644 --- a/src/org/apache/fop/fo/properties/HyphenationCharacter.java +++ b/src/org/apache/fop/fo/properties/HyphenationCharacter.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Literal; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class HyphenationCharacter extends Property { public static final int dataTypes = CHARACTER_T | INHERIT; diff --git a/src/org/apache/fop/fo/properties/HyphenationKeep.java b/src/org/apache/fop/fo/properties/HyphenationKeep.java index e56f82e6d..81137ad1d 100644 --- a/src/org/apache/fop/fo/properties/HyphenationKeep.java +++ b/src/org/apache/fop/fo/properties/HyphenationKeep.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class HyphenationKeep extends Property { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/HyphenationLadderCount.java b/src/org/apache/fop/fo/properties/HyphenationLadderCount.java index 4e5871243..311af63ef 100644 --- a/src/org/apache/fop/fo/properties/HyphenationLadderCount.java +++ b/src/org/apache/fop/fo/properties/HyphenationLadderCount.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class HyphenationLadderCount extends Property { public static final int dataTypes = NUMBER | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/HyphenationPushCharacterCount.java b/src/org/apache/fop/fo/properties/HyphenationPushCharacterCount.java index ac8900d44..157f0631b 100644 --- a/src/org/apache/fop/fo/properties/HyphenationPushCharacterCount.java +++ b/src/org/apache/fop/fo/properties/HyphenationPushCharacterCount.java @@ -52,10 +52,9 @@ package org.apache.fop.fo.properties; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class HyphenationPushCharacterCount extends Property { public static final int dataTypes = NUMBER | INHERIT; diff --git a/src/org/apache/fop/fo/properties/HyphenationRemainCharacterCount.java b/src/org/apache/fop/fo/properties/HyphenationRemainCharacterCount.java index 01fe31ee2..ca49158fc 100644 --- a/src/org/apache/fop/fo/properties/HyphenationRemainCharacterCount.java +++ b/src/org/apache/fop/fo/properties/HyphenationRemainCharacterCount.java @@ -52,10 +52,9 @@ package org.apache.fop.fo.properties; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class HyphenationRemainCharacterCount extends Property { public static final int dataTypes = NUMBER | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Id.java b/src/org/apache/fop/fo/properties/Id.java index 28f0dbe66..ff3240915 100644 --- a/src/org/apache/fop/fo/properties/Id.java +++ b/src/org/apache/fop/fo/properties/Id.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Id extends Property { public static final int dataTypes = NCNAME; diff --git a/src/org/apache/fop/fo/properties/IndicateDestination.java b/src/org/apache/fop/fo/properties/IndicateDestination.java index 01484e6a7..f8d022eb2 100644 --- a/src/org/apache/fop/fo/properties/IndicateDestination.java +++ b/src/org/apache/fop/fo/properties/IndicateDestination.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Bool; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class IndicateDestination extends Property { public static final int dataTypes = BOOL; diff --git a/src/org/apache/fop/fo/properties/InitialPageNumber.java b/src/org/apache/fop/fo/properties/InitialPageNumber.java index 1b8a2b7ee..39c6dabd5 100644 --- a/src/org/apache/fop/fo/properties/InitialPageNumber.java +++ b/src/org/apache/fop/fo/properties/InitialPageNumber.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class InitialPageNumber extends Property { public static final int dataTypes = NUMBER | AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/InlineProgressionDimension.java b/src/org/apache/fop/fo/properties/InlineProgressionDimension.java index 3c9d0331f..7255ab9d5 100644 --- a/src/org/apache/fop/fo/properties/InlineProgressionDimension.java +++ b/src/org/apache/fop/fo/properties/InlineProgressionDimension.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class InlineProgressionDimension extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/InlineProgressionDimensionMaximum.java b/src/org/apache/fop/fo/properties/InlineProgressionDimensionMaximum.java index 09d59f9cf..b4ca3b999 100644 --- a/src/org/apache/fop/fo/properties/InlineProgressionDimensionMaximum.java +++ b/src/org/apache/fop/fo/properties/InlineProgressionDimensionMaximum.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class InlineProgressionDimensionMaximum extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | AUTO; diff --git a/src/org/apache/fop/fo/properties/InlineProgressionDimensionMinimum.java b/src/org/apache/fop/fo/properties/InlineProgressionDimensionMinimum.java index c586112e2..bf5f26226 100644 --- a/src/org/apache/fop/fo/properties/InlineProgressionDimensionMinimum.java +++ b/src/org/apache/fop/fo/properties/InlineProgressionDimensionMinimum.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class InlineProgressionDimensionMinimum extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | AUTO; diff --git a/src/org/apache/fop/fo/properties/InlineProgressionDimensionOptimum.java b/src/org/apache/fop/fo/properties/InlineProgressionDimensionOptimum.java index 4eba1dd87..38183e5c8 100644 --- a/src/org/apache/fop/fo/properties/InlineProgressionDimensionOptimum.java +++ b/src/org/apache/fop/fo/properties/InlineProgressionDimensionOptimum.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class InlineProgressionDimensionOptimum extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | AUTO; diff --git a/src/org/apache/fop/fo/properties/InternalDestination.java b/src/org/apache/fop/fo/properties/InternalDestination.java index 156fd666f..90712fdf4 100644 --- a/src/org/apache/fop/fo/properties/InternalDestination.java +++ b/src/org/apache/fop/fo/properties/InternalDestination.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Literal; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class InternalDestination extends Property { public static final int dataTypes = LITERAL | NCNAME; diff --git a/src/org/apache/fop/fo/properties/IntrusionDisplace.java b/src/org/apache/fop/fo/properties/IntrusionDisplace.java index adab2af32..bded97e5a 100644 --- a/src/org/apache/fop/fo/properties/IntrusionDisplace.java +++ b/src/org/apache/fop/fo/properties/IntrusionDisplace.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class IntrusionDisplace extends Property { public static final int dataTypes = AUTO | ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Keep.java b/src/org/apache/fop/fo/properties/Keep.java index 3ce1445e0..eee4d4bb4 100644 --- a/src/org/apache/fop/fo/properties/Keep.java +++ b/src/org/apache/fop/fo/properties/Keep.java @@ -52,7 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Keep extends Property { diff --git a/src/org/apache/fop/fo/properties/KeepTogether.java b/src/org/apache/fop/fo/properties/KeepTogether.java index 0ad3bd3bc..fda3da431 100644 --- a/src/org/apache/fop/fo/properties/KeepTogether.java +++ b/src/org/apache/fop/fo/properties/KeepTogether.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Keep; public class KeepTogether extends Keep { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/KeepTogetherWithinColumn.java b/src/org/apache/fop/fo/properties/KeepTogetherWithinColumn.java index d1e4145af..ae881f906 100644 --- a/src/org/apache/fop/fo/properties/KeepTogetherWithinColumn.java +++ b/src/org/apache/fop/fo/properties/KeepTogetherWithinColumn.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Keep; public class KeepTogetherWithinColumn extends Keep { public static final int dataTypes = AUTO | ENUM | INTEGER; diff --git a/src/org/apache/fop/fo/properties/KeepTogetherWithinLine.java b/src/org/apache/fop/fo/properties/KeepTogetherWithinLine.java index d5e0c800c..629e705b9 100644 --- a/src/org/apache/fop/fo/properties/KeepTogetherWithinLine.java +++ b/src/org/apache/fop/fo/properties/KeepTogetherWithinLine.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Keep; public class KeepTogetherWithinLine extends Keep { public static final int dataTypes = AUTO | ENUM | INTEGER; diff --git a/src/org/apache/fop/fo/properties/KeepTogetherWithinPage.java b/src/org/apache/fop/fo/properties/KeepTogetherWithinPage.java index caaa6709b..e9616a223 100644 --- a/src/org/apache/fop/fo/properties/KeepTogetherWithinPage.java +++ b/src/org/apache/fop/fo/properties/KeepTogetherWithinPage.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Keep; public class KeepTogetherWithinPage extends Keep { public static final int dataTypes = AUTO | ENUM | INTEGER; diff --git a/src/org/apache/fop/fo/properties/KeepWithNext.java b/src/org/apache/fop/fo/properties/KeepWithNext.java index 2aad7ac80..26b8dec7d 100644 --- a/src/org/apache/fop/fo/properties/KeepWithNext.java +++ b/src/org/apache/fop/fo/properties/KeepWithNext.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Keep; public class KeepWithNext extends Keep { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/KeepWithNextWithinColumn.java b/src/org/apache/fop/fo/properties/KeepWithNextWithinColumn.java index 10382883b..e83cde76e 100644 --- a/src/org/apache/fop/fo/properties/KeepWithNextWithinColumn.java +++ b/src/org/apache/fop/fo/properties/KeepWithNextWithinColumn.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Keep; public class KeepWithNextWithinColumn extends Keep { public static final int dataTypes = AUTO | ENUM | INTEGER; diff --git a/src/org/apache/fop/fo/properties/KeepWithNextWithinLine.java b/src/org/apache/fop/fo/properties/KeepWithNextWithinLine.java index 3e1c65f82..757463559 100644 --- a/src/org/apache/fop/fo/properties/KeepWithNextWithinLine.java +++ b/src/org/apache/fop/fo/properties/KeepWithNextWithinLine.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Keep; public class KeepWithNextWithinLine extends Keep { public static final int dataTypes = AUTO | ENUM | INTEGER; diff --git a/src/org/apache/fop/fo/properties/KeepWithNextWithinPage.java b/src/org/apache/fop/fo/properties/KeepWithNextWithinPage.java index 27259e8f4..b2618eb1f 100644 --- a/src/org/apache/fop/fo/properties/KeepWithNextWithinPage.java +++ b/src/org/apache/fop/fo/properties/KeepWithNextWithinPage.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Keep; public class KeepWithNextWithinPage extends Keep { public static final int dataTypes = AUTO | ENUM | INTEGER; diff --git a/src/org/apache/fop/fo/properties/KeepWithPrevious.java b/src/org/apache/fop/fo/properties/KeepWithPrevious.java index 8150e9244..ef69cb8fe 100644 --- a/src/org/apache/fop/fo/properties/KeepWithPrevious.java +++ b/src/org/apache/fop/fo/properties/KeepWithPrevious.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Keep; public class KeepWithPrevious extends Keep { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/KeepWithPreviousWithinColumn.java b/src/org/apache/fop/fo/properties/KeepWithPreviousWithinColumn.java index 86003fa64..cdd3093c5 100644 --- a/src/org/apache/fop/fo/properties/KeepWithPreviousWithinColumn.java +++ b/src/org/apache/fop/fo/properties/KeepWithPreviousWithinColumn.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Keep; public class KeepWithPreviousWithinColumn extends Keep { public static final int dataTypes = AUTO | ENUM | INTEGER; diff --git a/src/org/apache/fop/fo/properties/KeepWithPreviousWithinLine.java b/src/org/apache/fop/fo/properties/KeepWithPreviousWithinLine.java index b5c84e627..db9a07f9f 100644 --- a/src/org/apache/fop/fo/properties/KeepWithPreviousWithinLine.java +++ b/src/org/apache/fop/fo/properties/KeepWithPreviousWithinLine.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Keep; public class KeepWithPreviousWithinLine extends Keep { public static final int dataTypes = AUTO | ENUM | INTEGER; diff --git a/src/org/apache/fop/fo/properties/KeepWithPreviousWithinPage.java b/src/org/apache/fop/fo/properties/KeepWithPreviousWithinPage.java index 5b3fed7d7..df9785dc6 100644 --- a/src/org/apache/fop/fo/properties/KeepWithPreviousWithinPage.java +++ b/src/org/apache/fop/fo/properties/KeepWithPreviousWithinPage.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Keep; public class KeepWithPreviousWithinPage extends Keep { public static final int dataTypes = AUTO | ENUM | INTEGER; diff --git a/src/org/apache/fop/fo/properties/Language.java b/src/org/apache/fop/fo/properties/Language.java index 86ee26bd8..b7a4e1abd 100644 --- a/src/org/apache/fop/fo/properties/Language.java +++ b/src/org/apache/fop/fo/properties/Language.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Language extends Property { public static final int dataTypes = LANGUAGE_T | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/LastLineEndIndent.java b/src/org/apache/fop/fo/properties/LastLineEndIndent.java index e85fa7b47..72126c236 100644 --- a/src/org/apache/fop/fo/properties/LastLineEndIndent.java +++ b/src/org/apache/fop/fo/properties/LastLineEndIndent.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LastLineEndIndent extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/LeaderAlignment.java b/src/org/apache/fop/fo/properties/LeaderAlignment.java index 3b9a4084d..dc5bdd727 100644 --- a/src/org/apache/fop/fo/properties/LeaderAlignment.java +++ b/src/org/apache/fop/fo/properties/LeaderAlignment.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class LeaderAlignment extends Property { public static final int dataTypes = ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/LeaderLength.java b/src/org/apache/fop/fo/properties/LeaderLength.java index 04d275af4..91ce7ee90 100644 --- a/src/org/apache/fop/fo/properties/LeaderLength.java +++ b/src/org/apache/fop/fo/properties/LeaderLength.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class LeaderLength extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/LeaderLengthMaximum.java b/src/org/apache/fop/fo/properties/LeaderLengthMaximum.java index cde03d90b..27bd5f5ad 100644 --- a/src/org/apache/fop/fo/properties/LeaderLengthMaximum.java +++ b/src/org/apache/fop/fo/properties/LeaderLengthMaximum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.Percentage; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LeaderLengthMaximum extends Property { public static final int dataTypes = LENGTH | PERCENTAGE; diff --git a/src/org/apache/fop/fo/properties/LeaderLengthMinimum.java b/src/org/apache/fop/fo/properties/LeaderLengthMinimum.java index b4b153293..d82145f07 100644 --- a/src/org/apache/fop/fo/properties/LeaderLengthMinimum.java +++ b/src/org/apache/fop/fo/properties/LeaderLengthMinimum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LeaderLengthMinimum extends Property { public static final int dataTypes = LENGTH | PERCENTAGE; diff --git a/src/org/apache/fop/fo/properties/LeaderLengthOptimum.java b/src/org/apache/fop/fo/properties/LeaderLengthOptimum.java index 9992278e0..8d0a04cde 100644 --- a/src/org/apache/fop/fo/properties/LeaderLengthOptimum.java +++ b/src/org/apache/fop/fo/properties/LeaderLengthOptimum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LeaderLengthOptimum extends Property { public static final int dataTypes = LENGTH | PERCENTAGE; diff --git a/src/org/apache/fop/fo/properties/LeaderPattern.java b/src/org/apache/fop/fo/properties/LeaderPattern.java index 7e44891d5..f9ca680cc 100644 --- a/src/org/apache/fop/fo/properties/LeaderPattern.java +++ b/src/org/apache/fop/fo/properties/LeaderPattern.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LeaderPattern extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/LeaderPatternWidth.java b/src/org/apache/fop/fo/properties/LeaderPatternWidth.java index 58cb3387f..2240d01b2 100644 --- a/src/org/apache/fop/fo/properties/LeaderPatternWidth.java +++ b/src/org/apache/fop/fo/properties/LeaderPatternWidth.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LeaderPatternWidth extends Property { public static final int dataTypes = LENGTH | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Left.java b/src/org/apache/fop/fo/properties/Left.java index 36500dfe5..8a11c625d 100644 --- a/src/org/apache/fop/fo/properties/Left.java +++ b/src/org/apache/fop/fo/properties/Left.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Left extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/LetterSpacing.java b/src/org/apache/fop/fo/properties/LetterSpacing.java index ec834791e..e65f89fcf 100644 --- a/src/org/apache/fop/fo/properties/LetterSpacing.java +++ b/src/org/apache/fop/fo/properties/LetterSpacing.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LetterSpacing extends Property { public static final int dataTypes = LENGTH | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/LetterSpacingConditionality.java b/src/org/apache/fop/fo/properties/LetterSpacingConditionality.java index f9f0c386e..f500e993d 100644 --- a/src/org/apache/fop/fo/properties/LetterSpacingConditionality.java +++ b/src/org/apache/fop/fo/properties/LetterSpacingConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Conditionality; +import org.apache.fop.fo.expr.PropertyException; public class LetterSpacingConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/LetterSpacingMaximum.java b/src/org/apache/fop/fo/properties/LetterSpacingMaximum.java index 74d6dffcc..d30dfefef 100644 --- a/src/org/apache/fop/fo/properties/LetterSpacingMaximum.java +++ b/src/org/apache/fop/fo/properties/LetterSpacingMaximum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LetterSpacingMaximum extends Property { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/LetterSpacingMinimum.java b/src/org/apache/fop/fo/properties/LetterSpacingMinimum.java index f5683f9bc..a8f275fe8 100644 --- a/src/org/apache/fop/fo/properties/LetterSpacingMinimum.java +++ b/src/org/apache/fop/fo/properties/LetterSpacingMinimum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LetterSpacingMinimum extends Property { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/LetterSpacingOptimum.java b/src/org/apache/fop/fo/properties/LetterSpacingOptimum.java index 8a33a19f3..17eb9dfd4 100644 --- a/src/org/apache/fop/fo/properties/LetterSpacingOptimum.java +++ b/src/org/apache/fop/fo/properties/LetterSpacingOptimum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LetterSpacingOptimum extends Property { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/LetterSpacingPrecedence.java b/src/org/apache/fop/fo/properties/LetterSpacingPrecedence.java index 800ca7d2d..5c9bc23e3 100644 --- a/src/org/apache/fop/fo/properties/LetterSpacingPrecedence.java +++ b/src/org/apache/fop/fo/properties/LetterSpacingPrecedence.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.PrecedenceCommon; +import org.apache.fop.fo.expr.PropertyException; public class LetterSpacingPrecedence extends PrecedenceCommon { public static final int dataTypes = INTEGER | ENUM; diff --git a/src/org/apache/fop/fo/properties/LetterValue.java b/src/org/apache/fop/fo/properties/LetterValue.java index 2f28a53f4..8bfe74bb6 100644 --- a/src/org/apache/fop/fo/properties/LetterValue.java +++ b/src/org/apache/fop/fo/properties/LetterValue.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class LetterValue extends Property { public static final int dataTypes = AUTO | ENUM; diff --git a/src/org/apache/fop/fo/properties/LineHeight.java b/src/org/apache/fop/fo/properties/LineHeight.java index 645bf9b45..26995f7f1 100644 --- a/src/org/apache/fop/fo/properties/LineHeight.java +++ b/src/org/apache/fop/fo/properties/LineHeight.java @@ -51,13 +51,11 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.Numeric; import org.apache.fop.datatypes.Ems; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.PropNames; +import org.apache.fop.datatypes.Numeric; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class LineHeight extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/LineHeightConditionality.java b/src/org/apache/fop/fo/properties/LineHeightConditionality.java index 3c7715e41..ae7d6a5e8 100644 --- a/src/org/apache/fop/fo/properties/LineHeightConditionality.java +++ b/src/org/apache/fop/fo/properties/LineHeightConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Conditionality; +import org.apache.fop.fo.expr.PropertyException; public class LineHeightConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/LineHeightMaximum.java b/src/org/apache/fop/fo/properties/LineHeightMaximum.java index 2877480f9..519308fc8 100644 --- a/src/org/apache/fop/fo/properties/LineHeightMaximum.java +++ b/src/org/apache/fop/fo/properties/LineHeightMaximum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Ems; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LineHeightMaximum extends Property { public static final int dataTypes = LENGTH | PERCENTAGE; diff --git a/src/org/apache/fop/fo/properties/LineHeightMinimum.java b/src/org/apache/fop/fo/properties/LineHeightMinimum.java index 153659ec0..a7a2c037f 100644 --- a/src/org/apache/fop/fo/properties/LineHeightMinimum.java +++ b/src/org/apache/fop/fo/properties/LineHeightMinimum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Ems; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LineHeightMinimum extends Property { public static final int dataTypes = LENGTH | PERCENTAGE; diff --git a/src/org/apache/fop/fo/properties/LineHeightOptimum.java b/src/org/apache/fop/fo/properties/LineHeightOptimum.java index 83d99b5c6..2075e8c42 100644 --- a/src/org/apache/fop/fo/properties/LineHeightOptimum.java +++ b/src/org/apache/fop/fo/properties/LineHeightOptimum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Ems; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LineHeightOptimum extends Property { public static final int dataTypes = LENGTH | PERCENTAGE; diff --git a/src/org/apache/fop/fo/properties/LineHeightPrecedence.java b/src/org/apache/fop/fo/properties/LineHeightPrecedence.java index c040dae04..f642acb07 100644 --- a/src/org/apache/fop/fo/properties/LineHeightPrecedence.java +++ b/src/org/apache/fop/fo/properties/LineHeightPrecedence.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.PrecedenceCommon; +import org.apache.fop.fo.expr.PropertyException; public class LineHeightPrecedence extends PrecedenceCommon { public static final int dataTypes = INTEGER | ENUM; diff --git a/src/org/apache/fop/fo/properties/LineHeightShiftAdjustment.java b/src/org/apache/fop/fo/properties/LineHeightShiftAdjustment.java index adfb7fa41..8e359c73f 100644 --- a/src/org/apache/fop/fo/properties/LineHeightShiftAdjustment.java +++ b/src/org/apache/fop/fo/properties/LineHeightShiftAdjustment.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LineHeightShiftAdjustment extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/LineStackingStrategy.java b/src/org/apache/fop/fo/properties/LineStackingStrategy.java index 3a30c7f47..41370afad 100644 --- a/src/org/apache/fop/fo/properties/LineStackingStrategy.java +++ b/src/org/apache/fop/fo/properties/LineStackingStrategy.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LineStackingStrategy extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/LinefeedTreatment.java b/src/org/apache/fop/fo/properties/LinefeedTreatment.java index f5e0feb46..7cffb1225 100644 --- a/src/org/apache/fop/fo/properties/LinefeedTreatment.java +++ b/src/org/apache/fop/fo/properties/LinefeedTreatment.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class LinefeedTreatment extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Margin.java b/src/org/apache/fop/fo/properties/Margin.java index 67d6bc6c0..3b74f68e8 100644 --- a/src/org/apache/fop/fo/properties/Margin.java +++ b/src/org/apache/fop/fo/properties/Margin.java @@ -51,20 +51,19 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; +import java.util.Iterator; + +import org.apache.fop.datatypes.Auto; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Auto; -import org.apache.fop.datatypes.indirect.Inherit; -import org.apache.fop.datatypes.indirect.FromParent; +import org.apache.fop.datatypes.PropertyValueList; import org.apache.fop.datatypes.indirect.FromNearestSpecified; -import org.apache.fop.fo.PropNames; +import org.apache.fop.datatypes.indirect.FromParent; +import org.apache.fop.datatypes.indirect.Inherit; import org.apache.fop.fo.FONode; +import org.apache.fop.fo.PropNames; import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.fo.properties.Property; - -import java.util.Iterator; +import org.apache.fop.fo.expr.PropertyException; public class Margin extends Property { public static final int dataTypes = SHORTHAND; diff --git a/src/org/apache/fop/fo/properties/MarginBottom.java b/src/org/apache/fop/fo/properties/MarginBottom.java index 6c5b8d813..f3e0a5a46 100644 --- a/src/org/apache/fop/fo/properties/MarginBottom.java +++ b/src/org/apache/fop/fo/properties/MarginBottom.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class MarginBottom extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/MarginLeft.java b/src/org/apache/fop/fo/properties/MarginLeft.java index 27e59f6d1..164d3d819 100644 --- a/src/org/apache/fop/fo/properties/MarginLeft.java +++ b/src/org/apache/fop/fo/properties/MarginLeft.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class MarginLeft extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/MarginRight.java b/src/org/apache/fop/fo/properties/MarginRight.java index f29cdbf9f..eb31edab6 100644 --- a/src/org/apache/fop/fo/properties/MarginRight.java +++ b/src/org/apache/fop/fo/properties/MarginRight.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class MarginRight extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/MarginTop.java b/src/org/apache/fop/fo/properties/MarginTop.java index 0696b1d18..9906c3f33 100644 --- a/src/org/apache/fop/fo/properties/MarginTop.java +++ b/src/org/apache/fop/fo/properties/MarginTop.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class MarginTop extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/MarkerClassName.java b/src/org/apache/fop/fo/properties/MarkerClassName.java index feac25309..5c99397ac 100644 --- a/src/org/apache/fop/fo/properties/MarkerClassName.java +++ b/src/org/apache/fop/fo/properties/MarkerClassName.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.NCName; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class MarkerClassName extends Property { public static final int dataTypes = NCNAME; diff --git a/src/org/apache/fop/fo/properties/MasterName.java b/src/org/apache/fop/fo/properties/MasterName.java index 57d8f1862..53008a977 100644 --- a/src/org/apache/fop/fo/properties/MasterName.java +++ b/src/org/apache/fop/fo/properties/MasterName.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.NCName; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class MasterName extends Property { public static final int dataTypes = NCNAME; diff --git a/src/org/apache/fop/fo/properties/MasterReference.java b/src/org/apache/fop/fo/properties/MasterReference.java index b8b26d5db..e2e4d9b9e 100644 --- a/src/org/apache/fop/fo/properties/MasterReference.java +++ b/src/org/apache/fop/fo/properties/MasterReference.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.NCName; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class MasterReference extends Property { public static final int dataTypes = NCNAME; diff --git a/src/org/apache/fop/fo/properties/MaxHeight.java b/src/org/apache/fop/fo/properties/MaxHeight.java index 65776aa71..cdc666366 100644 --- a/src/org/apache/fop/fo/properties/MaxHeight.java +++ b/src/org/apache/fop/fo/properties/MaxHeight.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class MaxHeight extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/MaxWidth.java b/src/org/apache/fop/fo/properties/MaxWidth.java index 7827e7856..616529110 100644 --- a/src/org/apache/fop/fo/properties/MaxWidth.java +++ b/src/org/apache/fop/fo/properties/MaxWidth.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class MaxWidth extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/MaximumRepeats.java b/src/org/apache/fop/fo/properties/MaximumRepeats.java index 75dcab727..befd6b872 100644 --- a/src/org/apache/fop/fo/properties/MaximumRepeats.java +++ b/src/org/apache/fop/fo/properties/MaximumRepeats.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class MaximumRepeats extends Property { public static final int dataTypes = NUMBER | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/MediaUsage.java b/src/org/apache/fop/fo/properties/MediaUsage.java index 6b0426a1b..c4681a146 100644 --- a/src/org/apache/fop/fo/properties/MediaUsage.java +++ b/src/org/apache/fop/fo/properties/MediaUsage.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class MediaUsage extends Property { public static final int dataTypes = AUTO | ENUM; diff --git a/src/org/apache/fop/fo/properties/MinHeight.java b/src/org/apache/fop/fo/properties/MinHeight.java index aef9af395..be2f1a588 100644 --- a/src/org/apache/fop/fo/properties/MinHeight.java +++ b/src/org/apache/fop/fo/properties/MinHeight.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class MinHeight extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/MinWidth.java b/src/org/apache/fop/fo/properties/MinWidth.java index 900bc839a..890e5877c 100644 --- a/src/org/apache/fop/fo/properties/MinWidth.java +++ b/src/org/apache/fop/fo/properties/MinWidth.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class MinWidth extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/NoProperty.java b/src/org/apache/fop/fo/properties/NoProperty.java index 69567793e..f38cab4bf 100644 --- a/src/org/apache/fop/fo/properties/NoProperty.java +++ b/src/org/apache/fop/fo/properties/NoProperty.java @@ -1,8 +1,5 @@ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; -import org.apache.fop.datastructs.ROStringArray; public class NoProperty extends Property { // dataTypes was set to ANY_TYPE. This meant that any property diff --git a/src/org/apache/fop/fo/properties/NumberColumnsRepeated.java b/src/org/apache/fop/fo/properties/NumberColumnsRepeated.java index 089338a89..da06a6542 100644 --- a/src/org/apache/fop/fo/properties/NumberColumnsRepeated.java +++ b/src/org/apache/fop/fo/properties/NumberColumnsRepeated.java @@ -52,10 +52,9 @@ package org.apache.fop.fo.properties; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class NumberColumnsRepeated extends Property { public static final int dataTypes = NUMBER; diff --git a/src/org/apache/fop/fo/properties/NumberColumnsSpanned.java b/src/org/apache/fop/fo/properties/NumberColumnsSpanned.java index c38d53031..2582007fa 100644 --- a/src/org/apache/fop/fo/properties/NumberColumnsSpanned.java +++ b/src/org/apache/fop/fo/properties/NumberColumnsSpanned.java @@ -52,10 +52,9 @@ package org.apache.fop.fo.properties; import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class NumberColumnsSpanned extends Property { public static final int dataTypes = NUMBER; diff --git a/src/org/apache/fop/fo/properties/NumberRowsSpanned.java b/src/org/apache/fop/fo/properties/NumberRowsSpanned.java index 4e91a19a5..ae40816c5 100644 --- a/src/org/apache/fop/fo/properties/NumberRowsSpanned.java +++ b/src/org/apache/fop/fo/properties/NumberRowsSpanned.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.IntegerType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class NumberRowsSpanned extends Property { public static final int dataTypes = NUMBER; diff --git a/src/org/apache/fop/fo/properties/OddOrEven.java b/src/org/apache/fop/fo/properties/OddOrEven.java index d341b3924..ea76df9f0 100644 --- a/src/org/apache/fop/fo/properties/OddOrEven.java +++ b/src/org/apache/fop/fo/properties/OddOrEven.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class OddOrEven extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Orphans.java b/src/org/apache/fop/fo/properties/Orphans.java index d43d1bf3c..8997702c3 100644 --- a/src/org/apache/fop/fo/properties/Orphans.java +++ b/src/org/apache/fop/fo/properties/Orphans.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.IntegerType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class Orphans extends Property { public static final int dataTypes = INTEGER | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Overflow.java b/src/org/apache/fop/fo/properties/Overflow.java index 651e09c67..27b72eeb4 100644 --- a/src/org/apache/fop/fo/properties/Overflow.java +++ b/src/org/apache/fop/fo/properties/Overflow.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class Overflow extends Property { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Padding.java b/src/org/apache/fop/fo/properties/Padding.java index acdc175b5..61598b3c5 100644 --- a/src/org/apache/fop/fo/properties/Padding.java +++ b/src/org/apache/fop/fo/properties/Padding.java @@ -51,19 +51,18 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; +import java.util.Iterator; + import org.apache.fop.datatypes.Numeric; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.indirect.Inherit; -import org.apache.fop.datatypes.indirect.FromParent; +import org.apache.fop.datatypes.PropertyValueList; import org.apache.fop.datatypes.indirect.FromNearestSpecified; +import org.apache.fop.datatypes.indirect.FromParent; +import org.apache.fop.datatypes.indirect.Inherit; +import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.Property; - -import java.util.Iterator; +import org.apache.fop.fo.expr.PropertyException; public class Padding extends Property { public static final int dataTypes = SHORTHAND; diff --git a/src/org/apache/fop/fo/properties/PaddingAfter.java b/src/org/apache/fop/fo/properties/PaddingAfter.java index 83e89cf6c..8f2b9d4de 100644 --- a/src/org/apache/fop/fo/properties/PaddingAfter.java +++ b/src/org/apache/fop/fo/properties/PaddingAfter.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class PaddingAfter extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/PaddingAfterConditionality.java b/src/org/apache/fop/fo/properties/PaddingAfterConditionality.java index 00881d0df..d577522cd 100644 --- a/src/org/apache/fop/fo/properties/PaddingAfterConditionality.java +++ b/src/org/apache/fop/fo/properties/PaddingAfterConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Conditionality; +import org.apache.fop.fo.expr.PropertyException; public class PaddingAfterConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/PaddingAfterLength.java b/src/org/apache/fop/fo/properties/PaddingAfterLength.java index 859d13619..ac24eae9a 100644 --- a/src/org/apache/fop/fo/properties/PaddingAfterLength.java +++ b/src/org/apache/fop/fo/properties/PaddingAfterLength.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class PaddingAfterLength extends Property { public static final int dataTypes = PERCENTAGE | LENGTH; diff --git a/src/org/apache/fop/fo/properties/PaddingBefore.java b/src/org/apache/fop/fo/properties/PaddingBefore.java index 7ec0b2898..111105b06 100644 --- a/src/org/apache/fop/fo/properties/PaddingBefore.java +++ b/src/org/apache/fop/fo/properties/PaddingBefore.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class PaddingBefore extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/PaddingBeforeConditionality.java b/src/org/apache/fop/fo/properties/PaddingBeforeConditionality.java index 0461842cc..264f9961f 100644 --- a/src/org/apache/fop/fo/properties/PaddingBeforeConditionality.java +++ b/src/org/apache/fop/fo/properties/PaddingBeforeConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Conditionality; +import org.apache.fop.fo.expr.PropertyException; public class PaddingBeforeConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/PaddingBeforeLength.java b/src/org/apache/fop/fo/properties/PaddingBeforeLength.java index e20b7eda8..da2e17f90 100644 --- a/src/org/apache/fop/fo/properties/PaddingBeforeLength.java +++ b/src/org/apache/fop/fo/properties/PaddingBeforeLength.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class PaddingBeforeLength extends Property { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/PaddingBottom.java b/src/org/apache/fop/fo/properties/PaddingBottom.java index de58072be..8247338b8 100644 --- a/src/org/apache/fop/fo/properties/PaddingBottom.java +++ b/src/org/apache/fop/fo/properties/PaddingBottom.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class PaddingBottom extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/PaddingEnd.java b/src/org/apache/fop/fo/properties/PaddingEnd.java index 467767a3f..750d89a60 100644 --- a/src/org/apache/fop/fo/properties/PaddingEnd.java +++ b/src/org/apache/fop/fo/properties/PaddingEnd.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class PaddingEnd extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/PaddingEndConditionality.java b/src/org/apache/fop/fo/properties/PaddingEndConditionality.java index cc835c921..e4efb9fc3 100644 --- a/src/org/apache/fop/fo/properties/PaddingEndConditionality.java +++ b/src/org/apache/fop/fo/properties/PaddingEndConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Conditionality; +import org.apache.fop.fo.expr.PropertyException; public class PaddingEndConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/PaddingEndLength.java b/src/org/apache/fop/fo/properties/PaddingEndLength.java index 6106084f7..6b4c9fb0b 100644 --- a/src/org/apache/fop/fo/properties/PaddingEndLength.java +++ b/src/org/apache/fop/fo/properties/PaddingEndLength.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class PaddingEndLength extends Property { public static final int dataTypes = PERCENTAGE | LENGTH; diff --git a/src/org/apache/fop/fo/properties/PaddingLeft.java b/src/org/apache/fop/fo/properties/PaddingLeft.java index 41c11b9d9..769382c50 100644 --- a/src/org/apache/fop/fo/properties/PaddingLeft.java +++ b/src/org/apache/fop/fo/properties/PaddingLeft.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class PaddingLeft extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/PaddingRight.java b/src/org/apache/fop/fo/properties/PaddingRight.java index 7ce67a8bf..8ac3ca3a4 100644 --- a/src/org/apache/fop/fo/properties/PaddingRight.java +++ b/src/org/apache/fop/fo/properties/PaddingRight.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class PaddingRight extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/PaddingStart.java b/src/org/apache/fop/fo/properties/PaddingStart.java index ebc0d7b4b..150ca47bc 100644 --- a/src/org/apache/fop/fo/properties/PaddingStart.java +++ b/src/org/apache/fop/fo/properties/PaddingStart.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class PaddingStart extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/PaddingStartConditionality.java b/src/org/apache/fop/fo/properties/PaddingStartConditionality.java index e6041671a..3ad6672ed 100644 --- a/src/org/apache/fop/fo/properties/PaddingStartConditionality.java +++ b/src/org/apache/fop/fo/properties/PaddingStartConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Conditionality; +import org.apache.fop.fo.expr.PropertyException; public class PaddingStartConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/PaddingStartLength.java b/src/org/apache/fop/fo/properties/PaddingStartLength.java index 55ac8678d..ecf60ad38 100644 --- a/src/org/apache/fop/fo/properties/PaddingStartLength.java +++ b/src/org/apache/fop/fo/properties/PaddingStartLength.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class PaddingStartLength extends Property { public static final int dataTypes = PERCENTAGE | LENGTH; diff --git a/src/org/apache/fop/fo/properties/PaddingTop.java b/src/org/apache/fop/fo/properties/PaddingTop.java index 60d5da7df..83dc1cee6 100644 --- a/src/org/apache/fop/fo/properties/PaddingTop.java +++ b/src/org/apache/fop/fo/properties/PaddingTop.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class PaddingTop extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/PageBreakAfter.java b/src/org/apache/fop/fo/properties/PageBreakAfter.java index 6351c8be1..438fc6616 100644 --- a/src/org/apache/fop/fo/properties/PageBreakAfter.java +++ b/src/org/apache/fop/fo/properties/PageBreakAfter.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.PageBreakCommon; public class PageBreakAfter extends PageBreakCommon { } diff --git a/src/org/apache/fop/fo/properties/PageBreakBefore.java b/src/org/apache/fop/fo/properties/PageBreakBefore.java index 1dbe70dc6..0550ff94b 100644 --- a/src/org/apache/fop/fo/properties/PageBreakBefore.java +++ b/src/org/apache/fop/fo/properties/PageBreakBefore.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.PageBreakCommon; public class PageBreakBefore extends PageBreakCommon { } diff --git a/src/org/apache/fop/fo/properties/PageBreakCommon.java b/src/org/apache/fop/fo/properties/PageBreakCommon.java index 195928fe2..c9b874aa7 100644 --- a/src/org/apache/fop/fo/properties/PageBreakCommon.java +++ b/src/org/apache/fop/fo/properties/PageBreakCommon.java @@ -51,22 +51,21 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.NCName; -import org.apache.fop.datatypes.EnumType; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; +import java.util.HashMap; + import org.apache.fop.datatypes.Auto; +import org.apache.fop.datatypes.EnumType; import org.apache.fop.datatypes.Ints; -import org.apache.fop.datatypes.indirect.Inherit; -import org.apache.fop.datatypes.indirect.FromParent; +import org.apache.fop.datatypes.NCName; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; import org.apache.fop.datatypes.indirect.FromNearestSpecified; -import org.apache.fop.fo.PropNames; +import org.apache.fop.datatypes.indirect.FromParent; +import org.apache.fop.datatypes.indirect.Inherit; import org.apache.fop.fo.FONode; +import org.apache.fop.fo.PropNames; import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.fo.properties.Property; - -import java.util.HashMap; +import org.apache.fop.fo.expr.PropertyException; public class PageBreakCommon extends Property { public static final int dataTypes = SHORTHAND | AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/PageBreakInside.java b/src/org/apache/fop/fo/properties/PageBreakInside.java index ca3de3c54..0dbee0590 100644 --- a/src/org/apache/fop/fo/properties/PageBreakInside.java +++ b/src/org/apache/fop/fo/properties/PageBreakInside.java @@ -51,20 +51,17 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.NCName; +import org.apache.fop.datatypes.Auto; import org.apache.fop.datatypes.EnumType; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.datatypes.NCName; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Auto; -import org.apache.fop.datatypes.indirect.Inherit; -import org.apache.fop.datatypes.indirect.FromParent; import org.apache.fop.datatypes.indirect.FromNearestSpecified; +import org.apache.fop.datatypes.indirect.FromParent; +import org.apache.fop.datatypes.indirect.Inherit; +import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class PageBreakInside extends Property { public static final int dataTypes = SHORTHAND | AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/PageHeight.java b/src/org/apache/fop/fo/properties/PageHeight.java index 051cfd1c7..2ec6c3505 100644 --- a/src/org/apache/fop/fo/properties/PageHeight.java +++ b/src/org/apache/fop/fo/properties/PageHeight.java @@ -51,9 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.PageHeightWidth; public class PageHeight extends PageHeightWidth { public static final int dataTypes = LENGTH | AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/PageHeightWidth.java b/src/org/apache/fop/fo/properties/PageHeightWidth.java index 027cb18ab..81d4214be 100644 --- a/src/org/apache/fop/fo/properties/PageHeightWidth.java +++ b/src/org/apache/fop/fo/properties/PageHeightWidth.java @@ -52,7 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class PageHeightWidth extends Property { diff --git a/src/org/apache/fop/fo/properties/PagePosition.java b/src/org/apache/fop/fo/properties/PagePosition.java index 0bb3cca6a..ed22e887a 100644 --- a/src/org/apache/fop/fo/properties/PagePosition.java +++ b/src/org/apache/fop/fo/properties/PagePosition.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class PagePosition extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/PageWidth.java b/src/org/apache/fop/fo/properties/PageWidth.java index d4e91344a..8d9727ce2 100644 --- a/src/org/apache/fop/fo/properties/PageWidth.java +++ b/src/org/apache/fop/fo/properties/PageWidth.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.PageHeightWidth; public class PageWidth extends PageHeightWidth { public static final int dataTypes = LENGTH | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Pause.java b/src/org/apache/fop/fo/properties/Pause.java index 26787b198..23e384695 100644 --- a/src/org/apache/fop/fo/properties/Pause.java +++ b/src/org/apache/fop/fo/properties/Pause.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Pause extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/PauseAfter.java b/src/org/apache/fop/fo/properties/PauseAfter.java index 83ca2051d..8190fd796 100644 --- a/src/org/apache/fop/fo/properties/PauseAfter.java +++ b/src/org/apache/fop/fo/properties/PauseAfter.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class PauseAfter extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/PauseBefore.java b/src/org/apache/fop/fo/properties/PauseBefore.java index 047ef014c..52ba9eed0 100644 --- a/src/org/apache/fop/fo/properties/PauseBefore.java +++ b/src/org/apache/fop/fo/properties/PauseBefore.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class PauseBefore extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/Pitch.java b/src/org/apache/fop/fo/properties/Pitch.java index 2fc5b23f0..bb99c182d 100644 --- a/src/org/apache/fop/fo/properties/Pitch.java +++ b/src/org/apache/fop/fo/properties/Pitch.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Pitch extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/PitchRange.java b/src/org/apache/fop/fo/properties/PitchRange.java index f7fed7004..dc032e473 100644 --- a/src/org/apache/fop/fo/properties/PitchRange.java +++ b/src/org/apache/fop/fo/properties/PitchRange.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class PitchRange extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/PlayDuring.java b/src/org/apache/fop/fo/properties/PlayDuring.java index 6cd7bc876..6a999fdfe 100644 --- a/src/org/apache/fop/fo/properties/PlayDuring.java +++ b/src/org/apache/fop/fo/properties/PlayDuring.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class PlayDuring extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/Position.java b/src/org/apache/fop/fo/properties/Position.java index 0c09a7977..c4d327e77 100644 --- a/src/org/apache/fop/fo/properties/Position.java +++ b/src/org/apache/fop/fo/properties/Position.java @@ -51,20 +51,18 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.NCName; +import org.apache.fop.datatypes.Auto; import org.apache.fop.datatypes.EnumType; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.datatypes.NCName; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Auto; -import org.apache.fop.datatypes.indirect.Inherit; -import org.apache.fop.datatypes.indirect.FromParent; +import org.apache.fop.datatypes.PropertyValueList; import org.apache.fop.datatypes.indirect.FromNearestSpecified; +import org.apache.fop.datatypes.indirect.FromParent; +import org.apache.fop.datatypes.indirect.Inherit; +import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class Position extends Property { public static final int dataTypes = SHORTHAND | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Precedence.java b/src/org/apache/fop/fo/properties/Precedence.java index 1d3e16015..29460e20a 100644 --- a/src/org/apache/fop/fo/properties/Precedence.java +++ b/src/org/apache/fop/fo/properties/Precedence.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Bool; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class Precedence extends Property { public static final int dataTypes = BOOL | INHERIT; diff --git a/src/org/apache/fop/fo/properties/PrecedenceCommon.java b/src/org/apache/fop/fo/properties/PrecedenceCommon.java index e12f02bbe..59e7b6fef 100644 --- a/src/org/apache/fop/fo/properties/PrecedenceCommon.java +++ b/src/org/apache/fop/fo/properties/PrecedenceCommon.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class PrecedenceCommon extends Property { public static final int FORCE = 1; diff --git a/src/org/apache/fop/fo/properties/Property.java b/src/org/apache/fop/fo/properties/Property.java index da4f2723f..158d08e8d 100644 --- a/src/org/apache/fop/fo/properties/Property.java +++ b/src/org/apache/fop/fo/properties/Property.java @@ -55,63 +55,33 @@ package org.apache.fop.fo.properties; -import java.lang.Class; -import java.lang.reflect.Method; - import java.util.Iterator; -import java.util.ListIterator; -import java.util.HashMap; import java.util.Map; -import java.util.LinkedList; -import java.util.Collections; - -import org.apache.fop.messaging.MessageHandler; -import org.apache.fop.fo.FONode; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.ShorthandPropSets; -import org.apache.fop.fo.FOTree; -import org.apache.fop.fo.FOPropertySets; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.AbstractPropertyValue; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.expr.PropertyNotImplementedException; -import org.apache.fop.fo.expr.SystemFontFunction; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.datastructs.ROIntArray; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.datatypes.NoType; -import org.apache.fop.datatypes.StringType; -import org.apache.fop.datatypes.NCName; +import org.apache.fop.datatypes.Auto; +import org.apache.fop.datatypes.ColorType; import org.apache.fop.datatypes.CountryType; -import org.apache.fop.datatypes.LanguageType; -import org.apache.fop.datatypes.ScriptType; -import org.apache.fop.datatypes.UriType; -import org.apache.fop.datatypes.MimeType; -import org.apache.fop.datatypes.Length; -import org.apache.fop.datatypes.Ems; -import org.apache.fop.datatypes.Percentage; -import org.apache.fop.datatypes.Angle; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.LanguageType; import org.apache.fop.datatypes.MappedNumeric; -import org.apache.fop.datatypes.IntegerType; -import org.apache.fop.datatypes.Numeric; -import org.apache.fop.datatypes.Bool; -import org.apache.fop.datatypes.Literal; -import org.apache.fop.datatypes.Auto; +import org.apache.fop.datatypes.NCName; +import org.apache.fop.datatypes.NoType; import org.apache.fop.datatypes.None; -import org.apache.fop.datatypes.ColorType; -import org.apache.fop.datatypes.FontFamilySet; -import org.apache.fop.datatypes.TextDecorations; -import org.apache.fop.datatypes.TextDecorator; -import org.apache.fop.datatypes.ShadowEffect; -import org.apache.fop.datatypes.Slash; +import org.apache.fop.datatypes.Numeric; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; +import org.apache.fop.datatypes.ScriptType; +import org.apache.fop.datatypes.indirect.FromNearestSpecified; +import org.apache.fop.datatypes.indirect.FromParent; import org.apache.fop.datatypes.indirect.Inherit; import org.apache.fop.datatypes.indirect.InheritedValue; -import org.apache.fop.datatypes.indirect.FromParent; -import org.apache.fop.datatypes.indirect.FromNearestSpecified; +import org.apache.fop.fo.FONode; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.PropertyConsts; +import org.apache.fop.fo.ShorthandPropSets; +import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.expr.PropertyNotImplementedException; +import org.apache.fop.messaging.MessageHandler; /** * Parent class for all of the individual property classes. It also contains diff --git a/src/org/apache/fop/fo/properties/ProvisionalDistanceBetweenStarts.java b/src/org/apache/fop/fo/properties/ProvisionalDistanceBetweenStarts.java index 10262b00e..5e5b28333 100644 --- a/src/org/apache/fop/fo/properties/ProvisionalDistanceBetweenStarts.java +++ b/src/org/apache/fop/fo/properties/ProvisionalDistanceBetweenStarts.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class ProvisionalDistanceBetweenStarts extends Property { public static final int dataTypes = LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/ProvisionalLabelSeparation.java b/src/org/apache/fop/fo/properties/ProvisionalLabelSeparation.java index 600e07401..54ec8adf2 100644 --- a/src/org/apache/fop/fo/properties/ProvisionalLabelSeparation.java +++ b/src/org/apache/fop/fo/properties/ProvisionalLabelSeparation.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class ProvisionalLabelSeparation extends Property { public static final int dataTypes = LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/RefId.java b/src/org/apache/fop/fo/properties/RefId.java index fbf75e35f..d2265e164 100644 --- a/src/org/apache/fop/fo/properties/RefId.java +++ b/src/org/apache/fop/fo/properties/RefId.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class RefId extends Property { public static final int dataTypes = NCNAME | INHERIT; diff --git a/src/org/apache/fop/fo/properties/ReferenceOrientation.java b/src/org/apache/fop/fo/properties/ReferenceOrientation.java index e4ef9d561..96b188052 100644 --- a/src/org/apache/fop/fo/properties/ReferenceOrientation.java +++ b/src/org/apache/fop/fo/properties/ReferenceOrientation.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.IntegerType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class ReferenceOrientation extends Property { public static final int dataTypes = INTEGER | INHERIT; diff --git a/src/org/apache/fop/fo/properties/RegionName.java b/src/org/apache/fop/fo/properties/RegionName.java index ca6d999c7..0f0ad6182 100644 --- a/src/org/apache/fop/fo/properties/RegionName.java +++ b/src/org/apache/fop/fo/properties/RegionName.java @@ -51,14 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.fo.properties.Property; - -import java.util.Map; import java.util.HashMap; -import java.util.Collections; + +import org.apache.fop.datatypes.Ints; +import org.apache.fop.fo.expr.PropertyException; public class RegionName extends Property { public static final int dataTypes = NCNAME | ENUM; diff --git a/src/org/apache/fop/fo/properties/RelativeAlign.java b/src/org/apache/fop/fo/properties/RelativeAlign.java index 24ca71a0c..02a245084 100644 --- a/src/org/apache/fop/fo/properties/RelativeAlign.java +++ b/src/org/apache/fop/fo/properties/RelativeAlign.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class RelativeAlign extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/RelativePosition.java b/src/org/apache/fop/fo/properties/RelativePosition.java index 41a98d9f4..e0ef131d6 100644 --- a/src/org/apache/fop/fo/properties/RelativePosition.java +++ b/src/org/apache/fop/fo/properties/RelativePosition.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class RelativePosition extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/RenderingIntent.java b/src/org/apache/fop/fo/properties/RenderingIntent.java index 28dc98168..1b38b55ea 100644 --- a/src/org/apache/fop/fo/properties/RenderingIntent.java +++ b/src/org/apache/fop/fo/properties/RenderingIntent.java @@ -51,14 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.datatypes.Ints; -import org.apache.fop.fo.properties.Property; - -import java.util.Map; import java.util.HashMap; -import java.util.Collections; + +import org.apache.fop.datatypes.Ints; +import org.apache.fop.fo.expr.PropertyException; public class RenderingIntent extends Property { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/RetrieveBoundary.java b/src/org/apache/fop/fo/properties/RetrieveBoundary.java index 7f501cc56..022f61f61 100644 --- a/src/org/apache/fop/fo/properties/RetrieveBoundary.java +++ b/src/org/apache/fop/fo/properties/RetrieveBoundary.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class RetrieveBoundary extends Property { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/RetrieveClassName.java b/src/org/apache/fop/fo/properties/RetrieveClassName.java index 23259fa7c..0eb0a2d6d 100644 --- a/src/org/apache/fop/fo/properties/RetrieveClassName.java +++ b/src/org/apache/fop/fo/properties/RetrieveClassName.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class RetrieveClassName extends Property { public static final int dataTypes = NCNAME; diff --git a/src/org/apache/fop/fo/properties/RetrievePosition.java b/src/org/apache/fop/fo/properties/RetrievePosition.java index ed5b83cab..cb1d95113 100644 --- a/src/org/apache/fop/fo/properties/RetrievePosition.java +++ b/src/org/apache/fop/fo/properties/RetrievePosition.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class RetrievePosition extends Property { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/Richness.java b/src/org/apache/fop/fo/properties/Richness.java index 1b8a66a4c..0de3cba2f 100644 --- a/src/org/apache/fop/fo/properties/Richness.java +++ b/src/org/apache/fop/fo/properties/Richness.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Richness extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/Right.java b/src/org/apache/fop/fo/properties/Right.java index 055792ae9..d1790e7d9 100644 --- a/src/org/apache/fop/fo/properties/Right.java +++ b/src/org/apache/fop/fo/properties/Right.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Right extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/Role.java b/src/org/apache/fop/fo/properties/Role.java index 7a2f8d804..dbba8016d 100644 --- a/src/org/apache/fop/fo/properties/Role.java +++ b/src/org/apache/fop/fo/properties/Role.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Role extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/RuleStyle.java b/src/org/apache/fop/fo/properties/RuleStyle.java index 0721aedca..21d830190 100644 --- a/src/org/apache/fop/fo/properties/RuleStyle.java +++ b/src/org/apache/fop/fo/properties/RuleStyle.java @@ -51,17 +51,13 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; +import java.util.HashMap; + import org.apache.fop.datatypes.EnumType; import org.apache.fop.datatypes.Ints; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; - -import java.util.Map; -import java.util.HashMap; -import java.util.Collections; +import org.apache.fop.fo.expr.PropertyException; public class RuleStyle extends Property { public static final int dataTypes = ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/RuleThickness.java b/src/org/apache/fop/fo/properties/RuleThickness.java index 78f16e19c..8277f74a9 100644 --- a/src/org/apache/fop/fo/properties/RuleThickness.java +++ b/src/org/apache/fop/fo/properties/RuleThickness.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class RuleThickness extends Property { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/Scaling.java b/src/org/apache/fop/fo/properties/Scaling.java index 1ed29aa41..15bd33808 100644 --- a/src/org/apache/fop/fo/properties/Scaling.java +++ b/src/org/apache/fop/fo/properties/Scaling.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class Scaling extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/ScalingMethod.java b/src/org/apache/fop/fo/properties/ScalingMethod.java index e00511637..6feabd09d 100644 --- a/src/org/apache/fop/fo/properties/ScalingMethod.java +++ b/src/org/apache/fop/fo/properties/ScalingMethod.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class ScalingMethod extends Property { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/ScoreSpaces.java b/src/org/apache/fop/fo/properties/ScoreSpaces.java index 6f8205bf5..d726f587d 100644 --- a/src/org/apache/fop/fo/properties/ScoreSpaces.java +++ b/src/org/apache/fop/fo/properties/ScoreSpaces.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Bool; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class ScoreSpaces extends Property { public static final int dataTypes = BOOL | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Script.java b/src/org/apache/fop/fo/properties/Script.java index a159cc681..99cf0f127 100644 --- a/src/org/apache/fop/fo/properties/Script.java +++ b/src/org/apache/fop/fo/properties/Script.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Script extends Property { public static final int dataTypes = SCRIPT_T | AUTO | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/ShowDestination.java b/src/org/apache/fop/fo/properties/ShowDestination.java index 6d053a793..21714b4f5 100644 --- a/src/org/apache/fop/fo/properties/ShowDestination.java +++ b/src/org/apache/fop/fo/properties/ShowDestination.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class ShowDestination extends Property { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/Size.java b/src/org/apache/fop/fo/properties/Size.java index d7b7087fb..ed9377b6e 100644 --- a/src/org/apache/fop/fo/properties/Size.java +++ b/src/org/apache/fop/fo/properties/Size.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class Size extends Property { public static final int dataTypes = SHORTHAND | AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/SourceDocument.java b/src/org/apache/fop/fo/properties/SourceDocument.java index b12266f58..6a35b190e 100644 --- a/src/org/apache/fop/fo/properties/SourceDocument.java +++ b/src/org/apache/fop/fo/properties/SourceDocument.java @@ -51,15 +51,14 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.FONode; -import org.apache.fop.fo.PropNames; +import java.util.Iterator; + import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.PropertyValueList; import org.apache.fop.datatypes.UriType; -import org.apache.fop.fo.properties.Property; - -import java.util.Iterator; +import org.apache.fop.fo.FONode; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class SourceDocument extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/SpaceAfter.java b/src/org/apache/fop/fo/properties/SpaceAfter.java index 04ab1145c..49c3e47a1 100644 --- a/src/org/apache/fop/fo/properties/SpaceAfter.java +++ b/src/org/apache/fop/fo/properties/SpaceAfter.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceAfter extends Property { public static final int dataTypes = COMPOUND | LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/SpaceAfterConditionality.java b/src/org/apache/fop/fo/properties/SpaceAfterConditionality.java index ac3f02963..b74566523 100644 --- a/src/org/apache/fop/fo/properties/SpaceAfterConditionality.java +++ b/src/org/apache/fop/fo/properties/SpaceAfterConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Conditionality; +import org.apache.fop.fo.expr.PropertyException; public class SpaceAfterConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/SpaceAfterMaximum.java b/src/org/apache/fop/fo/properties/SpaceAfterMaximum.java index 04c841289..6cec962da 100644 --- a/src/org/apache/fop/fo/properties/SpaceAfterMaximum.java +++ b/src/org/apache/fop/fo/properties/SpaceAfterMaximum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceAfterMaximum extends Property { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/SpaceAfterMinimum.java b/src/org/apache/fop/fo/properties/SpaceAfterMinimum.java index 06eecf6d2..a295a2504 100644 --- a/src/org/apache/fop/fo/properties/SpaceAfterMinimum.java +++ b/src/org/apache/fop/fo/properties/SpaceAfterMinimum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceAfterMinimum extends Property { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/SpaceAfterOptimum.java b/src/org/apache/fop/fo/properties/SpaceAfterOptimum.java index a8ea35029..7ab1f7381 100644 --- a/src/org/apache/fop/fo/properties/SpaceAfterOptimum.java +++ b/src/org/apache/fop/fo/properties/SpaceAfterOptimum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceAfterOptimum extends Property { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/SpaceAfterPrecedence.java b/src/org/apache/fop/fo/properties/SpaceAfterPrecedence.java index 7ff8a2531..fbcb1d985 100644 --- a/src/org/apache/fop/fo/properties/SpaceAfterPrecedence.java +++ b/src/org/apache/fop/fo/properties/SpaceAfterPrecedence.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.IntegerType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.PrecedenceCommon; +import org.apache.fop.fo.expr.PropertyException; public class SpaceAfterPrecedence extends PrecedenceCommon { public static final int dataTypes = INTEGER | ENUM; diff --git a/src/org/apache/fop/fo/properties/SpaceBefore.java b/src/org/apache/fop/fo/properties/SpaceBefore.java index 1cfe68b65..642a24fd7 100644 --- a/src/org/apache/fop/fo/properties/SpaceBefore.java +++ b/src/org/apache/fop/fo/properties/SpaceBefore.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceBefore extends Property { public static final int dataTypes = COMPOUND | LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/SpaceBeforeConditionality.java b/src/org/apache/fop/fo/properties/SpaceBeforeConditionality.java index 438d799ce..3b80c6008 100644 --- a/src/org/apache/fop/fo/properties/SpaceBeforeConditionality.java +++ b/src/org/apache/fop/fo/properties/SpaceBeforeConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Conditionality; +import org.apache.fop.fo.expr.PropertyException; public class SpaceBeforeConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/SpaceBeforeMaximum.java b/src/org/apache/fop/fo/properties/SpaceBeforeMaximum.java index 34edfb49f..dc769efe9 100644 --- a/src/org/apache/fop/fo/properties/SpaceBeforeMaximum.java +++ b/src/org/apache/fop/fo/properties/SpaceBeforeMaximum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceBeforeMaximum extends Property { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/SpaceBeforeMinimum.java b/src/org/apache/fop/fo/properties/SpaceBeforeMinimum.java index 91a493b61..cadb6dca9 100644 --- a/src/org/apache/fop/fo/properties/SpaceBeforeMinimum.java +++ b/src/org/apache/fop/fo/properties/SpaceBeforeMinimum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceBeforeMinimum extends Property { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/SpaceBeforeOptimum.java b/src/org/apache/fop/fo/properties/SpaceBeforeOptimum.java index adbd6d995..afdf3f73c 100644 --- a/src/org/apache/fop/fo/properties/SpaceBeforeOptimum.java +++ b/src/org/apache/fop/fo/properties/SpaceBeforeOptimum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceBeforeOptimum extends Property { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/SpaceBeforePrecedence.java b/src/org/apache/fop/fo/properties/SpaceBeforePrecedence.java index b48018dca..824446a03 100644 --- a/src/org/apache/fop/fo/properties/SpaceBeforePrecedence.java +++ b/src/org/apache/fop/fo/properties/SpaceBeforePrecedence.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.IntegerType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.PrecedenceCommon; +import org.apache.fop.fo.expr.PropertyException; public class SpaceBeforePrecedence extends PrecedenceCommon { public static final int dataTypes = INTEGER | ENUM; diff --git a/src/org/apache/fop/fo/properties/SpaceEnd.java b/src/org/apache/fop/fo/properties/SpaceEnd.java index 113bb1d94..4e1809b6c 100644 --- a/src/org/apache/fop/fo/properties/SpaceEnd.java +++ b/src/org/apache/fop/fo/properties/SpaceEnd.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceEnd extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/SpaceEndConditionality.java b/src/org/apache/fop/fo/properties/SpaceEndConditionality.java index 734ecffe4..1afc4246f 100644 --- a/src/org/apache/fop/fo/properties/SpaceEndConditionality.java +++ b/src/org/apache/fop/fo/properties/SpaceEndConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Conditionality; +import org.apache.fop.fo.expr.PropertyException; public class SpaceEndConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/SpaceEndMaximum.java b/src/org/apache/fop/fo/properties/SpaceEndMaximum.java index ee267b557..8407d613f 100644 --- a/src/org/apache/fop/fo/properties/SpaceEndMaximum.java +++ b/src/org/apache/fop/fo/properties/SpaceEndMaximum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceEndMaximum extends Property { public static final int dataTypes = LENGTH | PERCENTAGE; diff --git a/src/org/apache/fop/fo/properties/SpaceEndMinimum.java b/src/org/apache/fop/fo/properties/SpaceEndMinimum.java index 0eb65a29e..cd3b3ebfd 100644 --- a/src/org/apache/fop/fo/properties/SpaceEndMinimum.java +++ b/src/org/apache/fop/fo/properties/SpaceEndMinimum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceEndMinimum extends Property { public static final int dataTypes = LENGTH | PERCENTAGE; diff --git a/src/org/apache/fop/fo/properties/SpaceEndOptimum.java b/src/org/apache/fop/fo/properties/SpaceEndOptimum.java index 46b8d9b38..25612115d 100644 --- a/src/org/apache/fop/fo/properties/SpaceEndOptimum.java +++ b/src/org/apache/fop/fo/properties/SpaceEndOptimum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceEndOptimum extends Property { public static final int dataTypes = LENGTH | PERCENTAGE; diff --git a/src/org/apache/fop/fo/properties/SpaceEndPrecedence.java b/src/org/apache/fop/fo/properties/SpaceEndPrecedence.java index 7dd6f4b85..a604998a2 100644 --- a/src/org/apache/fop/fo/properties/SpaceEndPrecedence.java +++ b/src/org/apache/fop/fo/properties/SpaceEndPrecedence.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.IntegerType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.PrecedenceCommon; +import org.apache.fop.fo.expr.PropertyException; public class SpaceEndPrecedence extends PrecedenceCommon { public static final int dataTypes = INTEGER | ENUM; diff --git a/src/org/apache/fop/fo/properties/SpaceStart.java b/src/org/apache/fop/fo/properties/SpaceStart.java index e4747947f..fdf85cbad 100644 --- a/src/org/apache/fop/fo/properties/SpaceStart.java +++ b/src/org/apache/fop/fo/properties/SpaceStart.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceStart extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/SpaceStartConditionality.java b/src/org/apache/fop/fo/properties/SpaceStartConditionality.java index 934e98ce0..6710bdb77 100644 --- a/src/org/apache/fop/fo/properties/SpaceStartConditionality.java +++ b/src/org/apache/fop/fo/properties/SpaceStartConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Conditionality; +import org.apache.fop.fo.expr.PropertyException; public class SpaceStartConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/SpaceStartMaximum.java b/src/org/apache/fop/fo/properties/SpaceStartMaximum.java index d8ba2dd10..0babc8760 100644 --- a/src/org/apache/fop/fo/properties/SpaceStartMaximum.java +++ b/src/org/apache/fop/fo/properties/SpaceStartMaximum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceStartMaximum extends Property { public static final int dataTypes = LENGTH | PERCENTAGE; diff --git a/src/org/apache/fop/fo/properties/SpaceStartMinimum.java b/src/org/apache/fop/fo/properties/SpaceStartMinimum.java index f0c084046..5712338c4 100644 --- a/src/org/apache/fop/fo/properties/SpaceStartMinimum.java +++ b/src/org/apache/fop/fo/properties/SpaceStartMinimum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceStartMinimum extends Property { public static final int dataTypes = LENGTH | PERCENTAGE; diff --git a/src/org/apache/fop/fo/properties/SpaceStartOptimum.java b/src/org/apache/fop/fo/properties/SpaceStartOptimum.java index 2e21d5eab..b2526bfe0 100644 --- a/src/org/apache/fop/fo/properties/SpaceStartOptimum.java +++ b/src/org/apache/fop/fo/properties/SpaceStartOptimum.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class SpaceStartOptimum extends Property { public static final int dataTypes = LENGTH | PERCENTAGE; diff --git a/src/org/apache/fop/fo/properties/SpaceStartPrecedence.java b/src/org/apache/fop/fo/properties/SpaceStartPrecedence.java index c1d2d9d60..0b40c62a9 100644 --- a/src/org/apache/fop/fo/properties/SpaceStartPrecedence.java +++ b/src/org/apache/fop/fo/properties/SpaceStartPrecedence.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.IntegerType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.PrecedenceCommon; +import org.apache.fop.fo.expr.PropertyException; public class SpaceStartPrecedence extends PrecedenceCommon { public static final int dataTypes = INTEGER | ENUM; diff --git a/src/org/apache/fop/fo/properties/Span.java b/src/org/apache/fop/fo/properties/Span.java index f91902147..b140db42e 100644 --- a/src/org/apache/fop/fo/properties/Span.java +++ b/src/org/apache/fop/fo/properties/Span.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class Span extends Property { public static final int dataTypes = ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Speak.java b/src/org/apache/fop/fo/properties/Speak.java index ee98014ba..659c064db 100644 --- a/src/org/apache/fop/fo/properties/Speak.java +++ b/src/org/apache/fop/fo/properties/Speak.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Speak extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/SpeakHeader.java b/src/org/apache/fop/fo/properties/SpeakHeader.java index 833cd82b9..45d5e59e6 100644 --- a/src/org/apache/fop/fo/properties/SpeakHeader.java +++ b/src/org/apache/fop/fo/properties/SpeakHeader.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class SpeakHeader extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/SpeakNumeral.java b/src/org/apache/fop/fo/properties/SpeakNumeral.java index 29a4bcf65..c2163625e 100644 --- a/src/org/apache/fop/fo/properties/SpeakNumeral.java +++ b/src/org/apache/fop/fo/properties/SpeakNumeral.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class SpeakNumeral extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/SpeakPunctuation.java b/src/org/apache/fop/fo/properties/SpeakPunctuation.java index 301e67218..70b74fffc 100644 --- a/src/org/apache/fop/fo/properties/SpeakPunctuation.java +++ b/src/org/apache/fop/fo/properties/SpeakPunctuation.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class SpeakPunctuation extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/SpeechRate.java b/src/org/apache/fop/fo/properties/SpeechRate.java index 767e26911..ed27066c1 100644 --- a/src/org/apache/fop/fo/properties/SpeechRate.java +++ b/src/org/apache/fop/fo/properties/SpeechRate.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class SpeechRate extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/Src.java b/src/org/apache/fop/fo/properties/Src.java index 7d1151db1..5220512b6 100644 --- a/src/org/apache/fop/fo/properties/Src.java +++ b/src/org/apache/fop/fo/properties/Src.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Src extends Property { public static final int dataTypes = URI_SPECIFICATION | INHERIT; diff --git a/src/org/apache/fop/fo/properties/StartIndent.java b/src/org/apache/fop/fo/properties/StartIndent.java index 5180337ae..70b41dcb9 100644 --- a/src/org/apache/fop/fo/properties/StartIndent.java +++ b/src/org/apache/fop/fo/properties/StartIndent.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class StartIndent extends Property { public static final int dataTypes = LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/StartingState.java b/src/org/apache/fop/fo/properties/StartingState.java index cfad14d33..2b0b74863 100644 --- a/src/org/apache/fop/fo/properties/StartingState.java +++ b/src/org/apache/fop/fo/properties/StartingState.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class StartingState extends Property { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/StartsRow.java b/src/org/apache/fop/fo/properties/StartsRow.java index f7df98bfd..469b6e9ce 100644 --- a/src/org/apache/fop/fo/properties/StartsRow.java +++ b/src/org/apache/fop/fo/properties/StartsRow.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Bool; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class StartsRow extends Property { public static final int dataTypes = BOOL; diff --git a/src/org/apache/fop/fo/properties/Stress.java b/src/org/apache/fop/fo/properties/Stress.java index d2e22f9ab..140cb755d 100644 --- a/src/org/apache/fop/fo/properties/Stress.java +++ b/src/org/apache/fop/fo/properties/Stress.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Stress extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/SuppressAtLineBreak.java b/src/org/apache/fop/fo/properties/SuppressAtLineBreak.java index 89cdcf703..fcca38da5 100644 --- a/src/org/apache/fop/fo/properties/SuppressAtLineBreak.java +++ b/src/org/apache/fop/fo/properties/SuppressAtLineBreak.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class SuppressAtLineBreak extends Property { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/SwitchTo.java b/src/org/apache/fop/fo/properties/SwitchTo.java index bc067d654..6273c821f 100644 --- a/src/org/apache/fop/fo/properties/SwitchTo.java +++ b/src/org/apache/fop/fo/properties/SwitchTo.java @@ -51,16 +51,15 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.NCName; +import java.util.Iterator; + import org.apache.fop.datatypes.EnumType; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.datatypes.NCName; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.PropNames; +import org.apache.fop.datatypes.PropertyValueList; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.Property; - -import java.util.Iterator; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class SwitchTo extends Property { public static final int dataTypes = COMPLEX; diff --git a/src/org/apache/fop/fo/properties/TableLayout.java b/src/org/apache/fop/fo/properties/TableLayout.java index 0f492ed34..e10cc7ef1 100644 --- a/src/org/apache/fop/fo/properties/TableLayout.java +++ b/src/org/apache/fop/fo/properties/TableLayout.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class TableLayout extends Property { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/TableOmitFooterAtBreak.java b/src/org/apache/fop/fo/properties/TableOmitFooterAtBreak.java index 3b34e173a..002ed0d8b 100644 --- a/src/org/apache/fop/fo/properties/TableOmitFooterAtBreak.java +++ b/src/org/apache/fop/fo/properties/TableOmitFooterAtBreak.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Bool; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class TableOmitFooterAtBreak extends Property { public static final int dataTypes = BOOL; diff --git a/src/org/apache/fop/fo/properties/TableOmitHeaderAtBreak.java b/src/org/apache/fop/fo/properties/TableOmitHeaderAtBreak.java index 001e1caf0..e201a9c7e 100644 --- a/src/org/apache/fop/fo/properties/TableOmitHeaderAtBreak.java +++ b/src/org/apache/fop/fo/properties/TableOmitHeaderAtBreak.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Bool; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class TableOmitHeaderAtBreak extends Property { public static final int dataTypes = BOOL; diff --git a/src/org/apache/fop/fo/properties/TargetPresentationContext.java b/src/org/apache/fop/fo/properties/TargetPresentationContext.java index bbdd502db..dd6bd2c23 100644 --- a/src/org/apache/fop/fo/properties/TargetPresentationContext.java +++ b/src/org/apache/fop/fo/properties/TargetPresentationContext.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class TargetPresentationContext extends Property { public static final int dataTypes = URI_SPECIFICATION | ENUM; diff --git a/src/org/apache/fop/fo/properties/TargetProcessingContext.java b/src/org/apache/fop/fo/properties/TargetProcessingContext.java index 89ad6942d..488cd19a1 100644 --- a/src/org/apache/fop/fo/properties/TargetProcessingContext.java +++ b/src/org/apache/fop/fo/properties/TargetProcessingContext.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class TargetProcessingContext extends Property { public static final int dataTypes = URI_SPECIFICATION | ENUM; diff --git a/src/org/apache/fop/fo/properties/TargetStylesheet.java b/src/org/apache/fop/fo/properties/TargetStylesheet.java index 31965e921..4c9fa76f7 100644 --- a/src/org/apache/fop/fo/properties/TargetStylesheet.java +++ b/src/org/apache/fop/fo/properties/TargetStylesheet.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class TargetStylesheet extends Property { public static final int dataTypes = URI_SPECIFICATION | ENUM; diff --git a/src/org/apache/fop/fo/properties/TextAlign.java b/src/org/apache/fop/fo/properties/TextAlign.java index 306057b90..085ac9800 100644 --- a/src/org/apache/fop/fo/properties/TextAlign.java +++ b/src/org/apache/fop/fo/properties/TextAlign.java @@ -51,16 +51,13 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; +import java.util.HashMap; + import org.apache.fop.datatypes.EnumType; import org.apache.fop.datatypes.Ints; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; -import java.util.Map; -import java.util.HashMap; -import java.util.Collections; +import org.apache.fop.fo.expr.PropertyException; public class TextAlign extends Property { public static final int dataTypes = LITERAL | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/TextAlignLast.java b/src/org/apache/fop/fo/properties/TextAlignLast.java index ec8f3007f..26a662656 100644 --- a/src/org/apache/fop/fo/properties/TextAlignLast.java +++ b/src/org/apache/fop/fo/properties/TextAlignLast.java @@ -51,16 +51,13 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; +import java.util.HashMap; + import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.Ints; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; -import java.util.Map; -import java.util.HashMap; -import java.util.Collections; +import org.apache.fop.fo.expr.PropertyException; public class TextAlignLast extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/TextAltitude.java b/src/org/apache/fop/fo/properties/TextAltitude.java index 0bd699477..98d94a09f 100644 --- a/src/org/apache/fop/fo/properties/TextAltitude.java +++ b/src/org/apache/fop/fo/properties/TextAltitude.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class TextAltitude extends Property { public static final int dataTypes = LENGTH | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/TextDecoration.java b/src/org/apache/fop/fo/properties/TextDecoration.java index 1c3e081d8..1061e01ce 100644 --- a/src/org/apache/fop/fo/properties/TextDecoration.java +++ b/src/org/apache/fop/fo/properties/TextDecoration.java @@ -51,22 +51,19 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.PropertyValueList; +import java.util.Iterator; +import java.util.LinkedList; + +import org.apache.fop.datastructs.ROStringArray; import org.apache.fop.datatypes.NCName; import org.apache.fop.datatypes.None; import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.datatypes.PropertyValueList; import org.apache.fop.datatypes.TextDecorations; import org.apache.fop.datatypes.TextDecorator; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.datastructs.ROIntArray; -import org.apache.fop.fo.PropertyConsts; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.PropNames; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.Property; - -import java.util.LinkedList; -import java.util.Iterator; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class TextDecoration extends Property { public static final int dataTypes = COMPLEX | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/TextDepth.java b/src/org/apache/fop/fo/properties/TextDepth.java index 3d682caf3..e5db0ad99 100644 --- a/src/org/apache/fop/fo/properties/TextDepth.java +++ b/src/org/apache/fop/fo/properties/TextDepth.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class TextDepth extends Property { public static final int dataTypes = LENGTH | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/TextIndent.java b/src/org/apache/fop/fo/properties/TextIndent.java index 8598d6544..d93ca144a 100644 --- a/src/org/apache/fop/fo/properties/TextIndent.java +++ b/src/org/apache/fop/fo/properties/TextIndent.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class TextIndent extends Property { public static final int dataTypes = PERCENTAGE | LENGTH | INHERIT; diff --git a/src/org/apache/fop/fo/properties/TextShadow.java b/src/org/apache/fop/fo/properties/TextShadow.java index 11d70029c..630fd7317 100644 --- a/src/org/apache/fop/fo/properties/TextShadow.java +++ b/src/org/apache/fop/fo/properties/TextShadow.java @@ -51,16 +51,14 @@ */ package org.apache.fop.fo.properties; +import java.util.Iterator; + import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.PropertyValueList; -import org.apache.fop.datatypes.Length; import org.apache.fop.datatypes.ShadowEffect; -import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.ColorNonTransparent; - -import java.util.Iterator; +import org.apache.fop.fo.expr.PropertyException; public class TextShadow extends ColorNonTransparent { public static final int dataTypes = COMPLEX | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/TextTransform.java b/src/org/apache/fop/fo/properties/TextTransform.java index ae6c2c432..77d37b3b6 100644 --- a/src/org/apache/fop/fo/properties/TextTransform.java +++ b/src/org/apache/fop/fo/properties/TextTransform.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class TextTransform extends Property { public static final int dataTypes = ENUM | NONE | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Top.java b/src/org/apache/fop/fo/properties/Top.java index dfb5eb32e..6b99b1645 100644 --- a/src/org/apache/fop/fo/properties/Top.java +++ b/src/org/apache/fop/fo/properties/Top.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Top extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/TreatAsWordSpace.java b/src/org/apache/fop/fo/properties/TreatAsWordSpace.java index 70bcd8cf3..2a20c7eb1 100644 --- a/src/org/apache/fop/fo/properties/TreatAsWordSpace.java +++ b/src/org/apache/fop/fo/properties/TreatAsWordSpace.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class TreatAsWordSpace extends Property { public static final int dataTypes = BOOL | AUTO | INHERIT; diff --git a/src/org/apache/fop/fo/properties/UnicodeBidi.java b/src/org/apache/fop/fo/properties/UnicodeBidi.java index 4e756652b..11ef04473 100644 --- a/src/org/apache/fop/fo/properties/UnicodeBidi.java +++ b/src/org/apache/fop/fo/properties/UnicodeBidi.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class UnicodeBidi extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/UsageContextOfSuppressAtLineBreak.java b/src/org/apache/fop/fo/properties/UsageContextOfSuppressAtLineBreak.java index 260dee082..1e2e7da4b 100644 --- a/src/org/apache/fop/fo/properties/UsageContextOfSuppressAtLineBreak.java +++ b/src/org/apache/fop/fo/properties/UsageContextOfSuppressAtLineBreak.java @@ -52,8 +52,6 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.properties.Property; public class UsageContextOfSuppressAtLineBreak extends Property { public static final int dataTypes = AUTO | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/VerticalAlign.java b/src/org/apache/fop/fo/properties/VerticalAlign.java index 816de067b..c9e3b9405 100644 --- a/src/org/apache/fop/fo/properties/VerticalAlign.java +++ b/src/org/apache/fop/fo/properties/VerticalAlign.java @@ -51,16 +51,13 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; +import java.util.HashMap; + import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.Ints; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; -import java.util.Map; -import java.util.HashMap; -import java.util.Collections; +import org.apache.fop.fo.expr.PropertyException; public class VerticalAlign extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/Visibility.java b/src/org/apache/fop/fo/properties/Visibility.java index 860066f00..ecb02559a 100644 --- a/src/org/apache/fop/fo/properties/Visibility.java +++ b/src/org/apache/fop/fo/properties/Visibility.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class Visibility extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/VoiceFamily.java b/src/org/apache/fop/fo/properties/VoiceFamily.java index a1476beba..5aeaa14c0 100644 --- a/src/org/apache/fop/fo/properties/VoiceFamily.java +++ b/src/org/apache/fop/fo/properties/VoiceFamily.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class VoiceFamily extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/Volume.java b/src/org/apache/fop/fo/properties/Volume.java index f94ab31b0..329256f1f 100644 --- a/src/org/apache/fop/fo/properties/Volume.java +++ b/src/org/apache/fop/fo/properties/Volume.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Volume extends Property { public static final int dataTypes = AURAL; diff --git a/src/org/apache/fop/fo/properties/WhiteSpace.java b/src/org/apache/fop/fo/properties/WhiteSpace.java index 835065a2c..b28edf9f7 100644 --- a/src/org/apache/fop/fo/properties/WhiteSpace.java +++ b/src/org/apache/fop/fo/properties/WhiteSpace.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class WhiteSpace extends Property { public static final int dataTypes = SHORTHAND | ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/WhiteSpaceCollapse.java b/src/org/apache/fop/fo/properties/WhiteSpaceCollapse.java index e1eeea0b0..06fb61f7f 100644 --- a/src/org/apache/fop/fo/properties/WhiteSpaceCollapse.java +++ b/src/org/apache/fop/fo/properties/WhiteSpaceCollapse.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.Bool; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class WhiteSpaceCollapse extends Property { public static final int dataTypes = BOOL | INHERIT; diff --git a/src/org/apache/fop/fo/properties/WhiteSpaceTreatment.java b/src/org/apache/fop/fo/properties/WhiteSpaceTreatment.java index ad5a951bb..dd0dd0023 100644 --- a/src/org/apache/fop/fo/properties/WhiteSpaceTreatment.java +++ b/src/org/apache/fop/fo/properties/WhiteSpaceTreatment.java @@ -51,16 +51,13 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; +import java.util.HashMap; + import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.Ints; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; -import java.util.Map; -import java.util.HashMap; -import java.util.Collections; +import org.apache.fop.fo.expr.PropertyException; public class WhiteSpaceTreatment extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Widows.java b/src/org/apache/fop/fo/properties/Widows.java index abe3b4b01..63de7c581 100644 --- a/src/org/apache/fop/fo/properties/Widows.java +++ b/src/org/apache/fop/fo/properties/Widows.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.IntegerType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class Widows extends Property { public static final int dataTypes = INTEGER | INHERIT; diff --git a/src/org/apache/fop/fo/properties/Width.java b/src/org/apache/fop/fo/properties/Width.java index 968eb52e0..ff3493e54 100644 --- a/src/org/apache/fop/fo/properties/Width.java +++ b/src/org/apache/fop/fo/properties/Width.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class Width extends Property { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/WordSpacing.java b/src/org/apache/fop/fo/properties/WordSpacing.java index 05b4aaadf..22d8ac0b5 100644 --- a/src/org/apache/fop/fo/properties/WordSpacing.java +++ b/src/org/apache/fop/fo/properties/WordSpacing.java @@ -51,14 +51,12 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datatypes.Numeric; import org.apache.fop.datatypes.Length; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.datatypes.Numeric; import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.fo.PropNames; import org.apache.fop.fo.FONode; -import org.apache.fop.fo.properties.WordSpacingCommon; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class WordSpacing extends WordSpacingCommon { public static final int dataTypes = diff --git a/src/org/apache/fop/fo/properties/WordSpacingCommon.java b/src/org/apache/fop/fo/properties/WordSpacingCommon.java index 7f5d6de71..a24e54b52 100644 --- a/src/org/apache/fop/fo/properties/WordSpacingCommon.java +++ b/src/org/apache/fop/fo/properties/WordSpacingCommon.java @@ -51,7 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.properties.Property; public class WordSpacingCommon extends Property { public static final int NORMAL = 1; diff --git a/src/org/apache/fop/fo/properties/WordSpacingConditionality.java b/src/org/apache/fop/fo/properties/WordSpacingConditionality.java index 269f8ae87..b7f771ade 100644 --- a/src/org/apache/fop/fo/properties/WordSpacingConditionality.java +++ b/src/org/apache/fop/fo/properties/WordSpacingConditionality.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Conditionality; +import org.apache.fop.fo.expr.PropertyException; public class WordSpacingConditionality extends Conditionality { public static final int dataTypes = ENUM; diff --git a/src/org/apache/fop/fo/properties/WordSpacingMaximum.java b/src/org/apache/fop/fo/properties/WordSpacingMaximum.java index 8e6a514f4..5573ec4a4 100644 --- a/src/org/apache/fop/fo/properties/WordSpacingMaximum.java +++ b/src/org/apache/fop/fo/properties/WordSpacingMaximum.java @@ -51,13 +51,12 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FONode; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Numeric; import org.apache.fop.datatypes.Length; -import org.apache.fop.fo.properties.WordSpacingCommon; +import org.apache.fop.datatypes.Numeric; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.FONode; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class WordSpacingMaximum extends WordSpacingCommon { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/WordSpacingMinimum.java b/src/org/apache/fop/fo/properties/WordSpacingMinimum.java index 9fd8b233b..c3a083ff2 100644 --- a/src/org/apache/fop/fo/properties/WordSpacingMinimum.java +++ b/src/org/apache/fop/fo/properties/WordSpacingMinimum.java @@ -51,13 +51,12 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FONode; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Numeric; import org.apache.fop.datatypes.Length; -import org.apache.fop.fo.properties.WordSpacingCommon; +import org.apache.fop.datatypes.Numeric; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.FONode; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class WordSpacingMinimum extends WordSpacingCommon { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/WordSpacingOptimum.java b/src/org/apache/fop/fo/properties/WordSpacingOptimum.java index 8ab10831e..11dbad58a 100644 --- a/src/org/apache/fop/fo/properties/WordSpacingOptimum.java +++ b/src/org/apache/fop/fo/properties/WordSpacingOptimum.java @@ -51,13 +51,12 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.FONode; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Numeric; import org.apache.fop.datatypes.Length; -import org.apache.fop.fo.properties.WordSpacingCommon; +import org.apache.fop.datatypes.Numeric; +import org.apache.fop.datatypes.PropertyValue; +import org.apache.fop.fo.FONode; +import org.apache.fop.fo.PropNames; +import org.apache.fop.fo.expr.PropertyException; public class WordSpacingOptimum extends WordSpacingCommon { public static final int dataTypes = LENGTH; diff --git a/src/org/apache/fop/fo/properties/WordSpacingPrecedence.java b/src/org/apache/fop/fo/properties/WordSpacingPrecedence.java index c62e0f361..bdcfe2f3c 100644 --- a/src/org/apache/fop/fo/properties/WordSpacingPrecedence.java +++ b/src/org/apache/fop/fo/properties/WordSpacingPrecedence.java @@ -51,11 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.PrecedenceCommon; +import org.apache.fop.fo.expr.PropertyException; public class WordSpacingPrecedence extends PrecedenceCommon { public static final int dataTypes = INTEGER | ENUM; diff --git a/src/org/apache/fop/fo/properties/WrapOption.java b/src/org/apache/fop/fo/properties/WrapOption.java index 09c59fd6c..0b244743c 100644 --- a/src/org/apache/fop/fo/properties/WrapOption.java +++ b/src/org/apache/fop/fo/properties/WrapOption.java @@ -51,12 +51,10 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; +import org.apache.fop.fo.expr.PropertyException; public class WrapOption extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/WritingMode.java b/src/org/apache/fop/fo/properties/WritingMode.java index 30465b500..cccd3f4a8 100644 --- a/src/org/apache/fop/fo/properties/WritingMode.java +++ b/src/org/apache/fop/fo/properties/WritingMode.java @@ -51,16 +51,13 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.datastructs.ROStringArray; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.datatypes.PropertyValue; -import org.apache.fop.datatypes.Ints; +import java.util.HashMap; + import org.apache.fop.datatypes.EnumType; +import org.apache.fop.datatypes.Ints; +import org.apache.fop.datatypes.PropertyValue; import org.apache.fop.fo.PropNames; -import org.apache.fop.fo.properties.Property; -import java.util.Map; -import java.util.HashMap; -import java.util.Collections; +import org.apache.fop.fo.expr.PropertyException; public class WritingMode extends Property { public static final int dataTypes = ENUM | INHERIT; diff --git a/src/org/apache/fop/fo/properties/XmlLang.java b/src/org/apache/fop/fo/properties/XmlLang.java index a083548c4..66efdfb20 100644 --- a/src/org/apache/fop/fo/properties/XmlLang.java +++ b/src/org/apache/fop/fo/properties/XmlLang.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class XmlLang extends Property { public static final int dataTypes = SHORTHAND; diff --git a/src/org/apache/fop/fo/properties/ZIndex.java b/src/org/apache/fop/fo/properties/ZIndex.java index 5fac72502..99cea6da9 100644 --- a/src/org/apache/fop/fo/properties/ZIndex.java +++ b/src/org/apache/fop/fo/properties/ZIndex.java @@ -51,8 +51,6 @@ */ package org.apache.fop.fo.properties; -import org.apache.fop.fo.expr.PropertyException; -import org.apache.fop.fo.properties.Property; public class ZIndex extends Property { public static final int dataTypes =INTEGER | AUTO | INHERIT; diff --git a/src/org/apache/fop/tools/DocumentInputSource.java b/src/org/apache/fop/tools/DocumentInputSource.java index a9430fd34..7b691454d 100644 --- a/src/org/apache/fop/tools/DocumentInputSource.java +++ b/src/org/apache/fop/tools/DocumentInputSource.java @@ -52,9 +52,8 @@ package org.apache.fop.tools; -import java.util.*; -import org.w3c.dom.*; -import org.xml.sax.*; +import org.w3c.dom.Document; +import org.xml.sax.InputSource; /** * This is an InputSource to be used with DocumentReader. diff --git a/src/org/apache/fop/tools/DocumentReader.java b/src/org/apache/fop/tools/DocumentReader.java index 41d41a51a..cef501ce7 100644 --- a/src/org/apache/fop/tools/DocumentReader.java +++ b/src/org/apache/fop/tools/DocumentReader.java @@ -53,13 +53,20 @@ package org.apache.fop.tools; import java.io.IOException; -// import java.util.*; -// DOM -import org.w3c.dom.*; - -// SAX -import org.xml.sax.*; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.xml.sax.ContentHandler; +import org.xml.sax.DTDHandler; +import org.xml.sax.EntityResolver; +import org.xml.sax.ErrorHandler; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; +import org.xml.sax.XMLReader; import org.xml.sax.helpers.AttributesImpl; /** diff --git a/src/org/apache/fop/xml/FoXMLEvent.java b/src/org/apache/fop/xml/FoXMLEvent.java index 49030c8d3..64691c2bf 100644 --- a/src/org/apache/fop/xml/FoXMLEvent.java +++ b/src/org/apache/fop/xml/FoXMLEvent.java @@ -53,11 +53,11 @@ */ package org.apache.fop.xml; +import org.xml.sax.helpers.AttributesImpl; + import org.apache.fop.apps.FOPException; import org.apache.fop.fo.FObjectNames; -import org.xml.sax.helpers.AttributesImpl; - /** * This is a data class to encapsulate the data of an individual XML * parse event in an XML-FO file. The current version, while defining diff --git a/src/org/apache/fop/xml/FoXMLEventPool.java b/src/org/apache/fop/xml/FoXMLEventPool.java index c1095f9a6..47124ae6e 100644 --- a/src/org/apache/fop/xml/FoXMLEventPool.java +++ b/src/org/apache/fop/xml/FoXMLEventPool.java @@ -53,11 +53,7 @@ */ package org.apache.fop.xml; -import org.apache.fop.apps.FOPException; import org.apache.fop.fo.FObjectNames; -import org.apache.fop.xml.FoXMLEvent; -import org.apache.fop.xml.XMLNamespaces; -import org.apache.fop.xml.XMLEventPool; /** * This class provides a pool of FoXMLEvent objects. diff --git a/src/org/apache/fop/xml/FoXMLSerialHandler.java b/src/org/apache/fop/xml/FoXMLSerialHandler.java index 11c4f3996..49674a8a8 100644 --- a/src/org/apache/fop/xml/FoXMLSerialHandler.java +++ b/src/org/apache/fop/xml/FoXMLSerialHandler.java @@ -54,23 +54,18 @@ */ package org.apache.fop.xml; -import org.apache.fop.fo.FObjectNames; -import org.apache.fop.xml.XMLNamespaces; -import org.apache.fop.xml.SyncedFoXmlEventsBuffer; -import org.apache.fop.xml.FoXMLEventPool; -import org.apache.fop.apps.FOPException; -import org.apache.fop.apps.Driver; -import org.apache.fop.configuration.Configuration; +import java.util.NoSuchElementException; -import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.Attributes; -import org.xml.sax.helpers.AttributesImpl; -import org.xml.sax.SAXException; -import org.xml.sax.XMLReader; import org.xml.sax.InputSource; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.AttributesImpl; +import org.xml.sax.helpers.DefaultHandler; -import java.io.IOException; -import java.util.NoSuchElementException; +import org.apache.fop.apps.Driver; +import org.apache.fop.apps.FOPException; +import org.apache.fop.configuration.Configuration; +import org.apache.fop.fo.FObjectNames; /** * FoXMLSerialHandler is the ContentHandler for the diff --git a/src/org/apache/fop/xml/SyncedFoXmlEventsBuffer.java b/src/org/apache/fop/xml/SyncedFoXmlEventsBuffer.java index d25d74b54..7dfab3951 100644 --- a/src/org/apache/fop/xml/SyncedFoXmlEventsBuffer.java +++ b/src/org/apache/fop/xml/SyncedFoXmlEventsBuffer.java @@ -55,18 +55,16 @@ */ package org.apache.fop.xml; -import org.apache.fop.datastructs.SyncedCircularBuffer; +import java.util.BitSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.NoSuchElementException; + import org.apache.fop.apps.FOPException; +import org.apache.fop.datastructs.SyncedCircularBuffer; import org.apache.fop.fo.FObjectNames; import org.apache.fop.fo.FObjectSets; -import org.apache.fop.xml.FoXMLEventPool; - -import java.util.NoSuchElementException; -import java.util.LinkedList; -import java.util.Iterator; -import java.util.BitSet; - /** * A synchronized circular buffer for FoXMLEvents. * @see org.apache.fop.datastructs.SyncedCircularBuffer diff --git a/src/org/apache/fop/xml/XMLEvent.java b/src/org/apache/fop/xml/XMLEvent.java index 2fc8be273..e300a720b 100644 --- a/src/org/apache/fop/xml/XMLEvent.java +++ b/src/org/apache/fop/xml/XMLEvent.java @@ -53,8 +53,6 @@ */ package org.apache.fop.xml; -import org.apache.fop.apps.FOPException; - import org.xml.sax.helpers.AttributesImpl; /** @@ -257,9 +255,9 @@ public class XMLEvent { /** * Set the qualified name of this event. - * @param QName - the qualified name. + * @param qName - the qualified name. */ - public void setQName(String QName) { + public void setQName(String qName) { this.qName = qName; } diff --git a/src/org/apache/fop/xml/XMLEventPool.java b/src/org/apache/fop/xml/XMLEventPool.java index 763c5fafe..18dab6fda 100644 --- a/src/org/apache/fop/xml/XMLEventPool.java +++ b/src/org/apache/fop/xml/XMLEventPool.java @@ -53,13 +53,11 @@ */ package org.apache.fop.xml; -import org.apache.fop.apps.FOPException; -import org.apache.fop.xml.XMLEvent; -import org.apache.fop.messaging.MessageHandler; - import java.util.ArrayList; import java.util.BitSet; +import org.apache.fop.messaging.MessageHandler; + /** * This class provides a pool of XMLEvent objects. */ diff --git a/src/org/apache/fop/xml/XMLNamespaces.java b/src/org/apache/fop/xml/XMLNamespaces.java index 49b1889f8..0aa77cc32 100644 --- a/src/org/apache/fop/xml/XMLNamespaces.java +++ b/src/org/apache/fop/xml/XMLNamespaces.java @@ -53,10 +53,10 @@ */ package org.apache.fop.xml; -import org.apache.fop.datatypes.Ints; - -import java.util.HashMap; import java.util.ArrayList; +import java.util.HashMap; + +import org.apache.fop.datatypes.Ints; /** * Maintains the namespaces encountered by an invocation of -- 2.39.5