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 gm...@apache.org on 2004/11/24 22:07:31 UTC

cvs commit: xml-fop/src/java/org/apache/fop/traits LayoutProps.java SpaceVal.java

gmazza      2004/11/24 13:07:31

  Modified:    src/java/org/apache/fop/area CTM.java PageViewport.java
               src/java/org/apache/fop/area/inline Leader.java
               src/java/org/apache/fop/fo Constants.java
                        FOPropertyMapping.java FOText.java
                        PropertyList.java
               src/java/org/apache/fop/fo/flow Block.java
                        InstreamForeignObject.java Leader.java
                        TableCell.java
               src/java/org/apache/fop/fo/pagination
                        ConditionalPageMasterReference.java
                        PageSequence.java RegionAfter.java RegionBA.java
                        RegionBefore.java RegionEnd.java RegionSE.java
                        RegionStart.java
                        RepeatablePageMasterAlternatives.java
                        RepeatablePageMasterReference.java
               src/java/org/apache/fop/fo/properties
                        BorderWidthPropertyMaker.java
                        CommonBorderPaddingBackground.java
                        CondLengthProperty.java
                        PositionShorthandParser.java
                        SpacingPropertyMaker.java
               src/java/org/apache/fop/layoutmgr
                        BlockContainerLayoutManager.java
                        CharacterLayoutManager.java
                        ExternalGraphicLayoutManager.java
                        InstreamForeignObjectLM.java
                        LeaderLayoutManager.java LeafNodeLayoutManager.java
                        LineLayoutManager.java
                        PageSequenceLayoutManager.java
                        TextLayoutManager.java
               src/java/org/apache/fop/render/awt AWTRenderer.java
               src/java/org/apache/fop/render/pdf PDFRenderer.java
               src/java/org/apache/fop/render/ps PSRenderer.java
               src/java/org/apache/fop/render/rtf RTFHandler.java
                        TableAttributesConverter.java
                        TextAttributesConverter.java
               src/java/org/apache/fop/render/rtf/rtflib/rtfdoc
                        BorderAttributesConverter.java
               src/java/org/apache/fop/render/svg SVGRenderer.java
               src/java/org/apache/fop/render/xml XMLRenderer.java
               src/java/org/apache/fop/traits LayoutProps.java
                        SpaceVal.java
  Log:
  1.) Removed unneeded enumeration interfaces from fo.Constants.
  2.) Appended EN_ to enumeration constants to make them better S&R'able throughout app.
  3.) Added an EN_INHERIT enumeration constant (although not currently used in the system.)
  
  Revision  Changes    Path
  1.9       +4 -4      xml-fop/src/java/org/apache/fop/area/CTM.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/area/CTM.java.diff?r1=1.8&r2=1.9
  
  
  1.5       +4 -4      xml-fop/src/java/org/apache/fop/area/PageViewport.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/area/PageViewport.java.diff?r1=1.4&r2=1.5
  
  
  1.6       +1 -1      xml-fop/src/java/org/apache/fop/area/inline/Leader.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/area/inline/Leader.java.diff?r1=1.5&r2=1.6
  
  
  1.19      +163 -501  xml-fop/src/java/org/apache/fop/fo/Constants.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/Constants.java.diff?r1=1.18&r2=1.19
  
  
  1.37      +316 -316  xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java.diff?r1=1.36&r2=1.37
  
  
  1.34      +6 -6      xml-fop/src/java/org/apache/fop/fo/FOText.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/FOText.java.diff?r1=1.33&r2=1.34
  
  
  1.42      +3 -3      xml-fop/src/java/org/apache/fop/fo/PropertyList.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/PropertyList.java.diff?r1=1.41&r2=1.42
  
  
  1.50      +12 -12    xml-fop/src/java/org/apache/fop/fo/flow/Block.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Block.java.diff?r1=1.49&r2=1.50
  
  
  1.35      +8 -8      xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java.diff?r1=1.34&r2=1.35
  
  
  1.49      +4 -4      xml-fop/src/java/org/apache/fop/fo/flow/Leader.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java.diff?r1=1.48&r2=1.49
  
  
  1.41      +1 -1      xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java.diff?r1=1.40&r2=1.41
  
  
  1.23      +8 -8      xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java.diff?r1=1.22&r2=1.23
  
  
  1.53      +2 -2      xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/pagination/PageSequence.java.diff?r1=1.52&r2=1.53
  
  
  1.19      +2 -2      xml-fop/src/java/org/apache/fop/fo/pagination/RegionAfter.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionAfter.java.diff?r1=1.18&r2=1.19
  
  
  1.25      +1 -1      xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBA.java.diff?r1=1.24&r2=1.25
  
  
  1.20      +2 -2      xml-fop/src/java/org/apache/fop/fo/pagination/RegionBefore.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBefore.java.diff?r1=1.19&r2=1.20
  
  
  1.20      +1 -1      xml-fop/src/java/org/apache/fop/fo/pagination/RegionEnd.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionEnd.java.diff?r1=1.19&r2=1.20
  
  
  1.19      +3 -3      xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionSE.java.diff?r1=1.18&r2=1.19
  
  
  1.19      +1 -1      xml-fop/src/java/org/apache/fop/fo/pagination/RegionStart.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionStart.java.diff?r1=1.18&r2=1.19
  
  
  1.23      +1 -1      xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java.diff?r1=1.22&r2=1.23
  
  
  1.24      +1 -1      xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java.diff?r1=1.23&r2=1.24
  
  
  1.8       +2 -2      xml-fop/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java.diff?r1=1.7&r2=1.8
  
  
  1.6       +4 -4      xml-fop/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java.diff?r1=1.5&r2=1.6
  
  
  1.5       +2 -2      xml-fop/src/java/org/apache/fop/fo/properties/CondLengthProperty.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/properties/CondLengthProperty.java.diff?r1=1.4&r2=1.5
  
  
  1.3       +16 -16    xml-fop/src/java/org/apache/fop/fo/properties/PositionShorthandParser.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/properties/PositionShorthandParser.java.diff?r1=1.2&r2=1.3
  
  
  1.3       +2 -2      xml-fop/src/java/org/apache/fop/fo/properties/SpacingPropertyMaker.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/properties/SpacingPropertyMaker.java.diff?r1=1.2&r2=1.3
  
  
  1.27      +11 -11    xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java.diff?r1=1.26&r2=1.27
  
  
  1.9       +9 -9      xml-fop/src/java/org/apache/fop/layoutmgr/CharacterLayoutManager.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/CharacterLayoutManager.java.diff?r1=1.8&r2=1.9
  
  
  1.14      +20 -20    xml-fop/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java.diff?r1=1.13&r2=1.14
  
  
  1.10      +10 -10    xml-fop/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java.diff?r1=1.9&r2=1.10
  
  
  1.13      +26 -26    xml-fop/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java.diff?r1=1.12&r2=1.13
  
  
  1.12      +8 -8      xml-fop/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java.diff?r1=1.11&r2=1.12
  
  
  1.35      +17 -17    xml-fop/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java.diff?r1=1.34&r2=1.35
  
  
  1.13      +16 -16    xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java.diff?r1=1.12&r2=1.13
  
  
  1.27      +19 -19    xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java.diff?r1=1.26&r2=1.27
  
  
  1.33      +1 -1      xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java.diff?r1=1.32&r2=1.33
  
  
  1.60      +11 -11    xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java.diff?r1=1.59&r2=1.60
  
  
  1.35      +1 -1      xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java.diff?r1=1.34&r2=1.35
  
  
  1.39      +2 -2      xml-fop/src/java/org/apache/fop/render/rtf/RTFHandler.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/rtf/RTFHandler.java.diff?r1=1.38&r2=1.39
  
  
  1.24      +16 -16    xml-fop/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java.diff?r1=1.23&r2=1.24
  
  
  1.23      +7 -7      xml-fop/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java.diff?r1=1.22&r2=1.23
  
  
  1.6       +10 -10    xml-fop/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/BorderAttributesConverter.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/BorderAttributesConverter.java.diff?r1=1.5&r2=1.6
  
  
  1.21      +6 -6      xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java.diff?r1=1.20&r2=1.21
  
  
  1.30      +6 -6      xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java.diff?r1=1.29&r2=1.30
  
  
  1.5       +2 -2      xml-fop/src/java/org/apache/fop/traits/LayoutProps.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/traits/LayoutProps.java.diff?r1=1.4&r2=1.5
  
  
  1.9       +4 -4      xml-fop/src/java/org/apache/fop/traits/SpaceVal.java
  
  http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/traits/SpaceVal.java.diff?r1=1.8&r2=1.9
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org


