You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by pb...@apache.org on 2003/06/12 20:19:39 UTC
cvs commit: xml-fop/src/org/apache/fop/tools DocumentReader.java DocumentInputSource.java
pbwest 2003/06/12 11:19:38
Modified: src/org/apache/fop/fo/properties Tag: FOP_0-20-0_Alt-Design
HyphenationRemainCharacterCount.java Clear.java
TargetStylesheet.java
InlineProgressionDimensionMaximum.java Top.java
Color.java NoProperty.java
BorderSeparationBlockProgressionDirection.java
SpaceEndPrecedence.java BorderLeftWidth.java
Overflow.java Float.java LeaderAlignment.java
HyphenationKeep.java
BlockProgressionDimensionMinimum.java
HyphenationLadderCount.java PrecedenceCommon.java
MarginBottom.java IndicateDestination.java
BlankOrNotBlank.java Clip.java Conditionality.java
BorderEndWidthLength.java FontSize.java
BorderLeftStyle.java SpaceAfterMaximum.java
PaddingEndLength.java
BorderEndWidthConditionality.java
BlockProgressionDimension.java
ColorNonTransparent.java ScoreSpaces.java
BreakAfter.java MinWidth.java
UsageContextOfSuppressAtLineBreak.java
BaselineShift.java Property.java
WordSpacingMinimum.java TreatAsWordSpace.java
Bottom.java DominantBaseline.java
SpaceStartOptimum.java PageBreakAfter.java
XmlLang.java ColorProfileName.java
LastLineEndIndent.java BorderTop.java
KeepWithPreviousWithinLine.java KeepWithNext.java
TableOmitFooterAtBreak.java SpaceStart.java
Format.java PaddingStartConditionality.java
TextAltitude.java Margin.java
NumberColumnsSpanned.java PaddingStart.java
PlayDuring.java Character.java Widows.java
RenderingIntent.java
KeepWithPreviousWithinPage.java Border.java
AlignmentAdjust.java Left.java
BackgroundAttachment.java ScalingMethod.java
BorderCollapse.java PaddingRight.java
BorderEndWidth.java SpaceEndConditionality.java
BorderBottom.java BorderLeft.java
KeepTogetherWithinPage.java
SpaceAfterConditionality.java
InlineProgressionDimensionMinimum.java Keep.java
BackgroundColor.java RefId.java SpaceEnd.java
MarginLeft.java PageBreakCommon.java
SpaceBeforeMaximum.java SpaceStartPrecedence.java
LetterSpacingConditionality.java
BorderRightStyle.java KeepWithNextWithinColumn.java
KeepWithPreviousWithinColumn.java
KeepTogetherWithinLine.java BorderBottomColor.java
WrapOption.java BorderCommonStyle.java
BorderBottomWidth.java NumberColumnsRepeated.java
MaxWidth.java CaptionSide.java PitchRange.java
KeepTogether.java Dummy.java
SpaceBeforePrecedence.java LeaderLengthOptimum.java
MaxHeight.java BorderRightWidth.java
PaddingBottom.java Height.java
SpaceStartMaximum.java WhiteSpace.java
BorderSpacing.java SpaceBeforeConditionality.java
SourceDocument.java InitialPageNumber.java
PageBreakBefore.java BorderWidth.java
KeepWithNextWithinPage.java TextDepth.java
BorderStartWidth.java LineHeightConditionality.java
ContentHeight.java FontStretch.java
HyphenationPushCharacterCount.java
LeaderLength.java Orphans.java PageHeightWidth.java
LineHeightShiftAdjustment.java BorderEndColor.java
MarginRight.java BorderRight.java
BorderAfterWidthConditionality.java OddOrEven.java
Position.java SwitchTo.java
WordSpacingConditionality.java DisplayAlign.java
BorderAfterWidthLength.java FontStyle.java
LineHeightPrecedence.java FontVariant.java
BorderStartPrecedence.java PaddingAfterLength.java
Font.java PaddingBeforeLength.java EndsRow.java
ProvisionalLabelSeparation.java
RelativePosition.java BorderStartStyle.java
BorderBeforeWidth.java TargetProcessingContext.java
ColumnCount.java PagePosition.java TextShadow.java
GlyphOrientationHorizontal.java CaseName.java
LineHeightOptimum.java MasterName.java
BorderStartColor.java Size.java
BorderCommonWidth.java FontSelectionStrategy.java
TargetPresentationContext.java Id.java
StartIndent.java BorderEndStyle.java Script.java
SpaceAfterMinimum.java MarginTop.java
ProvisionalDistanceBetweenStarts.java
SpaceBeforeOptimum.java BorderAfterPrecedence.java
Cue.java
BorderSeparationInlineProgressionDirection.java
LetterSpacing.java Volume.java Role.java
AutoRestore.java CueBefore.java SpeakNumeral.java
BorderTopColor.java WordSpacingOptimum.java
VoiceFamily.java Width.java BorderTopStyle.java
DestinationPlacementOffset.java
RetrievePosition.java GlyphOrientationVertical.java
PageBreakInside.java LetterSpacingOptimum.java
BorderTopWidth.java BorderBeforeColor.java
CueAfter.java IntrusionDisplace.java
WhiteSpaceTreatment.java BorderLeftColor.java
AbsolutePosition.java AlignmentBaseline.java
ColorCommon.java KeepTogetherWithinColumn.java
PaddingBeforeConditionality.java RuleStyle.java
LeaderPattern.java BorderColor.java
BorderStartWidthConditionality.java
BorderBottomStyle.java MasterReference.java
ShowDestination.java Stress.java SpeakHeader.java
TextIndent.java ContentDimension.java
PaddingEndConditionality.java
LeaderLengthMaximum.java ColorTransparent.java
KeepWithNextWithinLine.java
InlineProgressionDimensionOptimum.java
SpaceStartMinimum.java BackgroundPosition.java
PageWidth.java WordSpacing.java ActiveState.java
LeaderLengthMinimum.java NumberRowsSpanned.java
PaddingAfterConditionality.java RuleThickness.java
PauseAfter.java StartsRow.java
BorderBeforeStyle.java TextAlignLast.java
BorderStartWidthLength.java
BorderBeforeWidthLength.java GroupingSeparator.java
SpaceEndMinimum.java WordSpacingPrecedence.java
BorderRightColor.java SpaceBeforeMinimum.java
SpaceAfterOptimum.java EndIndent.java
BlockProgressionDimensionOptimum.java
TextAlign.java Hyphenate.java BreakCommon.java
SpaceEndOptimum.java LineHeightMinimum.java
UnicodeBidi.java SuppressAtLineBreak.java
Pitch.java WhiteSpaceCollapse.java
ColumnNumber.java FontFamily.java
RetrieveClassName.java BorderSeparation.java
BackgroundRepeat.java Speak.java FontWeight.java
Right.java PaddingBefore.java KeepWithPrevious.java
BackgroundImage.java StartingState.java
RelativeAlign.java CaseTitle.java Src.java
TextTransform.java MarkerClassName.java
BorderBeforePrecedence.java Azimuth.java
InlineProgressionDimension.java EmptyCells.java
SpaceAfterPrecedence.java SpaceEndMaximum.java
FontSizeAdjust.java Padding.java WritingMode.java
SpeechRate.java LineHeight.java Direction.java
RetrieveBoundary.java HyphenationCharacter.java
BorderAfterColor.java Background.java
PaddingAfter.java TableOmitHeaderAtBreak.java
SpaceStartConditionality.java
BackgroundPositionVertical.java PageHeight.java
LetterSpacingMaximum.java PaddingLeft.java
SpeakPunctuation.java TextDecoration.java
MaximumRepeats.java Span.java
LineHeightMaximum.java MinHeight.java
ForcePageCount.java Scaling.java
PaddingStartLength.java
LetterSpacingPrecedence.java
ExternalDestination.java ZIndex.java ColumnGap.java
Extent.java SpaceBefore.java ContentWidth.java
PaddingEnd.java TableLayout.java Visibility.java
RegionName.java ContentType.java FlowName.java
InternalDestination.java BorderEndPrecedence.java
LinefeedTreatment.java WordSpacingCommon.java
LineStackingStrategy.java PaddingTop.java
PauseBefore.java BorderAfterStyle.java
BreakBefore.java Richness.java
WordSpacingMaximum.java ColumnWidth.java
GroupingSize.java
BlockProgressionDimensionMaximum.java
Precedence.java LetterSpacingMinimum.java
SpaceAfter.java
BorderBeforeWidthConditionality.java
VerticalAlign.java MediaUsage.java Country.java
Elevation.java Pause.java BorderStyle.java
Language.java LeaderPatternWidth.java
BorderAfterWidth.java
BackgroundPositionHorizontal.java
ReferenceOrientation.java LetterValue.java
src/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design
FoTitle.java FoPageNumber.java FoTableCaption.java
FoTableCell.java FoInline.java FoLeader.java
FoFootnote.java FoFootnoteBody.java
FoInitialPropertySet.java FoBidiOverride.java
FoWrapper.java FoPageNumberCitation.java
FoTableFooter.java FoMultiProperties.java
FoExternalGraphic.java FoMultiPropertySet.java
FoRetrieveMarker.java FoBasicLink.java
FoTableColumn.java FoPcdata.java FoMultiCase.java
FoTableHeader.java FoInstreamForeignObject.java
FoBlock.java FoInlineContainer.java
FoPageSequence.java FoListItemBody.java
FoTableRow.java FoListItemLabel.java FoTable.java
Dummy.java FoStaticContent.java FoFlow.java
FoTableAndCaption.java FoFloat.java FoNoFo.java
FoListBlock.java FoMultiSwitch.java
FoMultiToggle.java FoMarker.java FoListItem.java
FoBlockContainer.java FoTableBody.java
FoCharacter.java
src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoRegionBefore.java FoRegionAfter.java
FoRegionStartEnd.java FoRegionBody.java
FoLayoutMasterSet.java FoRegionBeforeAfter.java
FoRegionStart.java FoPageSequenceMaster.java
PageSequenceMaster.java FoSimplePageMaster.java
FoRegionEnd.java
src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
ReferenceAreaFO.java FOAttributes.java
FOPropertySets.java FObject.java FONode.java
ShorthandPropSets.java PropNames.java
PropertyConsts.java FOTree.java FObjectNames.java
PropertySets.java FObjects.java FoRoot.java
FObjectSets.java
src/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
AbstractPropertyValue.java IntegerType.java
TextDecorator.java Slash.java Ems.java
PropertyValue.java Angle.java EnumType.java
PropertyValueList.java None.java ColorSpace.java
Time.java ScriptType.java MimeType.java
ShadowEffect.java UriType.java Frequency.java
ColorType.java Auto.java Numeric.java NoType.java
LanguageType.java Ints.java CountryType.java
StringType.java FontFamilySet.java Literal.java
NCName.java MappedNumeric.java Bool.java
src/org/apache/fop/datatypes/indirect Tag:
FOP_0-20-0_Alt-Design FromParent.java
IndirectValue.java FromNearestSpecified.java
Inherit.java InheritedValue.java
src/org/apache/fop/datastructs Tag: FOP_0-20-0_Alt-Design
CircularBuffer.java
src/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design
SystemFontFunction.java PropertyTokenizer.java
PropertyParser.java
src/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
SyncedFoXmlEventsBuffer.java FoXMLEvent.java
FoXMLEventPool.java XMLNamespaces.java
FoXMLSerialHandler.java XMLEventPool.java
XMLEvent.java
src/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
InputHandler.java FOInputHandler.java Driver.java
src/org/apache/fop/fo/declarations Tag:
FOP_0-20-0_Alt-Design FoColorProfile.java
FoDeclarations.java
src/org/apache/fop/configuration Tag: FOP_0-20-0_Alt-Design
LanguageFileReader.java ConfigurationReader.java
src/org/apache/fop/tools Tag: FOP_0-20-0_Alt-Design
DocumentReader.java DocumentInputSource.java
Added: . Tag: FOP_0-20-0_Alt-Design .project .classpath
Log:
Eclipse checkout. Applied Organize Imports. Fixed instances where
static is referred to through an instatiated object rather then
the class.
Revision Changes Path
No revision
No revision
1.1.2.6 +2 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationRemainCharacterCount.java
Index: HyphenationRemainCharacterCount.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationRemainCharacterCount.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- HyphenationRemainCharacterCount.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ HyphenationRemainCharacterCount.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.7 +4 -8 xml-fop/src/org/apache/fop/fo/properties/Attic/Clear.java
Index: Clear.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Clear.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- Clear.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ Clear.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/TargetStylesheet.java
Index: TargetStylesheet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TargetStylesheet.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- TargetStylesheet.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ TargetStylesheet.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/InlineProgressionDimensionMaximum.java
Index: InlineProgressionDimensionMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/InlineProgressionDimensionMaximum.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- InlineProgressionDimensionMaximum.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ InlineProgressionDimensionMaximum.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Top.java
Index: Top.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Top.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Top.java 31 Mar 2003 02:41:07 -0000 1.1.2.3
+++ Top.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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 =
1.1.2.7 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/Color.java
Index: Color.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Color.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- Color.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ Color.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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;
1.1.2.2 +0 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/NoProperty.java
Index: NoProperty.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/NoProperty.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- NoProperty.java 19 Oct 2002 03:40:08 -0000 1.1.2.1
+++ NoProperty.java 12 Jun 2003 18:19:07 -0000 1.1.2.2
@@ -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
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderSeparationBlockProgressionDirection.java
Index: BorderSeparationBlockProgressionDirection.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderSeparationBlockProgressionDirection.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderSeparationBlockProgressionDirection.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BorderSeparationBlockProgressionDirection.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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 {
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndPrecedence.java
Index: SpaceEndPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndPrecedence.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceEndPrecedence.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceEndPrecedence.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.8 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeftWidth.java
Index: BorderLeftWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeftWidth.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- BorderLeftWidth.java 31 Mar 2003 02:41:05 -0000 1.1.2.7
+++ BorderLeftWidth.java 12 Jun 2003 18:19:07 -0000 1.1.2.8
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Overflow.java
Index: Overflow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Overflow.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Overflow.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ Overflow.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.7 +4 -7 xml-fop/src/org/apache/fop/fo/properties/Attic/Float.java
Index: Float.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Float.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- Float.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ Float.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderAlignment.java
Index: LeaderAlignment.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderAlignment.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LeaderAlignment.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LeaderAlignment.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationKeep.java
Index: HyphenationKeep.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationKeep.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- HyphenationKeep.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ HyphenationKeep.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BlockProgressionDimensionMinimum.java
Index: BlockProgressionDimensionMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BlockProgressionDimensionMinimum.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BlockProgressionDimensionMinimum.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BlockProgressionDimensionMinimum.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationLadderCount.java
Index: HyphenationLadderCount.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationLadderCount.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- HyphenationLadderCount.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ HyphenationLadderCount.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/PrecedenceCommon.java
Index: PrecedenceCommon.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PrecedenceCommon.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PrecedenceCommon.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PrecedenceCommon.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/MarginBottom.java
Index: MarginBottom.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MarginBottom.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- MarginBottom.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ MarginBottom.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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 =
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/IndicateDestination.java
Index: IndicateDestination.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/IndicateDestination.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- IndicateDestination.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ IndicateDestination.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/BlankOrNotBlank.java
Index: BlankOrNotBlank.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BlankOrNotBlank.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BlankOrNotBlank.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BlankOrNotBlank.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +6 -7 xml-fop/src/org/apache/fop/fo/properties/Attic/Clip.java
Index: Clip.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Clip.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Clip.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ Clip.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Conditionality.java
Index: Conditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Conditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Conditionality.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ Conditionality.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.7 +2 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidthLength.java
Index: BorderEndWidthLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidthLength.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderEndWidthLength.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderEndWidthLength.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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;
1.1.2.8 +8 -13 xml-fop/src/org/apache/fop/fo/properties/Attic/FontSize.java
Index: FontSize.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontSize.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FontSize.java 31 Mar 2003 02:41:05 -0000 1.1.2.7
+++ FontSize.java 12 Jun 2003 18:19:07 -0000 1.1.2.8
@@ -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 =
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeftStyle.java
Index: BorderLeftStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeftStyle.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderLeftStyle.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BorderLeftStyle.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterMaximum.java
Index: SpaceAfterMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterMaximum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceAfterMaximum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceAfterMaximum.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingEndLength.java
Index: PaddingEndLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingEndLength.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingEndLength.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingEndLength.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidthConditionality.java
Index: BorderEndWidthConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidthConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderEndWidthConditionality.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BorderEndWidthConditionality.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BlockProgressionDimension.java
Index: BlockProgressionDimension.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BlockProgressionDimension.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BlockProgressionDimension.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BlockProgressionDimension.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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 =
1.1.2.8 +4 -6 xml-fop/src/org/apache/fop/fo/properties/Attic/ColorNonTransparent.java
Index: ColorNonTransparent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColorNonTransparent.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- ColorNonTransparent.java 31 Mar 2003 02:41:05 -0000 1.1.2.7
+++ ColorNonTransparent.java 12 Jun 2003 18:19:07 -0000 1.1.2.8
@@ -51,12 +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.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
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/ScoreSpaces.java
Index: ScoreSpaces.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ScoreSpaces.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ScoreSpaces.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ ScoreSpaces.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BreakAfter.java
Index: BreakAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BreakAfter.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BreakAfter.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BreakAfter.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/MinWidth.java
Index: MinWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MinWidth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- MinWidth.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ MinWidth.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/UsageContextOfSuppressAtLineBreak.java
Index: UsageContextOfSuppressAtLineBreak.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/UsageContextOfSuppressAtLineBreak.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- UsageContextOfSuppressAtLineBreak.java 31 Mar 2003 02:41:07 -0000 1.1.2.3
+++ UsageContextOfSuppressAtLineBreak.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/BaselineShift.java
Index: BaselineShift.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BaselineShift.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BaselineShift.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BaselineShift.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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 =
1.1.2.10 +21 -51 xml-fop/src/org/apache/fop/fo/properties/Attic/Property.java
Index: Property.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Property.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- Property.java 31 Mar 2003 02:41:06 -0000 1.1.2.9
+++ Property.java 12 Jun 2003 18:19:07 -0000 1.1.2.10
@@ -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
1.1.2.7 +6 -7 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingMinimum.java
Index: WordSpacingMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingMinimum.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- WordSpacingMinimum.java 31 Mar 2003 02:41:07 -0000 1.1.2.6
+++ WordSpacingMinimum.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/TreatAsWordSpace.java
Index: TreatAsWordSpace.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TreatAsWordSpace.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- TreatAsWordSpace.java 31 Mar 2003 02:41:07 -0000 1.1.2.3
+++ TreatAsWordSpace.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Bottom.java
Index: Bottom.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Bottom.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Bottom.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ Bottom.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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 =
1.1.2.7 +4 -7 xml-fop/src/org/apache/fop/fo/properties/Attic/DominantBaseline.java
Index: DominantBaseline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/DominantBaseline.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- DominantBaseline.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ DominantBaseline.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartOptimum.java
Index: SpaceStartOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartOptimum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceStartOptimum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceStartOptimum.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/PageBreakAfter.java
Index: PageBreakAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PageBreakAfter.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PageBreakAfter.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ PageBreakAfter.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -51,7 +51,6 @@
*/
package org.apache.fop.fo.properties;
-import org.apache.fop.fo.properties.PageBreakCommon;
public class PageBreakAfter extends PageBreakCommon {
}
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/XmlLang.java
Index: XmlLang.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/XmlLang.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XmlLang.java 31 Mar 2003 02:41:07 -0000 1.1.2.3
+++ XmlLang.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/ColorProfileName.java
Index: ColorProfileName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColorProfileName.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ColorProfileName.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ ColorProfileName.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/LastLineEndIndent.java
Index: LastLineEndIndent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LastLineEndIndent.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LastLineEndIndent.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ LastLineEndIndent.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +2 -7 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTop.java
Index: BorderTop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTop.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderTop.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BorderTop.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithPreviousWithinLine.java
Index: KeepWithPreviousWithinLine.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithPreviousWithinLine.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- KeepWithPreviousWithinLine.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ KeepWithPreviousWithinLine.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithNext.java
Index: KeepWithNext.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithNext.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- KeepWithNext.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ KeepWithNext.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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 =
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/TableOmitFooterAtBreak.java
Index: TableOmitFooterAtBreak.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TableOmitFooterAtBreak.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- TableOmitFooterAtBreak.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ TableOmitFooterAtBreak.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStart.java
Index: SpaceStart.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStart.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceStart.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceStart.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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 =
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/Format.java
Index: Format.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Format.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Format.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ Format.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingStartConditionality.java
Index: PaddingStartConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingStartConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingStartConditionality.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingStartConditionality.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/TextAltitude.java
Index: TextAltitude.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextAltitude.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- TextAltitude.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ TextAltitude.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +9 -10 xml-fop/src/org/apache/fop/fo/properties/Attic/Margin.java
Index: Margin.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Margin.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Margin.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ Margin.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +2 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/NumberColumnsSpanned.java
Index: NumberColumnsSpanned.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/NumberColumnsSpanned.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- NumberColumnsSpanned.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ NumberColumnsSpanned.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingStart.java
Index: PaddingStart.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingStart.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingStart.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingStart.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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 =
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/PlayDuring.java
Index: PlayDuring.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PlayDuring.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PlayDuring.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ PlayDuring.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Character.java
Index: Character.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Character.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Character.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ Character.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/Widows.java
Index: Widows.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Widows.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Widows.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ Widows.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.7 +4 -8 xml-fop/src/org/apache/fop/fo/properties/Attic/RenderingIntent.java
Index: RenderingIntent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RenderingIntent.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- RenderingIntent.java 31 Mar 2003 02:41:06 -0000 1.1.2.6
+++ RenderingIntent.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithPreviousWithinPage.java
Index: KeepWithPreviousWithinPage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithPreviousWithinPage.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- KeepWithPreviousWithinPage.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ KeepWithPreviousWithinPage.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.6 +6 -11 xml-fop/src/org/apache/fop/fo/properties/Attic/Border.java
Index: Border.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Border.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Border.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ Border.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -51,21 +51,16 @@
*/
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;
1.1.2.7 +4 -8 xml-fop/src/org/apache/fop/fo/properties/Attic/AlignmentAdjust.java
Index: AlignmentAdjust.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/AlignmentAdjust.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- AlignmentAdjust.java 31 Mar 2003 02:41:04 -0000 1.1.2.6
+++ AlignmentAdjust.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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 =
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Left.java
Index: Left.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Left.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Left.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ Left.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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 =
1.1.2.6 +2 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundAttachment.java
Index: BackgroundAttachment.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundAttachment.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BackgroundAttachment.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BackgroundAttachment.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/ScalingMethod.java
Index: ScalingMethod.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ScalingMethod.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ScalingMethod.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ ScalingMethod.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderCollapse.java
Index: BorderCollapse.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderCollapse.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderCollapse.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BorderCollapse.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingRight.java
Index: PaddingRight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingRight.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingRight.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingRight.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.7 +4 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidth.java
Index: BorderEndWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndWidth.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderEndWidth.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderEndWidth.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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 =
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndConditionality.java
Index: SpaceEndConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceEndConditionality.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceEndConditionality.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -8 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottom.java
Index: BorderBottom.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottom.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderBottom.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BorderBottom.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +2 -7 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeft.java
Index: BorderLeft.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeft.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderLeft.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BorderLeft.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/KeepTogetherWithinPage.java
Index: KeepTogetherWithinPage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/KeepTogetherWithinPage.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- KeepTogetherWithinPage.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ KeepTogetherWithinPage.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterConditionality.java
Index: SpaceAfterConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceAfterConditionality.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceAfterConditionality.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/InlineProgressionDimensionMinimum.java
Index: InlineProgressionDimensionMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/InlineProgressionDimensionMinimum.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- InlineProgressionDimensionMinimum.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ InlineProgressionDimensionMinimum.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.6 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/Keep.java
Index: Keep.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Keep.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Keep.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ Keep.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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 {
1.1.2.7 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundColor.java
Index: BackgroundColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundColor.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BackgroundColor.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BackgroundColor.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/RefId.java
Index: RefId.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RefId.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- RefId.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ RefId.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEnd.java
Index: SpaceEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEnd.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceEnd.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceEnd.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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 =
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/MarginLeft.java
Index: MarginLeft.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MarginLeft.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- MarginLeft.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ MarginLeft.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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 =
1.1.2.7 +11 -12 xml-fop/src/org/apache/fop/fo/properties/Attic/PageBreakCommon.java
Index: PageBreakCommon.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PageBreakCommon.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- PageBreakCommon.java 31 Mar 2003 02:41:06 -0000 1.1.2.6
+++ PageBreakCommon.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeMaximum.java
Index: SpaceBeforeMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeMaximum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceBeforeMaximum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceBeforeMaximum.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartPrecedence.java
Index: SpaceStartPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartPrecedence.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceStartPrecedence.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceStartPrecedence.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingConditionality.java
Index: LetterSpacingConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LetterSpacingConditionality.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LetterSpacingConditionality.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRightStyle.java
Index: BorderRightStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRightStyle.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderRightStyle.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BorderRightStyle.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithNextWithinColumn.java
Index: KeepWithNextWithinColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithNextWithinColumn.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- KeepWithNextWithinColumn.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ KeepWithNextWithinColumn.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithPreviousWithinColumn.java
Index: KeepWithPreviousWithinColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithPreviousWithinColumn.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- KeepWithPreviousWithinColumn.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ KeepWithPreviousWithinColumn.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/KeepTogetherWithinLine.java
Index: KeepTogetherWithinLine.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/KeepTogetherWithinLine.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- KeepTogetherWithinLine.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ KeepTogetherWithinLine.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.7 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottomColor.java
Index: BorderBottomColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottomColor.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderBottomColor.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderBottomColor.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/WrapOption.java
Index: WrapOption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WrapOption.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- WrapOption.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ WrapOption.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.7 +4 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderCommonStyle.java
Index: BorderCommonStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderCommonStyle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderCommonStyle.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderCommonStyle.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -51,11 +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.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
1.1.2.8 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottomWidth.java
Index: BorderBottomWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottomWidth.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- BorderBottomWidth.java 31 Mar 2003 02:41:05 -0000 1.1.2.7
+++ BorderBottomWidth.java 12 Jun 2003 18:19:07 -0000 1.1.2.8
@@ -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;
1.1.2.6 +2 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/NumberColumnsRepeated.java
Index: NumberColumnsRepeated.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/NumberColumnsRepeated.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- NumberColumnsRepeated.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ NumberColumnsRepeated.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/MaxWidth.java
Index: MaxWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MaxWidth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- MaxWidth.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ MaxWidth.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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 =
1.1.2.7 +5 -9 xml-fop/src/org/apache/fop/fo/properties/Attic/CaptionSide.java
Index: CaptionSide.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/CaptionSide.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- CaptionSide.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ CaptionSide.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/PitchRange.java
Index: PitchRange.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PitchRange.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PitchRange.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ PitchRange.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/KeepTogether.java
Index: KeepTogether.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/KeepTogether.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- KeepTogether.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ KeepTogether.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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 =
1.1.2.2 +1 -0 xml-fop/src/org/apache/fop/fo/properties/Attic/Dummy.java
Index: Dummy.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Dummy.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Dummy.java 17 Nov 2002 09:56:56 -0000 1.1.2.1
+++ Dummy.java 12 Jun 2003 18:19:07 -0000 1.1.2.2
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforePrecedence.java
Index: SpaceBeforePrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforePrecedence.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceBeforePrecedence.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceBeforePrecedence.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderLengthOptimum.java
Index: LeaderLengthOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderLengthOptimum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LeaderLengthOptimum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LeaderLengthOptimum.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/MaxHeight.java
Index: MaxHeight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MaxHeight.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- MaxHeight.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ MaxHeight.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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 =
1.1.2.8 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRightWidth.java
Index: BorderRightWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRightWidth.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- BorderRightWidth.java 31 Mar 2003 02:41:05 -0000 1.1.2.7
+++ BorderRightWidth.java 12 Jun 2003 18:19:07 -0000 1.1.2.8
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBottom.java
Index: PaddingBottom.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBottom.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingBottom.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingBottom.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Height.java
Index: Height.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Height.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Height.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ Height.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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 =
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartMaximum.java
Index: SpaceStartMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartMaximum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceStartMaximum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceStartMaximum.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/WhiteSpace.java
Index: WhiteSpace.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WhiteSpace.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- WhiteSpace.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ WhiteSpace.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +5 -7 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderSpacing.java
Index: BorderSpacing.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderSpacing.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderSpacing.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BorderSpacing.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeConditionality.java
Index: SpaceBeforeConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceBeforeConditionality.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceBeforeConditionality.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +6 -7 xml-fop/src/org/apache/fop/fo/properties/Attic/SourceDocument.java
Index: SourceDocument.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SourceDocument.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SourceDocument.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SourceDocument.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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 =
1.2.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/InitialPageNumber.java
Index: InitialPageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/InitialPageNumber.java,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -u -r1.2.2.5 -r1.2.2.6
--- InitialPageNumber.java 31 Mar 2003 02:41:05 -0000 1.2.2.5
+++ InitialPageNumber.java 12 Jun 2003 18:19:07 -0000 1.2.2.6
@@ -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;
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/PageBreakBefore.java
Index: PageBreakBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PageBreakBefore.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PageBreakBefore.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ PageBreakBefore.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -51,7 +51,6 @@
*/
package org.apache.fop.fo.properties;
-import org.apache.fop.fo.properties.PageBreakCommon;
public class PageBreakBefore extends PageBreakCommon {
}
1.1.2.9 +8 -9 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderWidth.java
Index: BorderWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderWidth.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- BorderWidth.java 31 Mar 2003 02:41:05 -0000 1.1.2.8
+++ BorderWidth.java 12 Jun 2003 18:19:07 -0000 1.1.2.9
@@ -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
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithNextWithinPage.java
Index: KeepWithNextWithinPage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithNextWithinPage.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- KeepWithNextWithinPage.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ KeepWithNextWithinPage.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/TextDepth.java
Index: TextDepth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextDepth.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- TextDepth.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ TextDepth.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.7 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidth.java
Index: BorderStartWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidth.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderStartWidth.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderStartWidth.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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 =
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightConditionality.java
Index: LineHeightConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LineHeightConditionality.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LineHeightConditionality.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/ContentHeight.java
Index: ContentHeight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ContentHeight.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ContentHeight.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ ContentHeight.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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 =
1.1.2.7 +5 -9 xml-fop/src/org/apache/fop/fo/properties/Attic/FontStretch.java
Index: FontStretch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontStretch.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FontStretch.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ FontStretch.java 12 Jun 2003 18:19:07 -0000 1.1.2.7
@@ -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;
1.1.2.6 +2 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationPushCharacterCount.java
Index: HyphenationPushCharacterCount.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationPushCharacterCount.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- HyphenationPushCharacterCount.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ HyphenationPushCharacterCount.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderLength.java
Index: LeaderLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderLength.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- LeaderLength.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ LeaderLength.java 12 Jun 2003 18:19:07 -0000 1.1.2.4
@@ -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 =
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/Orphans.java
Index: Orphans.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Orphans.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Orphans.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ Orphans.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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;
1.1.2.6 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/PageHeightWidth.java
Index: PageHeightWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PageHeightWidth.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PageHeightWidth.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PageHeightWidth.java 12 Jun 2003 18:19:07 -0000 1.1.2.6
@@ -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 {
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightShiftAdjustment.java
Index: LineHeightShiftAdjustment.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightShiftAdjustment.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LineHeightShiftAdjustment.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LineHeightShiftAdjustment.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.7 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndColor.java
Index: BorderEndColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndColor.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderEndColor.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderEndColor.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/MarginRight.java
Index: MarginRight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MarginRight.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- MarginRight.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ MarginRight.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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 =
1.1.2.6 +2 -7 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRight.java
Index: BorderRight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRight.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderRight.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BorderRight.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidthConditionality.java
Index: BorderAfterWidthConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidthConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderAfterWidthConditionality.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BorderAfterWidthConditionality.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/OddOrEven.java
Index: OddOrEven.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/OddOrEven.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- OddOrEven.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ OddOrEven.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +8 -10 xml-fop/src/org/apache/fop/fo/properties/Attic/Position.java
Index: Position.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Position.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Position.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ Position.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +7 -8 xml-fop/src/org/apache/fop/fo/properties/Attic/SwitchTo.java
Index: SwitchTo.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SwitchTo.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SwitchTo.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ SwitchTo.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingConditionality.java
Index: WordSpacingConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- WordSpacingConditionality.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ WordSpacingConditionality.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/DisplayAlign.java
Index: DisplayAlign.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/DisplayAlign.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- DisplayAlign.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ DisplayAlign.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.7 +2 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidthLength.java
Index: BorderAfterWidthLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidthLength.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderAfterWidthLength.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderAfterWidthLength.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/FontStyle.java
Index: FontStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontStyle.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FontStyle.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ FontStyle.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.7 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightPrecedence.java
Index: LineHeightPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightPrecedence.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- LineHeightPrecedence.java 31 Mar 2003 02:41:06 -0000 1.1.2.6
+++ LineHeightPrecedence.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/FontVariant.java
Index: FontVariant.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontVariant.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FontVariant.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ FontVariant.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartPrecedence.java
Index: BorderStartPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartPrecedence.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderStartPrecedence.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BorderStartPrecedence.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingAfterLength.java
Index: PaddingAfterLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingAfterLength.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingAfterLength.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingAfterLength.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.7 +10 -19 xml-fop/src/org/apache/fop/fo/properties/Attic/Font.java
Index: Font.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Font.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- Font.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ Font.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -51,32 +51,23 @@
*/
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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBeforeLength.java
Index: PaddingBeforeLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBeforeLength.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingBeforeLength.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingBeforeLength.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/EndsRow.java
Index: EndsRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/EndsRow.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- EndsRow.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ EndsRow.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/ProvisionalLabelSeparation.java
Index: ProvisionalLabelSeparation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ProvisionalLabelSeparation.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ProvisionalLabelSeparation.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ ProvisionalLabelSeparation.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/RelativePosition.java
Index: RelativePosition.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RelativePosition.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- RelativePosition.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ RelativePosition.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartStyle.java
Index: BorderStartStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartStyle.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderStartStyle.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BorderStartStyle.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.7 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidth.java
Index: BorderBeforeWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidth.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderBeforeWidth.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderBeforeWidth.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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 =
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/TargetProcessingContext.java
Index: TargetProcessingContext.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TargetProcessingContext.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- TargetProcessingContext.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ TargetProcessingContext.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/ColumnCount.java
Index: ColumnCount.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColumnCount.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ColumnCount.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ ColumnCount.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/PagePosition.java
Index: PagePosition.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PagePosition.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PagePosition.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PagePosition.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.7 +4 -6 xml-fop/src/org/apache/fop/fo/properties/Attic/TextShadow.java
Index: TextShadow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextShadow.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- TextShadow.java 31 Mar 2003 02:41:07 -0000 1.1.2.6
+++ TextShadow.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/GlyphOrientationHorizontal.java
Index: GlyphOrientationHorizontal.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/GlyphOrientationHorizontal.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- GlyphOrientationHorizontal.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ GlyphOrientationHorizontal.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/CaseName.java
Index: CaseName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/CaseName.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CaseName.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ CaseName.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.7 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightOptimum.java
Index: LineHeightOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightOptimum.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- LineHeightOptimum.java 31 Mar 2003 02:41:06 -0000 1.1.2.6
+++ LineHeightOptimum.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/MasterName.java
Index: MasterName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MasterName.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- MasterName.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ MasterName.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.7 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartColor.java
Index: BorderStartColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartColor.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderStartColor.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderStartColor.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Size.java
Index: Size.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Size.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Size.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ Size.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.7 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderCommonWidth.java
Index: BorderCommonWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderCommonWidth.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderCommonWidth.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderCommonWidth.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/FontSelectionStrategy.java
Index: FontSelectionStrategy.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontSelectionStrategy.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FontSelectionStrategy.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ FontSelectionStrategy.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/TargetPresentationContext.java
Index: TargetPresentationContext.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TargetPresentationContext.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- TargetPresentationContext.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ TargetPresentationContext.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Id.java
Index: Id.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Id.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Id.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ Id.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/StartIndent.java
Index: StartIndent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/StartIndent.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- StartIndent.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ StartIndent.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndStyle.java
Index: BorderEndStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndStyle.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderEndStyle.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BorderEndStyle.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Script.java
Index: Script.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Script.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Script.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ Script.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterMinimum.java
Index: SpaceAfterMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterMinimum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceAfterMinimum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceAfterMinimum.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/MarginTop.java
Index: MarginTop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MarginTop.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- MarginTop.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ MarginTop.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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 =
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/ProvisionalDistanceBetweenStarts.java
Index: ProvisionalDistanceBetweenStarts.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ProvisionalDistanceBetweenStarts.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ProvisionalDistanceBetweenStarts.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ ProvisionalDistanceBetweenStarts.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeOptimum.java
Index: SpaceBeforeOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeOptimum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceBeforeOptimum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceBeforeOptimum.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterPrecedence.java
Index: BorderAfterPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterPrecedence.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderAfterPrecedence.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BorderAfterPrecedence.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.6 +4 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/Cue.java
Index: Cue.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Cue.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Cue.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ Cue.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderSeparationInlineProgressionDirection.java
Index: BorderSeparationInlineProgressionDirection.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderSeparationInlineProgressionDirection.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderSeparationInlineProgressionDirection.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BorderSeparationInlineProgressionDirection.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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 {
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacing.java
Index: LetterSpacing.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacing.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LetterSpacing.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LetterSpacing.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Volume.java
Index: Volume.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Volume.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Volume.java 31 Mar 2003 02:41:07 -0000 1.1.2.3
+++ Volume.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Role.java
Index: Role.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Role.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Role.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ Role.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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 =
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/AutoRestore.java
Index: AutoRestore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/AutoRestore.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- AutoRestore.java 31 Mar 2003 02:41:04 -0000 1.1.2.5
+++ AutoRestore.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/CueBefore.java
Index: CueBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/CueBefore.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CueBefore.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ CueBefore.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/SpeakNumeral.java
Index: SpeakNumeral.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpeakNumeral.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SpeakNumeral.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ SpeakNumeral.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.7 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTopColor.java
Index: BorderTopColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTopColor.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderTopColor.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderTopColor.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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;
1.1.2.7 +6 -7 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingOptimum.java
Index: WordSpacingOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingOptimum.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- WordSpacingOptimum.java 31 Mar 2003 02:41:07 -0000 1.1.2.6
+++ WordSpacingOptimum.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/VoiceFamily.java
Index: VoiceFamily.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/VoiceFamily.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- VoiceFamily.java 31 Mar 2003 02:41:07 -0000 1.1.2.3
+++ VoiceFamily.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Width.java
Index: Width.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Width.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Width.java 31 Mar 2003 02:41:07 -0000 1.1.2.3
+++ Width.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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 =
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTopStyle.java
Index: BorderTopStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTopStyle.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderTopStyle.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BorderTopStyle.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/DestinationPlacementOffset.java
Index: DestinationPlacementOffset.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/DestinationPlacementOffset.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- DestinationPlacementOffset.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ DestinationPlacementOffset.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/RetrievePosition.java
Index: RetrievePosition.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RetrievePosition.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- RetrievePosition.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ RetrievePosition.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/GlyphOrientationVertical.java
Index: GlyphOrientationVertical.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/GlyphOrientationVertical.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- GlyphOrientationVertical.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ GlyphOrientationVertical.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.6 +7 -10 xml-fop/src/org/apache/fop/fo/properties/Attic/PageBreakInside.java
Index: PageBreakInside.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PageBreakInside.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PageBreakInside.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PageBreakInside.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingOptimum.java
Index: LetterSpacingOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingOptimum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LetterSpacingOptimum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LetterSpacingOptimum.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.8 +4 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTopWidth.java
Index: BorderTopWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderTopWidth.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- BorderTopWidth.java 31 Mar 2003 02:41:05 -0000 1.1.2.7
+++ BorderTopWidth.java 12 Jun 2003 18:19:08 -0000 1.1.2.8
@@ -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;
1.1.2.7 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeColor.java
Index: BorderBeforeColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeColor.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderBeforeColor.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderBeforeColor.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/CueAfter.java
Index: CueAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/CueAfter.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CueAfter.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ CueAfter.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/IntrusionDisplace.java
Index: IntrusionDisplace.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/IntrusionDisplace.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- IntrusionDisplace.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ IntrusionDisplace.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.7 +6 -9 xml-fop/src/org/apache/fop/fo/properties/Attic/WhiteSpaceTreatment.java
Index: WhiteSpaceTreatment.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WhiteSpaceTreatment.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- WhiteSpaceTreatment.java 31 Mar 2003 02:41:07 -0000 1.1.2.6
+++ WhiteSpaceTreatment.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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;
1.1.2.7 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeftColor.java
Index: BorderLeftColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderLeftColor.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderLeftColor.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderLeftColor.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/AbsolutePosition.java
Index: AbsolutePosition.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/AbsolutePosition.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- AbsolutePosition.java 31 Mar 2003 02:41:04 -0000 1.1.2.5
+++ AbsolutePosition.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.7 +4 -8 xml-fop/src/org/apache/fop/fo/properties/Attic/AlignmentBaseline.java
Index: AlignmentBaseline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/AlignmentBaseline.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- AlignmentBaseline.java 31 Mar 2003 02:41:04 -0000 1.1.2.6
+++ AlignmentBaseline.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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;
1.1.2.6 +5 -8 xml-fop/src/org/apache/fop/fo/properties/Attic/ColorCommon.java
Index: ColorCommon.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColorCommon.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ColorCommon.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ ColorCommon.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
/**
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/KeepTogetherWithinColumn.java
Index: KeepTogetherWithinColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/KeepTogetherWithinColumn.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- KeepTogetherWithinColumn.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ KeepTogetherWithinColumn.java 12 Jun 2003 18:19:08 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBeforeConditionality.java
Index: PaddingBeforeConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBeforeConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingBeforeConditionality.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingBeforeConditionality.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.7 +5 -9 xml-fop/src/org/apache/fop/fo/properties/Attic/RuleStyle.java
Index: RuleStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RuleStyle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- RuleStyle.java 31 Mar 2003 02:41:06 -0000 1.1.2.6
+++ RuleStyle.java 12 Jun 2003 18:19:08 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderPattern.java
Index: LeaderPattern.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderPattern.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LeaderPattern.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LeaderPattern.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.9 +6 -7 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderColor.java
Index: BorderColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderColor.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- BorderColor.java 31 Mar 2003 02:41:05 -0000 1.1.2.8
+++ BorderColor.java 12 Jun 2003 18:19:08 -0000 1.1.2.9
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidthConditionality.java
Index: BorderStartWidthConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidthConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderStartWidthConditionality.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BorderStartWidthConditionality.java 12 Jun 2003 18:19:08 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottomStyle.java
Index: BorderBottomStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBottomStyle.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderBottomStyle.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BorderBottomStyle.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/MasterReference.java
Index: MasterReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MasterReference.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- MasterReference.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ MasterReference.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/ShowDestination.java
Index: ShowDestination.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ShowDestination.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ShowDestination.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ ShowDestination.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Stress.java
Index: Stress.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Stress.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Stress.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ Stress.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/SpeakHeader.java
Index: SpeakHeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpeakHeader.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SpeakHeader.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ SpeakHeader.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/TextIndent.java
Index: TextIndent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextIndent.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- TextIndent.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ TextIndent.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/ContentDimension.java
Index: ContentDimension.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ContentDimension.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ContentDimension.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ ContentDimension.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingEndConditionality.java
Index: PaddingEndConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingEndConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingEndConditionality.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingEndConditionality.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +2 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderLengthMaximum.java
Index: LeaderLengthMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderLengthMaximum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LeaderLengthMaximum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LeaderLengthMaximum.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.8 +4 -6 xml-fop/src/org/apache/fop/fo/properties/Attic/ColorTransparent.java
Index: ColorTransparent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColorTransparent.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- ColorTransparent.java 31 Mar 2003 02:41:05 -0000 1.1.2.7
+++ ColorTransparent.java 12 Jun 2003 18:19:09 -0000 1.1.2.8
@@ -51,12 +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.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
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithNextWithinLine.java
Index: KeepWithNextWithinLine.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithNextWithinLine.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- KeepWithNextWithinLine.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ KeepWithNextWithinLine.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/InlineProgressionDimensionOptimum.java
Index: InlineProgressionDimensionOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/InlineProgressionDimensionOptimum.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- InlineProgressionDimensionOptimum.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ InlineProgressionDimensionOptimum.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartMinimum.java
Index: SpaceStartMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartMinimum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceStartMinimum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceStartMinimum.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +8 -9 xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundPosition.java
Index: BackgroundPosition.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundPosition.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BackgroundPosition.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BackgroundPosition.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/PageWidth.java
Index: PageWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PageWidth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PageWidth.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ PageWidth.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.7 +4 -6 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacing.java
Index: WordSpacing.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacing.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- WordSpacing.java 31 Mar 2003 02:41:07 -0000 1.1.2.6
+++ WordSpacing.java 12 Jun 2003 18:19:09 -0000 1.1.2.7
@@ -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 =
1.1.2.7 +4 -8 xml-fop/src/org/apache/fop/fo/properties/Attic/ActiveState.java
Index: ActiveState.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ActiveState.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- ActiveState.java 31 Mar 2003 02:41:04 -0000 1.1.2.6
+++ ActiveState.java 12 Jun 2003 18:19:09 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderLengthMinimum.java
Index: LeaderLengthMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderLengthMinimum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LeaderLengthMinimum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LeaderLengthMinimum.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/NumberRowsSpanned.java
Index: NumberRowsSpanned.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/NumberRowsSpanned.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- NumberRowsSpanned.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ NumberRowsSpanned.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingAfterConditionality.java
Index: PaddingAfterConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingAfterConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingAfterConditionality.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingAfterConditionality.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/RuleThickness.java
Index: RuleThickness.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RuleThickness.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- RuleThickness.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ RuleThickness.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/PauseAfter.java
Index: PauseAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PauseAfter.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PauseAfter.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ PauseAfter.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/StartsRow.java
Index: StartsRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/StartsRow.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- StartsRow.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ StartsRow.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeStyle.java
Index: BorderBeforeStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeStyle.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderBeforeStyle.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BorderBeforeStyle.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.7 +6 -9 xml-fop/src/org/apache/fop/fo/properties/Attic/TextAlignLast.java
Index: TextAlignLast.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextAlignLast.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- TextAlignLast.java 31 Mar 2003 02:41:07 -0000 1.1.2.6
+++ TextAlignLast.java 12 Jun 2003 18:19:09 -0000 1.1.2.7
@@ -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;
1.1.2.7 +2 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidthLength.java
Index: BorderStartWidthLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStartWidthLength.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderStartWidthLength.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderStartWidthLength.java 12 Jun 2003 18:19:09 -0000 1.1.2.7
@@ -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;
1.1.2.7 +2 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidthLength.java
Index: BorderBeforeWidthLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidthLength.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderBeforeWidthLength.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderBeforeWidthLength.java 12 Jun 2003 18:19:09 -0000 1.1.2.7
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/GroupingSeparator.java
Index: GroupingSeparator.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/GroupingSeparator.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- GroupingSeparator.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ GroupingSeparator.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndMinimum.java
Index: SpaceEndMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndMinimum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceEndMinimum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceEndMinimum.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingPrecedence.java
Index: WordSpacingPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingPrecedence.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- WordSpacingPrecedence.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ WordSpacingPrecedence.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.7 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRightColor.java
Index: BorderRightColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderRightColor.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderRightColor.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderRightColor.java 12 Jun 2003 18:19:09 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeMinimum.java
Index: SpaceBeforeMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBeforeMinimum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceBeforeMinimum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceBeforeMinimum.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterOptimum.java
Index: SpaceAfterOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterOptimum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceAfterOptimum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceAfterOptimum.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/EndIndent.java
Index: EndIndent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/EndIndent.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- EndIndent.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ EndIndent.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BlockProgressionDimensionOptimum.java
Index: BlockProgressionDimensionOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BlockProgressionDimensionOptimum.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BlockProgressionDimensionOptimum.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BlockProgressionDimensionOptimum.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.7 +5 -8 xml-fop/src/org/apache/fop/fo/properties/Attic/TextAlign.java
Index: TextAlign.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextAlign.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- TextAlign.java 31 Mar 2003 02:41:07 -0000 1.1.2.6
+++ TextAlign.java 12 Jun 2003 18:19:09 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/Hyphenate.java
Index: Hyphenate.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Hyphenate.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Hyphenate.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ Hyphenate.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.7 +4 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/BreakCommon.java
Index: BreakCommon.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BreakCommon.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BreakCommon.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BreakCommon.java 12 Jun 2003 18:19:09 -0000 1.1.2.7
@@ -51,11 +51,10 @@
*/
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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndOptimum.java
Index: SpaceEndOptimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndOptimum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceEndOptimum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceEndOptimum.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.7 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightMinimum.java
Index: LineHeightMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightMinimum.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- LineHeightMinimum.java 31 Mar 2003 02:41:06 -0000 1.1.2.6
+++ LineHeightMinimum.java 12 Jun 2003 18:19:09 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/UnicodeBidi.java
Index: UnicodeBidi.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/UnicodeBidi.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- UnicodeBidi.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ UnicodeBidi.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/SuppressAtLineBreak.java
Index: SuppressAtLineBreak.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SuppressAtLineBreak.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SuppressAtLineBreak.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SuppressAtLineBreak.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Pitch.java
Index: Pitch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Pitch.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Pitch.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ Pitch.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/WhiteSpaceCollapse.java
Index: WhiteSpaceCollapse.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WhiteSpaceCollapse.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- WhiteSpaceCollapse.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ WhiteSpaceCollapse.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/ColumnNumber.java
Index: ColumnNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColumnNumber.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ColumnNumber.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ ColumnNumber.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +8 -12 xml-fop/src/org/apache/fop/fo/properties/Attic/FontFamily.java
Index: FontFamily.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontFamily.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FontFamily.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ FontFamily.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/RetrieveClassName.java
Index: RetrieveClassName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RetrieveClassName.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- RetrieveClassName.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ RetrieveClassName.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderSeparation.java
Index: BorderSeparation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderSeparation.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderSeparation.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BorderSeparation.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundRepeat.java
Index: BackgroundRepeat.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundRepeat.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BackgroundRepeat.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BackgroundRepeat.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Speak.java
Index: Speak.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Speak.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Speak.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ Speak.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +4 -6 xml-fop/src/org/apache/fop/fo/properties/Attic/FontWeight.java
Index: FontWeight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontWeight.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FontWeight.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ FontWeight.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Right.java
Index: Right.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Right.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Right.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ Right.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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 =
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBefore.java
Index: PaddingBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingBefore.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingBefore.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingBefore.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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 =
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithPrevious.java
Index: KeepWithPrevious.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/KeepWithPrevious.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- KeepWithPrevious.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ KeepWithPrevious.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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 =
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundImage.java
Index: BackgroundImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundImage.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BackgroundImage.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BackgroundImage.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/StartingState.java
Index: StartingState.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/StartingState.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- StartingState.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ StartingState.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/RelativeAlign.java
Index: RelativeAlign.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RelativeAlign.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- RelativeAlign.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ RelativeAlign.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/CaseTitle.java
Index: CaseTitle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/CaseTitle.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CaseTitle.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ CaseTitle.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Src.java
Index: Src.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Src.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Src.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ Src.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/TextTransform.java
Index: TextTransform.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextTransform.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- TextTransform.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ TextTransform.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/MarkerClassName.java
Index: MarkerClassName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MarkerClassName.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- MarkerClassName.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ MarkerClassName.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforePrecedence.java
Index: BorderBeforePrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforePrecedence.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderBeforePrecedence.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BorderBeforePrecedence.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Azimuth.java
Index: Azimuth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Azimuth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Azimuth.java 31 Mar 2003 02:41:04 -0000 1.1.2.3
+++ Azimuth.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/InlineProgressionDimension.java
Index: InlineProgressionDimension.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/InlineProgressionDimension.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- InlineProgressionDimension.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ InlineProgressionDimension.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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 =
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/EmptyCells.java
Index: EmptyCells.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/EmptyCells.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- EmptyCells.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ EmptyCells.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterPrecedence.java
Index: SpaceAfterPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfterPrecedence.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceAfterPrecedence.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceAfterPrecedence.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndMaximum.java
Index: SpaceEndMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceEndMaximum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceEndMaximum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceEndMaximum.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/FontSizeAdjust.java
Index: FontSizeAdjust.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FontSizeAdjust.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FontSizeAdjust.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ FontSizeAdjust.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +8 -9 xml-fop/src/org/apache/fop/fo/properties/Attic/Padding.java
Index: Padding.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Padding.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Padding.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ Padding.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.7 +6 -9 xml-fop/src/org/apache/fop/fo/properties/Attic/WritingMode.java
Index: WritingMode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WritingMode.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- WritingMode.java 31 Mar 2003 02:41:07 -0000 1.1.2.6
+++ WritingMode.java 12 Jun 2003 18:19:09 -0000 1.1.2.7
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/SpeechRate.java
Index: SpeechRate.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpeechRate.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SpeechRate.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ SpeechRate.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.8 +4 -6 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeight.java
Index: LineHeight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeight.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- LineHeight.java 31 Mar 2003 02:41:06 -0000 1.1.2.7
+++ LineHeight.java 12 Jun 2003 18:19:09 -0000 1.1.2.8
@@ -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 =
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/Direction.java
Index: Direction.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Direction.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Direction.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ Direction.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/RetrieveBoundary.java
Index: RetrieveBoundary.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RetrieveBoundary.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- RetrieveBoundary.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ RetrieveBoundary.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationCharacter.java
Index: HyphenationCharacter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/HyphenationCharacter.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- HyphenationCharacter.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ HyphenationCharacter.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.7 +3 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterColor.java
Index: BorderAfterColor.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterColor.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderAfterColor.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderAfterColor.java 12 Jun 2003 18:19:09 -0000 1.1.2.7
@@ -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;
1.1.2.6 +10 -12 xml-fop/src/org/apache/fop/fo/properties/Attic/Background.java
Index: Background.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Background.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Background.java 31 Mar 2003 02:41:04 -0000 1.1.2.5
+++ Background.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -51,23 +51,21 @@
*/
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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingAfter.java
Index: PaddingAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingAfter.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingAfter.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingAfter.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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 =
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/TableOmitHeaderAtBreak.java
Index: TableOmitHeaderAtBreak.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TableOmitHeaderAtBreak.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- TableOmitHeaderAtBreak.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ TableOmitHeaderAtBreak.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartConditionality.java
Index: SpaceStartConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceStartConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceStartConditionality.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceStartConditionality.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +2 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundPositionVertical.java
Index: BackgroundPositionVertical.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundPositionVertical.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BackgroundPositionVertical.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BackgroundPositionVertical.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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 =
1.1.2.4 +1 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PageHeight.java
Index: PageHeight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PageHeight.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PageHeight.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ PageHeight.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingMaximum.java
Index: LetterSpacingMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingMaximum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LetterSpacingMaximum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LetterSpacingMaximum.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingLeft.java
Index: PaddingLeft.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingLeft.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingLeft.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingLeft.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/SpeakPunctuation.java
Index: SpeakPunctuation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpeakPunctuation.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- SpeakPunctuation.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ SpeakPunctuation.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.9 +8 -11 xml-fop/src/org/apache/fop/fo/properties/Attic/TextDecoration.java
Index: TextDecoration.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TextDecoration.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- TextDecoration.java 31 Mar 2003 02:41:07 -0000 1.1.2.8
+++ TextDecoration.java 12 Jun 2003 18:19:09 -0000 1.1.2.9
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/MaximumRepeats.java
Index: MaximumRepeats.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MaximumRepeats.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- MaximumRepeats.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ MaximumRepeats.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Span.java
Index: Span.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Span.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Span.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ Span.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.7 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightMaximum.java
Index: LineHeightMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineHeightMaximum.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- LineHeightMaximum.java 31 Mar 2003 02:41:06 -0000 1.1.2.6
+++ LineHeightMaximum.java 12 Jun 2003 18:19:09 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/MinHeight.java
Index: MinHeight.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MinHeight.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- MinHeight.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ MinHeight.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.7 +4 -8 xml-fop/src/org/apache/fop/fo/properties/Attic/ForcePageCount.java
Index: ForcePageCount.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ForcePageCount.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- ForcePageCount.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ ForcePageCount.java 12 Jun 2003 18:19:09 -0000 1.1.2.7
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/Scaling.java
Index: Scaling.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Scaling.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Scaling.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ Scaling.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingStartLength.java
Index: PaddingStartLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingStartLength.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingStartLength.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingStartLength.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingPrecedence.java
Index: LetterSpacingPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingPrecedence.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LetterSpacingPrecedence.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LetterSpacingPrecedence.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +2 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/ExternalDestination.java
Index: ExternalDestination.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ExternalDestination.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ExternalDestination.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ ExternalDestination.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/ZIndex.java
Index: ZIndex.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ZIndex.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ZIndex.java 31 Mar 2003 02:41:07 -0000 1.1.2.3
+++ ZIndex.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/ColumnGap.java
Index: ColumnGap.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColumnGap.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ColumnGap.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ ColumnGap.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/Extent.java
Index: Extent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Extent.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Extent.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ Extent.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBefore.java
Index: SpaceBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceBefore.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceBefore.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceBefore.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/ContentWidth.java
Index: ContentWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ContentWidth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ContentWidth.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ ContentWidth.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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 =
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingEnd.java
Index: PaddingEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingEnd.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingEnd.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingEnd.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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 =
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/TableLayout.java
Index: TableLayout.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/TableLayout.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- TableLayout.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ TableLayout.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/Visibility.java
Index: Visibility.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Visibility.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Visibility.java 31 Mar 2003 02:41:07 -0000 1.1.2.5
+++ Visibility.java 12 Jun 2003 18:19:09 -0000 1.1.2.6
@@ -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;
1.1.2.7 +4 -8 xml-fop/src/org/apache/fop/fo/properties/Attic/RegionName.java
Index: RegionName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/RegionName.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- RegionName.java 31 Mar 2003 02:41:06 -0000 1.1.2.6
+++ RegionName.java 12 Jun 2003 18:19:09 -0000 1.1.2.7
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/ContentType.java
Index: ContentType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ContentType.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ContentType.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ ContentType.java 12 Jun 2003 18:19:09 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/FlowName.java
Index: FlowName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/FlowName.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FlowName.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ FlowName.java 12 Jun 2003 18:19:10 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/InternalDestination.java
Index: InternalDestination.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/InternalDestination.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- InternalDestination.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ InternalDestination.java 12 Jun 2003 18:19:10 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndPrecedence.java
Index: BorderEndPrecedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderEndPrecedence.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderEndPrecedence.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BorderEndPrecedence.java 12 Jun 2003 18:19:10 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/LinefeedTreatment.java
Index: LinefeedTreatment.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LinefeedTreatment.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LinefeedTreatment.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LinefeedTreatment.java 12 Jun 2003 18:19:10 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingCommon.java
Index: WordSpacingCommon.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingCommon.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- WordSpacingCommon.java 31 Mar 2003 02:41:07 -0000 1.1.2.3
+++ WordSpacingCommon.java 12 Jun 2003 18:19:10 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/LineStackingStrategy.java
Index: LineStackingStrategy.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LineStackingStrategy.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LineStackingStrategy.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LineStackingStrategy.java 12 Jun 2003 18:19:10 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingTop.java
Index: PaddingTop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PaddingTop.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- PaddingTop.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ PaddingTop.java 12 Jun 2003 18:19:10 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/PauseBefore.java
Index: PauseBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/PauseBefore.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- PauseBefore.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ PauseBefore.java 12 Jun 2003 18:19:10 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterStyle.java
Index: BorderAfterStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterStyle.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BorderAfterStyle.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BorderAfterStyle.java 12 Jun 2003 18:19:10 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BreakBefore.java
Index: BreakBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BreakBefore.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BreakBefore.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BreakBefore.java 12 Jun 2003 18:19:10 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Richness.java
Index: Richness.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Richness.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Richness.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ Richness.java 12 Jun 2003 18:19:10 -0000 1.1.2.4
@@ -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;
1.1.2.7 +6 -7 xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingMaximum.java
Index: WordSpacingMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/WordSpacingMaximum.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- WordSpacingMaximum.java 31 Mar 2003 02:41:07 -0000 1.1.2.6
+++ WordSpacingMaximum.java 12 Jun 2003 18:19:10 -0000 1.1.2.7
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/ColumnWidth.java
Index: ColumnWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ColumnWidth.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ColumnWidth.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ ColumnWidth.java 12 Jun 2003 18:19:10 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/GroupingSize.java
Index: GroupingSize.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/GroupingSize.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- GroupingSize.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ GroupingSize.java 12 Jun 2003 18:19:10 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/BlockProgressionDimensionMaximum.java
Index: BlockProgressionDimensionMaximum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BlockProgressionDimensionMaximum.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BlockProgressionDimensionMaximum.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ BlockProgressionDimensionMaximum.java 12 Jun 2003 18:19:10 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/Precedence.java
Index: Precedence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Precedence.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Precedence.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ Precedence.java 12 Jun 2003 18:19:10 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingMinimum.java
Index: LetterSpacingMinimum.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LetterSpacingMinimum.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LetterSpacingMinimum.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LetterSpacingMinimum.java 12 Jun 2003 18:19:10 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfter.java
Index: SpaceAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/SpaceAfter.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- SpaceAfter.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ SpaceAfter.java 12 Jun 2003 18:19:10 -0000 1.1.2.6
@@ -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;
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidthConditionality.java
Index: BorderBeforeWidthConditionality.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderBeforeWidthConditionality.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BorderBeforeWidthConditionality.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BorderBeforeWidthConditionality.java 12 Jun 2003 18:19:10 -0000 1.1.2.6
@@ -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;
1.1.2.7 +6 -9 xml-fop/src/org/apache/fop/fo/properties/Attic/VerticalAlign.java
Index: VerticalAlign.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/VerticalAlign.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- VerticalAlign.java 31 Mar 2003 02:41:07 -0000 1.1.2.6
+++ VerticalAlign.java 12 Jun 2003 18:19:10 -0000 1.1.2.7
@@ -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 =
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/MediaUsage.java
Index: MediaUsage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/MediaUsage.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- MediaUsage.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ MediaUsage.java 12 Jun 2003 18:19:10 -0000 1.1.2.6
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Country.java
Index: Country.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Country.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Country.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ Country.java 12 Jun 2003 18:19:10 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Elevation.java
Index: Elevation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Elevation.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Elevation.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ Elevation.java 12 Jun 2003 18:19:10 -0000 1.1.2.4
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Pause.java
Index: Pause.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Pause.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Pause.java 31 Mar 2003 02:41:06 -0000 1.1.2.3
+++ Pause.java 12 Jun 2003 18:19:10 -0000 1.1.2.4
@@ -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;
1.1.2.7 +7 -10 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStyle.java
Index: BorderStyle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderStyle.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderStyle.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderStyle.java 12 Jun 2003 18:19:10 -0000 1.1.2.7
@@ -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;
1.1.2.4 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/Language.java
Index: Language.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/Language.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Language.java 31 Mar 2003 02:41:05 -0000 1.1.2.3
+++ Language.java 12 Jun 2003 18:19:10 -0000 1.1.2.4
@@ -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;
1.1.2.6 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderPatternWidth.java
Index: LeaderPatternWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LeaderPatternWidth.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LeaderPatternWidth.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LeaderPatternWidth.java 12 Jun 2003 18:19:10 -0000 1.1.2.6
@@ -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;
1.1.2.7 +3 -5 xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidth.java
Index: BorderAfterWidth.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BorderAfterWidth.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- BorderAfterWidth.java 31 Mar 2003 02:41:05 -0000 1.1.2.6
+++ BorderAfterWidth.java 12 Jun 2003 18:19:10 -0000 1.1.2.7
@@ -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 =
1.1.2.6 +2 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundPositionHorizontal.java
Index: BackgroundPositionHorizontal.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/BackgroundPositionHorizontal.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- BackgroundPositionHorizontal.java 31 Mar 2003 02:41:05 -0000 1.1.2.5
+++ BackgroundPositionHorizontal.java 12 Jun 2003 18:19:10 -0000 1.1.2.6
@@ -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 =
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/fo/properties/Attic/ReferenceOrientation.java
Index: ReferenceOrientation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/ReferenceOrientation.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ReferenceOrientation.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ ReferenceOrientation.java 12 Jun 2003 18:19:10 -0000 1.1.2.6
@@ -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;
1.1.2.6 +1 -3 xml-fop/src/org/apache/fop/fo/properties/Attic/LetterValue.java
Index: LetterValue.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/properties/Attic/LetterValue.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- LetterValue.java 31 Mar 2003 02:41:06 -0000 1.1.2.5
+++ LetterValue.java 12 Jun 2003 18:19:10 -0000 1.1.2.6
@@ -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;
No revision
No revision
1.1.2.13 +14 -19 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTitle.java
Index: FoTitle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTitle.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoTitle.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoTitle.java 12 Jun 2003 18:19:30 -0000 1.1.2.13
@@ -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 @@
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 @@
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);
1.1.2.11 +10 -14 xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageNumber.java
Index: FoPageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageNumber.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoPageNumber.java 31 Mar 2003 02:39:25 -0000 1.1.2.10
+++ FoPageNumber.java 12 Jun 2003 18:19:30 -0000 1.1.2.11
@@ -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.
1.1.2.13 +14 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCaption.java
Index: FoTableCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCaption.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoTableCaption.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoTableCaption.java 12 Jun 2003 18:19:30 -0000 1.1.2.13
@@ -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 @@
// 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 @@
// 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);
1.1.2.13 +14 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCell.java
Index: FoTableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableCell.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoTableCell.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoTableCell.java 12 Jun 2003 18:19:30 -0000 1.1.2.13
@@ -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 @@
// 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 @@
// 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);
1.1.2.13 +14 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInline.java
Index: FoInline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInline.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoInline.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoInline.java 12 Jun 2003 18:19:30 -0000 1.1.2.13
@@ -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 @@
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 @@
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);
1.1.2.13 +15 -18 xml-fop/src/org/apache/fop/fo/flow/Attic/FoLeader.java
Index: FoLeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoLeader.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoLeader.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoLeader.java 12 Jun 2003 18:19:30 -0000 1.1.2.13
@@ -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 @@
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 @@
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);
1.1.2.14 +14 -16 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnote.java
Index: FoFootnote.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnote.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoFootnote.java 31 Mar 2003 02:39:25 -0000 1.1.2.13
+++ FoFootnote.java 12 Jun 2003 18:19:30 -0000 1.1.2.14
@@ -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 @@
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 @@
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);
/*
1.1.2.13 +14 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java
Index: FoFootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFootnoteBody.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoFootnoteBody.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoFootnoteBody.java 12 Jun 2003 18:19:30 -0000 1.1.2.13
@@ -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 @@
// 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 @@
// 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);
1.1.2.11 +10 -14 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInitialPropertySet.java
Index: FoInitialPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInitialPropertySet.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoInitialPropertySet.java 31 Mar 2003 02:39:25 -0000 1.1.2.10
+++ FoInitialPropertySet.java 12 Jun 2003 18:19:30 -0000 1.1.2.11
@@ -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.
1.1.2.14 +14 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java
Index: FoBidiOverride.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBidiOverride.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoBidiOverride.java 31 Mar 2003 02:39:25 -0000 1.1.2.13
+++ FoBidiOverride.java 12 Jun 2003 18:19:30 -0000 1.1.2.14
@@ -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 @@
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 @@
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);
1.1.2.13 +14 -18 xml-fop/src/org/apache/fop/fo/flow/Attic/FoWrapper.java
Index: FoWrapper.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoWrapper.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoWrapper.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoWrapper.java 12 Jun 2003 18:19:30 -0000 1.1.2.13
@@ -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 @@
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 @@
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);
1.1.2.11 +10 -14 xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageNumberCitation.java
Index: FoPageNumberCitation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageNumberCitation.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoPageNumberCitation.java 31 Mar 2003 02:39:25 -0000 1.1.2.10
+++ FoPageNumberCitation.java 12 Jun 2003 18:19:30 -0000 1.1.2.11
@@ -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.
1.1.2.14 +15 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableFooter.java
Index: FoTableFooter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableFooter.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoTableFooter.java 31 Mar 2003 02:39:25 -0000 1.1.2.13
+++ FoTableFooter.java 12 Jun 2003 18:19:30 -0000 1.1.2.14
@@ -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 @@
!= 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 @@
!= 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 @@
!= 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)
1.1.2.14 +14 -16 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiProperties.java
Index: FoMultiProperties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiProperties.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoMultiProperties.java 31 Mar 2003 02:39:25 -0000 1.1.2.13
+++ FoMultiProperties.java 12 Jun 2003 18:19:30 -0000 1.1.2.14
@@ -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 @@
!= 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 @@
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);
/*
1.1.2.11 +10 -14 xml-fop/src/org/apache/fop/fo/flow/Attic/FoExternalGraphic.java
Index: FoExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoExternalGraphic.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoExternalGraphic.java 31 Mar 2003 02:39:25 -0000 1.1.2.10
+++ FoExternalGraphic.java 12 Jun 2003 18:19:30 -0000 1.1.2.11
@@ -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.
1.1.2.11 +9 -14 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java
Index: FoMultiPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiPropertySet.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoMultiPropertySet.java 31 Mar 2003 02:39:25 -0000 1.1.2.10
+++ FoMultiPropertySet.java 12 Jun 2003 18:19:31 -0000 1.1.2.11
@@ -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.
1.1.2.11 +9 -14 xml-fop/src/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java
Index: FoRetrieveMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoRetrieveMarker.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoRetrieveMarker.java 31 Mar 2003 02:39:25 -0000 1.1.2.10
+++ FoRetrieveMarker.java 12 Jun 2003 18:19:31 -0000 1.1.2.11
@@ -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.
1.1.2.14 +15 -18 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java
Index: FoBasicLink.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBasicLink.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoBasicLink.java 31 Mar 2003 02:39:25 -0000 1.1.2.13
+++ FoBasicLink.java 12 Jun 2003 18:19:31 -0000 1.1.2.14
@@ -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 @@
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 @@
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);
1.1.2.11 +10 -14 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableColumn.java
Index: FoTableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableColumn.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoTableColumn.java 31 Mar 2003 02:39:25 -0000 1.1.2.10
+++ FoTableColumn.java 12 Jun 2003 18:19:31 -0000 1.1.2.11
@@ -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.
1.1.2.9 +10 -14 xml-fop/src/org/apache/fop/fo/flow/Attic/FoPcdata.java
Index: FoPcdata.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoPcdata.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoPcdata.java 31 Mar 2003 02:39:25 -0000 1.1.2.8
+++ FoPcdata.java 12 Jun 2003 18:19:31 -0000 1.1.2.9
@@ -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.
1.1.2.13 +15 -18 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiCase.java
Index: FoMultiCase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiCase.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoMultiCase.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoMultiCase.java 12 Jun 2003 18:19:31 -0000 1.1.2.13
@@ -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 @@
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 @@
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);
1.1.2.14 +15 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableHeader.java
Index: FoTableHeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableHeader.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoTableHeader.java 31 Mar 2003 02:39:25 -0000 1.1.2.13
+++ FoTableHeader.java 12 Jun 2003 18:19:31 -0000 1.1.2.14
@@ -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 @@
!= 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 @@
!= 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 @@
!= 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)
1.1.2.12 +10 -14 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java
Index: FoInstreamForeignObject.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInstreamForeignObject.java,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- FoInstreamForeignObject.java 31 Mar 2003 02:39:25 -0000 1.1.2.11
+++ FoInstreamForeignObject.java 12 Jun 2003 18:19:31 -0000 1.1.2.12
@@ -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.
1.1.2.14 +14 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java
Index: FoBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlock.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoBlock.java 31 Mar 2003 02:39:25 -0000 1.1.2.13
+++ FoBlock.java 12 Jun 2003 18:19:31 -0000 1.1.2.14
@@ -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 @@
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 @@
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);
1.1.2.13 +14 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoInlineContainer.java
Index: FoInlineContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoInlineContainer.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoInlineContainer.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoInlineContainer.java 12 Jun 2003 18:19:31 -0000 1.1.2.13
@@ -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 @@
// 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 @@
// 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);
1.1.2.11 +16 -19 xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageSequence.java
Index: FoPageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoPageSequence.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoPageSequence.java 31 Mar 2003 02:39:25 -0000 1.1.2.10
+++ FoPageSequence.java 12 Jun 2003 18:19:31 -0000 1.1.2.11
@@ -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 @@
// 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 @@
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 @@
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) {
1.1.2.13 +14 -18 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemBody.java
Index: FoListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemBody.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoListItemBody.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoListItemBody.java 12 Jun 2003 18:19:31 -0000 1.1.2.13
@@ -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 @@
// 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 @@
// 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);
1.1.2.14 +13 -15 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableRow.java
Index: FoTableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableRow.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoTableRow.java 31 Mar 2003 02:39:25 -0000 1.1.2.13
+++ FoTableRow.java 12 Jun 2003 18:19:31 -0000 1.1.2.14
@@ -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 @@
!= 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)
1.1.2.13 +14 -18 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemLabel.java
Index: FoListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItemLabel.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoListItemLabel.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoListItemLabel.java 12 Jun 2003 18:19:31 -0000 1.1.2.13
@@ -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 @@
// 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 @@
// 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);
1.1.2.14 +18 -20 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTable.java
Index: FoTable.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTable.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoTable.java 31 Mar 2003 02:39:25 -0000 1.1.2.13
+++ FoTable.java 12 Jun 2003 18:19:31 -0000 1.1.2.14
@@ -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 @@
!= 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 @@
!= 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 @@
!= 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 @@
!= 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 @@
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 @@
// 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);
}
1.1.2.2 +1 -0 xml-fop/src/org/apache/fop/fo/flow/Attic/Dummy.java
Index: Dummy.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/Dummy.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Dummy.java 17 Nov 2002 09:48:22 -0000 1.1.2.1
+++ Dummy.java 12 Jun 2003 18:19:31 -0000 1.1.2.2
@@ -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;
1.1.2.11 +13 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoStaticContent.java
Index: FoStaticContent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoStaticContent.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoStaticContent.java 31 Mar 2003 02:39:25 -0000 1.1.2.10
+++ FoStaticContent.java 12 Jun 2003 18:19:31 -0000 1.1.2.11
@@ -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 @@
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 @@
//("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) {
1.1.2.11 +13 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFlow.java
Index: FoFlow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFlow.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoFlow.java 31 Mar 2003 02:39:25 -0000 1.1.2.10
+++ FoFlow.java 12 Jun 2003 18:19:31 -0000 1.1.2.11
@@ -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 @@
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 @@
//("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);
1.1.2.13 +15 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java
Index: FoTableAndCaption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableAndCaption.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoTableAndCaption.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoTableAndCaption.java 12 Jun 2003 18:19:31 -0000 1.1.2.13
@@ -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 @@
!= 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 @@
!= 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 @@
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);
/*
1.1.2.13 +13 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java
Index: FoFloat.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoFloat.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoFloat.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoFloat.java 12 Jun 2003 18:19:31 -0000 1.1.2.13
@@ -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 @@
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 @@
// 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);
1.1.2.11 +3 -14 xml-fop/src/org/apache/fop/fo/flow/Attic/FoNoFo.java
Index: FoNoFo.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoNoFo.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoNoFo.java 31 Mar 2003 02:39:25 -0000 1.1.2.10
+++ FoNoFo.java 12 Jun 2003 18:19:31 -0000 1.1.2.11
@@ -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.
1.1.2.14 +14 -16 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListBlock.java
Index: FoListBlock.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListBlock.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoListBlock.java 31 Mar 2003 02:39:25 -0000 1.1.2.13
+++ FoListBlock.java 12 Jun 2003 18:19:31 -0000 1.1.2.14
@@ -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 @@
!= 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 @@
!= 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);
}
1.1.2.14 +13 -15 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java
Index: FoMultiSwitch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiSwitch.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoMultiSwitch.java 31 Mar 2003 02:39:25 -0000 1.1.2.13
+++ FoMultiSwitch.java 12 Jun 2003 18:19:31 -0000 1.1.2.14
@@ -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 @@
!= 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);
}
1.1.2.13 +15 -18 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiToggle.java
Index: FoMultiToggle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMultiToggle.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoMultiToggle.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoMultiToggle.java 12 Jun 2003 18:19:31 -0000 1.1.2.13
@@ -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 @@
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 @@
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);
1.1.2.13 +14 -18 xml-fop/src/org/apache/fop/fo/flow/Attic/FoMarker.java
Index: FoMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoMarker.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoMarker.java 31 Mar 2003 02:39:25 -0000 1.1.2.12
+++ FoMarker.java 12 Jun 2003 18:19:31 -0000 1.1.2.13
@@ -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 @@
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 @@
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);
1.1.2.14 +15 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItem.java
Index: FoListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoListItem.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoListItem.java 31 Mar 2003 02:39:25 -0000 1.1.2.13
+++ FoListItem.java 12 Jun 2003 18:19:31 -0000 1.1.2.14
@@ -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 @@
!= 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 @@
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 @@
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);
/*
1.1.2.14 +13 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java
Index: FoBlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoBlockContainer.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoBlockContainer.java 31 Mar 2003 02:39:25 -0000 1.1.2.13
+++ FoBlockContainer.java 12 Jun 2003 18:19:31 -0000 1.1.2.14
@@ -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 @@
// 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 @@
// 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);
1.1.2.14 +15 -17 xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableBody.java
Index: FoTableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoTableBody.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FoTableBody.java 31 Mar 2003 02:39:25 -0000 1.1.2.13
+++ FoTableBody.java 12 Jun 2003 18:19:31 -0000 1.1.2.14
@@ -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 @@
!= 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 @@
!= 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 @@
!= 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)
1.1.2.11 +10 -14 xml-fop/src/org/apache/fop/fo/flow/Attic/FoCharacter.java
Index: FoCharacter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/FoCharacter.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoCharacter.java 31 Mar 2003 02:39:25 -0000 1.1.2.10
+++ FoCharacter.java 12 Jun 2003 18:19:31 -0000 1.1.2.11
@@ -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.
No revision
No revision
1.1.2.6 +5 -6 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBefore.java
Index: FoRegionBefore.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBefore.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoRegionBefore.java 31 Mar 2003 02:40:09 -0000 1.1.2.5
+++ FoRegionBefore.java 12 Jun 2003 18:19:33 -0000 1.1.2.6
@@ -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
1.1.2.6 +5 -6 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionAfter.java
Index: FoRegionAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionAfter.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoRegionAfter.java 31 Mar 2003 02:40:09 -0000 1.1.2.5
+++ FoRegionAfter.java 12 Jun 2003 18:19:33 -0000 1.1.2.6
@@ -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
1.1.2.8 +9 -14 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionStartEnd.java
Index: FoRegionStartEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionStartEnd.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoRegionStartEnd.java 31 Mar 2003 02:40:09 -0000 1.1.2.7
+++ FoRegionStartEnd.java 12 Jun 2003 18:19:33 -0000 1.1.2.8
@@ -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
1.1.2.8 +10 -14 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBody.java
Index: FoRegionBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBody.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoRegionBody.java 31 Mar 2003 02:40:09 -0000 1.1.2.7
+++ FoRegionBody.java 12 Jun 2003 18:19:33 -0000 1.1.2.8
@@ -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
1.1.2.22 +10 -15 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
Index: FoLayoutMasterSet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- FoLayoutMasterSet.java 31 Mar 2003 02:40:08 -0000 1.1.2.21
+++ FoLayoutMasterSet.java 12 Jun 2003 18:19:33 -0000 1.1.2.22
@@ -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;
/**
* <tt>FoLayoutMasterSet</tt> is the class which processes the
@@ -220,7 +215,7 @@
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) {
1.1.2.8 +9 -14 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBeforeAfter.java
Index: FoRegionBeforeAfter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionBeforeAfter.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FoRegionBeforeAfter.java 31 Mar 2003 02:40:09 -0000 1.1.2.7
+++ FoRegionBeforeAfter.java 12 Jun 2003 18:19:33 -0000 1.1.2.8
@@ -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
1.1.2.6 +5 -6 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionStart.java
Index: FoRegionStart.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionStart.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoRegionStart.java 31 Mar 2003 02:40:09 -0000 1.1.2.5
+++ FoRegionStart.java 12 Jun 2003 18:19:33 -0000 1.1.2.6
@@ -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
1.1.2.20 +13 -19 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
Index: FoPageSequenceMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- FoPageSequenceMaster.java 31 Mar 2003 02:40:09 -0000 1.1.2.19
+++ FoPageSequenceMaster.java 12 Jun 2003 18:19:33 -0000 1.1.2.20
@@ -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 @@
} 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 @@
// ("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) {
1.4.2.8 +15 -25 xml-fop/src/org/apache/fop/fo/pagination/Attic/PageSequenceMaster.java
Index: PageSequenceMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/PageSequenceMaster.java,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -u -r1.4.2.7 -r1.4.2.8
--- PageSequenceMaster.java 31 Mar 2003 02:40:09 -0000 1.4.2.7
+++ PageSequenceMaster.java 12 Jun 2003 18:19:33 -0000 1.4.2.8
@@ -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 <b>fo:page-sequence-master</b> and associated
1.1.2.17 +18 -21 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java
Index: FoSimplePageMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoSimplePageMaster.java,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- FoSimplePageMaster.java 31 Mar 2003 02:40:09 -0000 1.1.2.16
+++ FoSimplePageMaster.java 12 Jun 2003 18:19:33 -0000 1.1.2.17
@@ -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 @@
+ 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 @@
{
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 @@
{
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 @@
{
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 @@
{
regionEnd = new FoRegionEnd(foTree, this, regionEv);
regionEv =
- xmlevents.getEndElement(xmlevents.DISCARD_EV, regionEv);
+ xmlevents.getEndElement(SyncedFoXmlEventsBuffer.DISCARD_EV, regionEv);
pool.surrenderEvent(regionEv);
}
1.1.2.6 +5 -6 xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionEnd.java
Index: FoRegionEnd.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoRegionEnd.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoRegionEnd.java 31 Mar 2003 02:40:09 -0000 1.1.2.5
+++ FoRegionEnd.java 12 Jun 2003 18:19:33 -0000 1.1.2.6
@@ -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;
/**
No revision
No revision
1.1.2.5 +2 -3 xml-fop/src/org/apache/fop/fo/Attic/ReferenceAreaFO.java
Index: ReferenceAreaFO.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/ReferenceAreaFO.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ReferenceAreaFO.java 31 Mar 2003 02:44:20 -0000 1.1.2.4
+++ ReferenceAreaFO.java 12 Jun 2003 18:19:33 -0000 1.1.2.5
@@ -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.
1.1.2.16 +12 -17 xml-fop/src/org/apache/fop/fo/Attic/FOAttributes.java
Index: FOAttributes.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOAttributes.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- FOAttributes.java 31 Mar 2003 02:44:19 -0000 1.1.2.15
+++ FOAttributes.java 12 Jun 2003 18:19:33 -0000 1.1.2.16
@@ -57,24 +57,19 @@
*/
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
1.1.2.13 +3 -17 xml-fop/src/org/apache/fop/fo/Attic/FOPropertySets.java
Index: FOPropertySets.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOPropertySets.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FOPropertySets.java 31 Mar 2003 02:44:19 -0000 1.1.2.12
+++ FOPropertySets.java 12 Jun 2003 18:19:33 -0000 1.1.2.13
@@ -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;
/**
1.1.2.5 +49 -5 xml-fop/src/org/apache/fop/fo/Attic/FObject.java
Index: FObject.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObject.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- FObject.java 19 Oct 2002 03:49:04 -0000 1.1.2.4
+++ FObject.java 12 Jun 2003 18:19:33 -0000 1.1.2.5
@@ -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 <jt...@jtauber.com>. For more information on the Apache
+ * Software Foundation, please see <http://www.apache.org/>.
+ *
* @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
* @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
1.19.2.33 +17 -29 xml-fop/src/org/apache/fop/fo/Attic/FONode.java
Index: FONode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FONode.java,v
retrieving revision 1.19.2.32
retrieving revision 1.19.2.33
diff -u -r1.19.2.32 -r1.19.2.33
--- FONode.java 31 Mar 2003 02:44:19 -0000 1.19.2.32
+++ FONode.java 12 Jun 2003 18:19:33 -0000 1.19.2.33
@@ -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.
1.1.2.9 +9 -18 xml-fop/src/org/apache/fop/fo/Attic/ShorthandPropSets.java
Index: ShorthandPropSets.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/ShorthandPropSets.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- ShorthandPropSets.java 31 Mar 2003 02:44:20 -0000 1.1.2.8
+++ ShorthandPropSets.java 12 Jun 2003 18:19:33 -0000 1.1.2.9
@@ -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 <tt>ROIntArray</tt>s which encode the various sets of
1.1.2.13 +4 -4 xml-fop/src/org/apache/fop/fo/Attic/PropNames.java
Index: PropNames.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropNames.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- PropNames.java 31 Mar 2003 02:44:20 -0000 1.1.2.12
+++ PropNames.java 12 Jun 2003 18:19:33 -0000 1.1.2.13
@@ -56,8 +56,8 @@
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
1.1.2.21 +9 -23 xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java
Index: PropertyConsts.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertyConsts.java,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- PropertyConsts.java 31 Mar 2003 02:44:20 -0000 1.1.2.20
+++ PropertyConsts.java 12 Jun 2003 18:19:33 -0000 1.1.2.21
@@ -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
1.1.2.31 +8 -25 xml-fop/src/org/apache/fop/fo/Attic/FOTree.java
Index: FOTree.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FOTree.java,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -r1.1.2.30 -r1.1.2.31
--- FOTree.java 31 Mar 2003 02:44:19 -0000 1.1.2.30
+++ FOTree.java 12 Jun 2003 18:19:33 -0000 1.1.2.31
@@ -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;
/**
* <tt>FOTree</tt> is the class that generates and maintains the FO Tree.
@@ -175,7 +158,7 @@
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) {
1.1.2.10 +4 -4 xml-fop/src/org/apache/fop/fo/Attic/FObjectNames.java
Index: FObjectNames.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObjectNames.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- FObjectNames.java 31 Mar 2003 02:44:19 -0000 1.1.2.9
+++ FObjectNames.java 12 Jun 2003 18:19:33 -0000 1.1.2.10
@@ -55,10 +55,10 @@
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
1.1.2.24 +4 -5 xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java
Index: PropertySets.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/PropertySets.java,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -r1.1.2.23 -r1.1.2.24
--- PropertySets.java 31 Mar 2003 02:44:20 -0000 1.1.2.23
+++ PropertySets.java 12 Jun 2003 18:19:33 -0000 1.1.2.24
@@ -1,4 +1,4 @@
-/**
+/*
* $Id$
*
* ============================================================================
@@ -57,7 +57,6 @@
import java.util.BitSet;
-import org.apache.fop.fo.PropNames;
import org.apache.fop.datastructs.ROBitSet;
/**
1.1.2.14 +3 -10 xml-fop/src/org/apache/fop/fo/Attic/FObjects.java
Index: FObjects.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObjects.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- FObjects.java 31 Mar 2003 02:44:19 -0000 1.1.2.13
+++ FObjects.java 12 Jun 2003 18:19:34 -0000 1.1.2.14
@@ -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;
1.1.2.23 +15 -22 xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java
Index: FoRoot.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- FoRoot.java 31 Mar 2003 02:44:20 -0000 1.1.2.22
+++ FoRoot.java 12 Jun 2003 18:19:34 -0000 1.1.2.23
@@ -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;
/**
* <tt>FoRoot</tt> is the class which processes the fo:root start element
@@ -181,7 +174,7 @@
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 @@
// 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 @@
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) {
1.1.2.7 +4 -5 xml-fop/src/org/apache/fop/fo/Attic/FObjectSets.java
Index: FObjectSets.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObjectSets.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FObjectSets.java 31 Mar 2003 02:44:19 -0000 1.1.2.6
+++ FObjectSets.java 12 Jun 2003 18:19:34 -0000 1.1.2.7
@@ -55,10 +55,9 @@
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
No revision
No revision
1.1.2.9 +4 -6 xml-fop/src/org/apache/fop/datatypes/Attic/AbstractPropertyValue.java
Index: AbstractPropertyValue.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/AbstractPropertyValue.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- AbstractPropertyValue.java 31 Mar 2003 02:32:52 -0000 1.1.2.8
+++ AbstractPropertyValue.java 12 Jun 2003 18:19:34 -0000 1.1.2.9
@@ -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.
1.1.2.9 +3 -5 xml-fop/src/org/apache/fop/datatypes/Attic/IntegerType.java
Index: IntegerType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/IntegerType.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- IntegerType.java 31 Mar 2003 02:32:52 -0000 1.1.2.8
+++ IntegerType.java 12 Jun 2003 18:19:34 -0000 1.1.2.9
@@ -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 {
1.1.2.8 +4 -7 xml-fop/src/org/apache/fop/datatypes/Attic/TextDecorator.java
Index: TextDecorator.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/TextDecorator.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- TextDecorator.java 31 Mar 2003 02:32:53 -0000 1.1.2.7
+++ TextDecorator.java 12 Jun 2003 18:19:34 -0000 1.1.2.8
@@ -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
1.1.2.8 +3 -6 xml-fop/src/org/apache/fop/datatypes/Attic/Slash.java
Index: Slash.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Slash.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- Slash.java 31 Mar 2003 02:32:53 -0000 1.1.2.7
+++ Slash.java 12 Jun 2003 18:19:34 -0000 1.1.2.8
@@ -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.
1.1.2.7 +5 -5 xml-fop/src/org/apache/fop/datatypes/Attic/Ems.java
Index: Ems.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Ems.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- Ems.java 31 Mar 2003 02:32:52 -0000 1.1.2.6
+++ Ems.java 12 Jun 2003 18:19:34 -0000 1.1.2.7
@@ -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 <i>ems</i>. Constructs
1.1.2.9 +3 -4 xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValue.java
Index: PropertyValue.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValue.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- PropertyValue.java 31 Mar 2003 02:32:53 -0000 1.1.2.8
+++ PropertyValue.java 12 Jun 2003 18:19:34 -0000 1.1.2.9
@@ -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.
1.1.2.9 +3 -5 xml-fop/src/org/apache/fop/datatypes/Attic/Angle.java
Index: Angle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Angle.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- Angle.java 31 Mar 2003 02:32:52 -0000 1.1.2.8
+++ Angle.java 12 Jun 2003 18:19:34 -0000 1.1.2.9
@@ -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 {
1.1.2.8 +5 -9 xml-fop/src/org/apache/fop/datatypes/Attic/EnumType.java
Index: EnumType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/EnumType.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- EnumType.java 31 Mar 2003 02:32:52 -0000 1.1.2.7
+++ EnumType.java 12 Jun 2003 18:19:34 -0000 1.1.2.8
@@ -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
1.1.2.8 +5 -8 xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValueList.java
Index: PropertyValueList.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/PropertyValueList.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- PropertyValueList.java 31 Mar 2003 02:32:53 -0000 1.1.2.7
+++ PropertyValueList.java 12 Jun 2003 18:19:34 -0000 1.1.2.8
@@ -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 <tt>PropertyValue</tt> elements.
1.1.2.8 +4 -6 xml-fop/src/org/apache/fop/datatypes/Attic/None.java
Index: None.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/None.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- None.java 31 Mar 2003 02:32:52 -0000 1.1.2.7
+++ None.java 12 Jun 2003 18:19:34 -0000 1.1.2.8
@@ -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".
1.3.4.6 +5 -5 xml-fop/src/org/apache/fop/datatypes/Attic/ColorSpace.java
Index: ColorSpace.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/ColorSpace.java,v
retrieving revision 1.3.4.5
retrieving revision 1.3.4.6
diff -u -r1.3.4.5 -r1.3.4.6
--- ColorSpace.java 31 Mar 2003 02:32:52 -0000 1.3.4.5
+++ ColorSpace.java 12 Jun 2003 18:19:34 -0000 1.3.4.6
@@ -126,11 +126,11 @@
// 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");
1.1.2.9 +4 -6 xml-fop/src/org/apache/fop/datatypes/Attic/Time.java
Index: Time.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Time.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- Time.java 31 Mar 2003 02:32:53 -0000 1.1.2.8
+++ Time.java 12 Jun 2003 18:19:34 -0000 1.1.2.9
@@ -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 {
1.1.2.8 +5 -7 xml-fop/src/org/apache/fop/datatypes/Attic/ScriptType.java
Index: ScriptType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/ScriptType.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- ScriptType.java 31 Mar 2003 02:32:53 -0000 1.1.2.7
+++ ScriptType.java 12 Jun 2003 18:19:34 -0000 1.1.2.8
@@ -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 <tt>script</tt> specifiers.
1.1.2.8 +4 -6 xml-fop/src/org/apache/fop/datatypes/Attic/MimeType.java
Index: MimeType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/MimeType.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- MimeType.java 31 Mar 2003 02:32:52 -0000 1.1.2.7
+++ MimeType.java 12 Jun 2003 18:19:34 -0000 1.1.2.8
@@ -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 <tt>content-type</tt>.
1.1.2.8 +6 -11 xml-fop/src/org/apache/fop/datatypes/Attic/ShadowEffect.java
Index: ShadowEffect.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/ShadowEffect.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- ShadowEffect.java 31 Mar 2003 02:32:53 -0000 1.1.2.7
+++ ShadowEffect.java 12 Jun 2003 18:19:34 -0000 1.1.2.8
@@ -54,15 +54,10 @@
*/
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
1.1.2.8 +4 -6 xml-fop/src/org/apache/fop/datatypes/Attic/UriType.java
Index: UriType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/UriType.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- UriType.java 31 Mar 2003 02:32:53 -0000 1.1.2.7
+++ UriType.java 12 Jun 2003 18:19:34 -0000 1.1.2.8
@@ -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 <tt>uri()</tt> function.
1.1.2.9 +2 -4 xml-fop/src/org/apache/fop/datatypes/Attic/Frequency.java
Index: Frequency.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Frequency.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- Frequency.java 31 Mar 2003 02:32:52 -0000 1.1.2.8
+++ Frequency.java 12 Jun 2003 18:19:34 -0000 1.1.2.9
@@ -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 {
1.15.2.10 +3 -6 xml-fop/src/org/apache/fop/datatypes/Attic/ColorType.java
Index: ColorType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/ColorType.java,v
retrieving revision 1.15.2.9
retrieving revision 1.15.2.10
diff -u -r1.15.2.9 -r1.15.2.10
--- ColorType.java 31 Mar 2003 02:32:52 -0000 1.15.2.9
+++ ColorType.java 12 Jun 2003 18:19:34 -0000 1.15.2.10
@@ -54,11 +54,8 @@
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
1.1.2.8 +4 -6 xml-fop/src/org/apache/fop/datatypes/Attic/Auto.java
Index: Auto.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Auto.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- Auto.java 31 Mar 2003 02:32:52 -0000 1.1.2.7
+++ Auto.java 12 Jun 2003 18:19:35 -0000 1.1.2.8
@@ -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.
1.1.2.15 +5 -10 xml-fop/src/org/apache/fop/datatypes/Attic/Numeric.java
Index: Numeric.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Numeric.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- Numeric.java 31 Mar 2003 02:32:52 -0000 1.1.2.14
+++ Numeric.java 12 Jun 2003 18:19:35 -0000 1.1.2.15
@@ -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;
/**
1.1.2.5 +5 -8 xml-fop/src/org/apache/fop/datatypes/Attic/NoType.java
Index: NoType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/NoType.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- NoType.java 31 Mar 2003 02:32:52 -0000 1.1.2.4
+++ NoType.java 12 Jun 2003 18:19:35 -0000 1.1.2.5
@@ -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
1.1.2.8 +5 -7 xml-fop/src/org/apache/fop/datatypes/Attic/LanguageType.java
Index: LanguageType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/LanguageType.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- LanguageType.java 31 Mar 2003 02:32:52 -0000 1.1.2.7
+++ LanguageType.java 12 Jun 2003 18:19:35 -0000 1.1.2.8
@@ -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 <tt>language</tt> specifiers.
1.1.2.6 +5 -5 xml-fop/src/org/apache/fop/datatypes/Attic/Ints.java
Index: Ints.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Ints.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Ints.java 31 Mar 2003 02:32:52 -0000 1.1.2.5
+++ Ints.java 12 Jun 2003 18:19:35 -0000 1.1.2.6
@@ -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.
1.1.2.8 +5 -7 xml-fop/src/org/apache/fop/datatypes/Attic/CountryType.java
Index: CountryType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/CountryType.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- CountryType.java 31 Mar 2003 02:32:52 -0000 1.1.2.7
+++ CountryType.java 12 Jun 2003 18:19:35 -0000 1.1.2.8
@@ -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 <tt>country</tt> specifiers.
1.1.2.9 +4 -6 xml-fop/src/org/apache/fop/datatypes/Attic/StringType.java
Index: StringType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/StringType.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- StringType.java 31 Mar 2003 02:32:53 -0000 1.1.2.8
+++ StringType.java 12 Jun 2003 18:19:35 -0000 1.1.2.9
@@ -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;
/**
* <tt>StringType</tt> is not intended to be instantiated directly. It
1.1.2.8 +5 -8 xml-fop/src/org/apache/fop/datatypes/Attic/FontFamilySet.java
Index: FontFamilySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/FontFamilySet.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- FontFamilySet.java 31 Mar 2003 02:32:52 -0000 1.1.2.7
+++ FontFamilySet.java 12 Jun 2003 18:19:35 -0000 1.1.2.8
@@ -60,12 +60,9 @@
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.
1.1.2.8 +5 -7 xml-fop/src/org/apache/fop/datatypes/Attic/Literal.java
Index: Literal.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Literal.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- Literal.java 31 Mar 2003 02:32:52 -0000 1.1.2.7
+++ Literal.java 12 Jun 2003 18:19:35 -0000 1.1.2.8
@@ -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 <tt>StringType</tt>.
1.1.2.10 +4 -6 xml-fop/src/org/apache/fop/datatypes/Attic/NCName.java
Index: NCName.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/NCName.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- NCName.java 31 Mar 2003 02:32:52 -0000 1.1.2.9
+++ NCName.java 12 Jun 2003 18:19:35 -0000 1.1.2.10
@@ -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
1.1.2.9 +5 -8 xml-fop/src/org/apache/fop/datatypes/Attic/MappedNumeric.java
Index: MappedNumeric.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/MappedNumeric.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- MappedNumeric.java 31 Mar 2003 02:32:52 -0000 1.1.2.8
+++ MappedNumeric.java 12 Jun 2003 18:19:35 -0000 1.1.2.9
@@ -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
1.1.2.8 +4 -6 xml-fop/src/org/apache/fop/datatypes/Attic/Bool.java
Index: Bool.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Attic/Bool.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- Bool.java 31 Mar 2003 02:32:52 -0000 1.1.2.7
+++ Bool.java 12 Jun 2003 18:19:35 -0000 1.1.2.8
@@ -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".
No revision
No revision
1.1.2.6 +3 -4 xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromParent.java
Index: FromParent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromParent.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FromParent.java 31 Mar 2003 02:32:17 -0000 1.1.2.5
+++ FromParent.java 12 Jun 2003 18:19:36 -0000 1.1.2.6
@@ -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;
1.1.2.8 +6 -7 xml-fop/src/org/apache/fop/datatypes/indirect/Attic/IndirectValue.java
Index: IndirectValue.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/IndirectValue.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- IndirectValue.java 31 Mar 2003 02:32:17 -0000 1.1.2.7
+++ IndirectValue.java 12 Jun 2003 18:19:36 -0000 1.1.2.8
@@ -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 <tt>PropertyValue</tt>
1.1.2.7 +4 -5 xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromNearestSpecified.java
Index: FromNearestSpecified.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/FromNearestSpecified.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FromNearestSpecified.java 31 Mar 2003 02:32:17 -0000 1.1.2.6
+++ FromNearestSpecified.java 12 Jun 2003 18:19:36 -0000 1.1.2.7
@@ -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
1.1.2.7 +4 -6 xml-fop/src/org/apache/fop/datatypes/indirect/Attic/Inherit.java
Index: Inherit.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/Inherit.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- Inherit.java 31 Mar 2003 02:32:17 -0000 1.1.2.6
+++ Inherit.java 12 Jun 2003 18:19:36 -0000 1.1.2.7
@@ -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 <tt>inherit</tt> keyword. This keyword is
1.1.2.8 +5 -7 xml-fop/src/org/apache/fop/datatypes/indirect/Attic/InheritedValue.java
Index: InheritedValue.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/indirect/Attic/InheritedValue.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- InheritedValue.java 31 Mar 2003 02:32:17 -0000 1.1.2.7
+++ InheritedValue.java 12 Jun 2003 18:19:36 -0000 1.1.2.8
@@ -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
No revision
No revision
1.1.2.4 +2 -3 xml-fop/src/org/apache/fop/datastructs/Attic/CircularBuffer.java
Index: CircularBuffer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datastructs/Attic/CircularBuffer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CircularBuffer.java 31 Mar 2003 02:46:56 -0000 1.1.2.3
+++ CircularBuffer.java 12 Jun 2003 18:19:36 -0000 1.1.2.4
@@ -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 <tt>Object</tt>
No revision
No revision
1.1.2.7 +4 -8 xml-fop/src/org/apache/fop/fo/expr/Attic/SystemFontFunction.java
Index: SystemFontFunction.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/Attic/SystemFontFunction.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- SystemFontFunction.java 21 Oct 2002 16:05:15 -0000 1.1.2.6
+++ SystemFontFunction.java 12 Jun 2003 18:19:36 -0000 1.1.2.7
@@ -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.
1.4.4.9 +3 -4 xml-fop/src/org/apache/fop/fo/expr/Attic/PropertyTokenizer.java
Index: PropertyTokenizer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/Attic/PropertyTokenizer.java,v
retrieving revision 1.4.4.8
retrieving revision 1.4.4.9
diff -u -r1.4.4.8 -r1.4.4.9
--- PropertyTokenizer.java 31 Mar 2003 02:38:43 -0000 1.4.4.8
+++ PropertyTokenizer.java 12 Jun 2003 18:19:36 -0000 1.4.4.9
@@ -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;
/**
1.5.2.22 +22 -26 xml-fop/src/org/apache/fop/fo/expr/Attic/PropertyParser.java
Index: PropertyParser.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/expr/Attic/PropertyParser.java,v
retrieving revision 1.5.2.21
retrieving revision 1.5.2.22
diff -u -r1.5.2.21 -r1.5.2.22
--- PropertyParser.java 31 Mar 2003 02:38:43 -0000 1.5.2.21
+++ PropertyParser.java 12 Jun 2003 18:19:36 -0000 1.5.2.22
@@ -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.
No revision
No revision
1.1.2.10 +8 -10 xml-fop/src/org/apache/fop/xml/Attic/SyncedFoXmlEventsBuffer.java
Index: SyncedFoXmlEventsBuffer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/SyncedFoXmlEventsBuffer.java,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- SyncedFoXmlEventsBuffer.java 31 Mar 2003 02:30:26 -0000 1.1.2.9
+++ SyncedFoXmlEventsBuffer.java 12 Jun 2003 18:19:37 -0000 1.1.2.10
@@ -55,17 +55,15 @@
*/
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.
1.1.2.7 +5 -5 xml-fop/src/org/apache/fop/xml/Attic/FoXMLEvent.java
Index: FoXMLEvent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/FoXMLEvent.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoXMLEvent.java 31 Mar 2003 02:30:26 -0000 1.1.2.6
+++ FoXMLEvent.java 12 Jun 2003 18:19:37 -0000 1.1.2.7
@@ -53,10 +53,10 @@
*/
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
1.1.2.6 +3 -7 xml-fop/src/org/apache/fop/xml/Attic/FoXMLEventPool.java
Index: FoXMLEventPool.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/FoXMLEventPool.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoXMLEventPool.java 31 Mar 2003 02:30:26 -0000 1.1.2.5
+++ FoXMLEventPool.java 12 Jun 2003 18:19:37 -0000 1.1.2.6
@@ -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 <tt>FoXMLEvent</tt> objects.
1.1.2.6 +6 -6 xml-fop/src/org/apache/fop/xml/Attic/XMLNamespaces.java
Index: XMLNamespaces.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/XMLNamespaces.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- XMLNamespaces.java 31 Mar 2003 02:30:26 -0000 1.1.2.5
+++ XMLNamespaces.java 12 Jun 2003 18:19:37 -0000 1.1.2.6
@@ -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
1.1.2.7 +11 -16 xml-fop/src/org/apache/fop/xml/Attic/FoXMLSerialHandler.java
Index: FoXMLSerialHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/FoXMLSerialHandler.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoXMLSerialHandler.java 31 Mar 2003 02:30:26 -0000 1.1.2.6
+++ FoXMLSerialHandler.java 12 Jun 2003 18:19:37 -0000 1.1.2.7
@@ -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;
/**
* <tt>FoXMLSerialHandler</tt> is the <tt>ContentHandler</tt> for the
1.1.2.7 +5 -7 xml-fop/src/org/apache/fop/xml/Attic/XMLEventPool.java
Index: XMLEventPool.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/XMLEventPool.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- XMLEventPool.java 31 Mar 2003 02:30:26 -0000 1.1.2.6
+++ XMLEventPool.java 12 Jun 2003 18:19:37 -0000 1.1.2.7
@@ -53,12 +53,10 @@
*/
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 <tt>XMLEvent</tt> objects.
1.1.2.13 +5 -7 xml-fop/src/org/apache/fop/xml/Attic/XMLEvent.java
Index: XMLEvent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/xml/Attic/XMLEvent.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- XMLEvent.java 31 Mar 2003 02:30:26 -0000 1.1.2.12
+++ XMLEvent.java 12 Jun 2003 18:19:37 -0000 1.1.2.13
@@ -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 @@
/**
* 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;
}
No revision
No revision
1.4.2.3 +4 -7 xml-fop/src/org/apache/fop/apps/Attic/InputHandler.java
Index: InputHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Attic/InputHandler.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- InputHandler.java 31 Mar 2003 02:23:01 -0000 1.4.2.2
+++ InputHandler.java 12 Jun 2003 18:19:37 -0000 1.4.2.3
@@ -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 {
1.4.2.3 +3 -7 xml-fop/src/org/apache/fop/apps/Attic/FOInputHandler.java
Index: FOInputHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Attic/FOInputHandler.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- FOInputHandler.java 31 Mar 2003 02:23:01 -0000 1.4.2.2
+++ FOInputHandler.java 12 Jun 2003 18:19:37 -0000 1.4.2.3
@@ -53,14 +53,10 @@
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
1.31.2.6 +7 -16 xml-fop/src/org/apache/fop/apps/Attic/Driver.java
Index: Driver.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Attic/Driver.java,v
retrieving revision 1.31.2.5
retrieving revision 1.31.2.6
diff -u -r1.31.2.5 -r1.31.2.6
--- Driver.java 31 Mar 2003 02:23:00 -0000 1.31.2.5
+++ Driver.java 12 Jun 2003 18:19:37 -0000 1.31.2.6
@@ -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 {
/**
No revision
No revision
1.1.2.6 +8 -13 xml-fop/src/org/apache/fop/fo/declarations/Attic/FoColorProfile.java
Index: FoColorProfile.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/declarations/Attic/FoColorProfile.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- FoColorProfile.java 31 Mar 2003 02:38:23 -0000 1.1.2.5
+++ FoColorProfile.java 12 Jun 2003 18:19:38 -0000 1.1.2.6
@@ -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
1.1.2.7 +10 -12 xml-fop/src/org/apache/fop/fo/declarations/Attic/FoDeclarations.java
Index: FoDeclarations.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/declarations/Attic/FoDeclarations.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- FoDeclarations.java 31 Mar 2003 02:38:23 -0000 1.1.2.6
+++ FoDeclarations.java 12 Jun 2003 18:19:38 -0000 1.1.2.7
@@ -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;
/**
* <tt>FoLayoutMasterSet</tt> is the class which processes the
@@ -126,7 +124,7 @@
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 @@
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) {
No revision
No revision
1.1.2.1 +17 -0 xml-fop/Attic/.project
1.1.2.1 +10 -0 xml-fop/Attic/.classpath
No revision
No revision
1.1.2.4 +1 -2 xml-fop/src/org/apache/fop/configuration/Attic/LanguageFileReader.java
Index: LanguageFileReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/configuration/Attic/LanguageFileReader.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- LanguageFileReader.java 31 Mar 2003 02:31:45 -0000 1.1.2.3
+++ LanguageFileReader.java 12 Jun 2003 18:19:38 -0000 1.1.2.4
@@ -68,7 +68,6 @@
import java.io.IOException;
import java.util.HashMap;
-import java.util.ArrayList;
/**
*/
1.8.4.3 +1 -4 xml-fop/src/org/apache/fop/configuration/Attic/ConfigurationReader.java
Index: ConfigurationReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/configuration/Attic/ConfigurationReader.java,v
retrieving revision 1.8.4.2
retrieving revision 1.8.4.3
diff -u -r1.8.4.2 -r1.8.4.3
--- ConfigurationReader.java 31 Mar 2003 02:31:45 -0000 1.8.4.2
+++ ConfigurationReader.java 12 Jun 2003 18:19:38 -0000 1.8.4.3
@@ -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.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
No revision
No revision
1.2.4.3 +14 -7 xml-fop/src/org/apache/fop/tools/Attic/DocumentReader.java
Index: DocumentReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/tools/Attic/DocumentReader.java,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -u -r1.2.4.2 -r1.2.4.3
--- DocumentReader.java 31 Mar 2003 02:47:35 -0000 1.2.4.2
+++ DocumentReader.java 12 Jun 2003 18:19:38 -0000 1.2.4.3
@@ -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;
/**
1.2.4.3 +3 -4 xml-fop/src/org/apache/fop/tools/Attic/DocumentInputSource.java
Index: DocumentInputSource.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/tools/Attic/DocumentInputSource.java,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -u -r1.2.4.2 -r1.2.4.3
--- DocumentInputSource.java 31 Mar 2003 02:47:35 -0000 1.2.4.2
+++ DocumentInputSource.java 12 Jun 2003 18:19:38 -0000 1.2.4.3
@@ -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.
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org