Re: cvs commit: xml-fop/src/java/org/apache/fop/traits LayoutProps.java SpaceVal.java

Posted by Glen Mazza <gr...@yahoo.com>.
--- Finn Bock <bc...@worldonline.dk> wrote:
> 
> > We've been doing the same with PR_ (properties)
> and
> > FO_ (FO's) for quite some time.  
> 
> To avoid a name conflict somewhere.
> 

Yes, I was wondering why you didn't originally do that
for the enumeration constants as well.  I like their
self-documenting value in particular though.

> How about having 3 interfaces: 'Properties',
> 'Elements' and 'Enums' 
> which contains the constants without any prefix. And
> then decide that 
> these interfaces are never implemented, but the
> constants are always 
> accessed using the interface name:
>      Enums.TRUE
> 
> That would keep the searchability and perhaps even
> help us when (if) we 
> move to typesafe enums.
> 

-0.  I prefer the simplicity of the current method,
and like the way the code looks as-is.  But I can
easily see how others may view this solution as more
professional.

Glen


Re: cvs commit: xml-fop/src/java/org/apache/fop/traits LayoutProps.java SpaceVal.java

Posted by Finn Bock <bc...@worldonline.dk>.
[Glen]

>>>  2.) Appended EN_ to enumeration constants to

[J.Pietschmann]

>>Yuk. Having a large number of identifiers in the
>>same scope with
>>an identical prefix isn't very good for
>>autocompletion both in
>>Emacs and Eclipse. 

[Glen]

> We've been doing the same with PR_ (properties) and
> FO_ (FO's) for quite some time.  

To avoid a name conflict somewhere.

> After hitting the
> EN_, you're at the same place you would be without the
> prefix.  Furthermore, you can now hunt away for your
> enumeration constants without them being intermixed
> with the PR_'s and FO_'s.
> 
> It was also a commenting issue:  TRUE and FALSE, for
> example, without a prefix, just weren't self
> documenting enough to emphasize that we're working
> with enumeration constants here.  (Remember, we
> removed the old interfaces--per your desire as well as
> mine--such as WritingMode.LR_TB or whatever that
> previously provided that emphasis.)

How about having 3 interfaces: 'Properties', 'Elements' and 'Enums' 
which contains the constants without any prefix. And then decide that 
these interfaces are never implemented, but the constants are always 
accessed using the interface name:
     Enums.TRUE

That would keep the searchability and perhaps even help us when (if) we 
move to typesafe enums.

regards,
finn

Re: cvs commit: xml-fop/src/java/org/apache/fop/traits LayoutProps.java SpaceVal.java

Posted by Glen Mazza <gr...@yahoo.com>.
--- "J.Pietschmann" <j3...@yahoo.de> wrote:

> gmazza@apache.org wrote:
> > gmazza      2004/11/24 13:07:31
> >   2.) Appended EN_ to enumeration constants to
> make them better S&R'able throughout app.
> 
> Yuk. Having a large number of identifiers in the
> same scope with
> an identical prefix isn't very good for
> autocompletion both in
> Emacs and Eclipse. 

We've been doing the same with PR_ (properties) and
FO_ (FO's) for quite some time.  After hitting the
EN_, you're at the same place you would be without the
prefix.  Furthermore, you can now hunt away for your
enumeration constants without them being intermixed
with the PR_'s and FO_'s.

It was also a commenting issue:  TRUE and FALSE, for
example, without a prefix, just weren't self
documenting enough to emphasize that we're working
with enumeration constants here.  (Remember, we
removed the old interfaces--per your desire as well as
mine--such as WritingMode.LR_TB or whatever that
previously provided that emphasis.)


> I also don't quite get the point
> about the
> better S&R'ability.
> 

Because it gives us a very convenient handle ("EN_")
to identify all the places where enumeration constants
are currently being used.  So if we wanted to switch
from "EN_", to "ENUM_", it would just be a quick S&R. 
Sans handle, that would be a very cumbersome
file-by-file manual process--which I just did
yesterday, in order to get the EN_'s in place to begin
with.

Glen


Re: cvs commit: xml-fop/src/java/org/apache/fop/traits LayoutProps.java SpaceVal.java

Posted by "J.Pietschmann" <j3...@yahoo.de>.
gmazza@apache.org wrote:
> gmazza      2004/11/24 13:07:31
>   2.) Appended EN_ to enumeration constants to make them better S&R'able throughout app.

Yuk. Having a large number of identifiers in the same scope with
an identical prefix isn't very good for autocompletion both in
Emacs and Eclipse. I also don't quite get the point about the
better S&R'ability.

J.Pietschmann