font wiki
Jeremias and others interested in the font system: I have just updated the Font Subsystem wiki with my latest thinking on the subject, and have removed the former Facade stuff. I think the real solution is much simpler than what either of us discussed earlier. I see the need and benefit of using an interface for the TypeFace classes. However, I am pretty sure that the interface never really needs to be seen by the rest of FOP. IMO, FOP's API to the font subsystem should consist of a static method to provide a Font to be used, a static method to provide the stream of embedding data, and a bunch of instance methods to return metric information. I don't see a need for anything more complex than that, but will await your thoughts on the subject, when you get a chance. I think I have moved somewhat closer to your position over the last six (??!!) months. (This is part of my effort to get old, nagging design issues resolved, well documented, and put to bed). Victor Mote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: checkstyle: public members
Victor Mote wrote: checkstyle.pattern.publicmember = ^f[A-Z][a-zA-Z0-9]*$, which is the ... 1. was this really our intent? I'm not sure. Nevertheless, it was apparently made by well meaning people who thought detailed naming conventions would help to spot scope/type/semantic of an identifier easier. I've found again and again that this sucks for a variety of reasons. Let's change it to ^[a-z][a-zA-Z0-9]*$ 2. does anyone know what the f stand for? Field, I guess. 3. checkstyle actually suggests that Variable 'ipd' must be private and have accessor methods. Perhaps this is our preferred solution? This is usually a good idea but may cause quite a bit of work. J.Pietschmann - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: checkstyle: public members
J.Pietschmann wrote: Victor Mote wrote: checkstyle.pattern.publicmember = ^f[A-Z][a-zA-Z0-9]*$, which is the ... 1. was this really our intent? I'm not sure. Nevertheless, it was apparently made by well meaning people who thought detailed naming conventions would help to spot scope/type/semantic of an identifier easier. I've found again and again that this sucks for a variety of reasons. Let's change it to ^[a-z][a-zA-Z0-9]*$ +1 I don't think this was ever our intent. It was, I think, an issue whiich was discussed on the Wiki in relation to prefixes like m_. It was rejected there, and because it was not proceded with, it has disappeared from both the wiki and the web page. 2. does anyone know what the f stand for? Field, I guess. 3. checkstyle actually suggests that Variable 'ipd' must be private and have accessor methods. Perhaps this is our preferred solution? This is usually a good idea but may cause quite a bit of work. Peter -- Peter B. West http://www.powerup.com.au/~pbwest/resume.html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: checkstyle: public members
+1 to everything Jörg said. On 13.07.2003 11:19:37 J.Pietschmann wrote: Victor Mote wrote: checkstyle.pattern.publicmember = ^f[A-Z][a-zA-Z0-9]*$, which is the ... 1. was this really our intent? I'm not sure. Nevertheless, it was apparently made by well meaning people who thought detailed naming conventions would help to spot scope/type/semantic of an identifier easier. I've found again and again that this sucks for a variety of reasons. Let's change it to ^[a-z][a-zA-Z0-9]*$ 2. does anyone know what the f stand for? Field, I guess. 3. checkstyle actually suggests that Variable 'ipd' must be private and have accessor methods. Perhaps this is our preferred solution? This is usually a good idea but may cause quite a bit of work. Jeremias Maerki - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Checkstyle max method length
Victor, I noticed we had to break up a function to satisfy Checkstyle's max method length size of 150 ( http://marc.theaimsgroup.com/?l=fop-cvsm=105806596213734w=2). That seems too constricted for our use--it's may force parameter passing of local variables where none would otherwise be needed. I would double the limit to 300--the function above did not warrant rewriting--a better option may be to remove the limit entirely. Combined, the two case statement blocks tripped Checkstyle's limit, causing Checkstyle to complain: so you placed both blocks into separate functions. But what if the second case statement was much smaller? Checkstyle wouldn't complain about the method containing on the switch statement, so *neither* of the two case statements would be placed into their own function. This seems too arbitrary: something in addition to method size should play a part in the decision to create new methods. Thanks, Glen --- Victor Mote [EMAIL PROTECTED] wrote: Fellow fop devs: Our current checkstyle configuration has a setting for checkstyle.pattern.publicmember = ^f[A-Z][a-zA-Z0-9]*$, which is the checkstyle default. See (for example) datatypes/FODimension where public members ipd and bpd are flagged by checkstyle for not fitting this pattern. Changing ipd to fIpd fixes the problem. Before I refactor this kind of item: 1. was this really our intent? 2. does anyone know what the f stand for? 3. checkstyle actually suggests that Variable 'ipd' must be private and have accessor methods. Perhaps this is our preferred solution? Victor Mote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED] __ Do you Yahoo!? SBC Yahoo! DSL - Now only $29.95 per month! http://sbc.yahoo.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Bug report for Fop [2003/07/13]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 635|Opn|Nor|2001-02-18|Doesn't support id= attribute in fo:page-sequence | | 953|Opn|Nor|2001-03-12|Incorrect hyperlinks area rendering in justified t| | 1063|New|Nor|2001-03-21|fop does not handle large fo files| | 1180|New|Maj|2001-04-02|Problem with monospaced font | | 1859|Opn|Min|2001-05-22|org.apache.fop.apps.Driver.reset() doesn't fully r| | 1998|New|Nor|2001-06-05|linefeed-treatment not understood | | 2150|Ass|Maj|2001-06-13|New page with a table-header but without any tabl| | 2475|Ass|Nor|2001-07-06|Borders don't appear to work in fo:table-row| | 2740|New|Maj|2001-07-23|multi-page tables sometimes render badly | | 2909|New|Maj|2001-07-30|Gradient render error | | 2964|Ass|Nor|2001-08-02|problems with height of cells in tables | | 2988|New|Maj|2001-08-03|0.19: list-item-label does not stick to list-item-| | 3044|Ass|Maj|2001-08-08|keep-together not functioning | | 3280|New|Nor|2001-08-27|PCL Renderer doesn't work | | 3305|Opn|Nor|2001-08-28|list-block overlapping footnote body | | 3497|New|Maj|2001-09-07|id already exists error when using span=all attr| | 3824|New|Blk|2001-09-25|MIF option with tables| | 4030|New|Nor|2001-10-08|IOException creating Postscript with graphics on S| | 4126|New|Nor|2001-10-12|FontState.width() returns pts instead of millipts | | 4226|New|Nor|2001-10-17|The orphans property doesn't seem to work | | 4388|New|Nor|2001-10-24|Nullpointer exception in the construction of new D| | 4415|New|Nor|2001-10-25|scaling=uniform does not work on images... | | 4510|New|Nor|2001-10-30|fo:inline common properties ignored? | | 4535|New|Maj|2001-10-31|PCL renderer 1.13 not rendering SVG | | 4614|New|Maj|2001-11-03|wrap property combined with Chinese | | 4767|New|Nor|2001-11-09|SVG text is distored in PDF output| | 5001|New|Nor|2001-11-21|content-width and content-height ignored? | | 5010|New|Enh|2001-11-21|Better error reporting needed | | 5047|Ass|Nor|2001-11-23|Dotted border style is not supported | | 5124|New|Maj|2001-11-27|fo:block-container is not rendered properly using | | 5335|Opn|Min|2001-12-10|Text with embedded CID fonts not retrievable from | | 5655|Ass|Nor|2002-01-02|text-decoration cannot take multiple values | | 6094|Opn|Maj|2002-01-29|0.20.3rc hangs in endless loop| | 6237|Opn|Nor|2002-02-05|#xFB01 (fi ligature) produces a sharp? | | 6305|New|Nor|2002-02-07|Using fo:table-and-caption results in empty output| | 6427|New|Enh|2002-02-13|Adding additional Type 1 fonts problem| | 6437|New|Maj|2002-02-13|Tables without fo:table-column don't render | | 6483|New|Nor|2002-02-15|Table, Loop, footer could not fit on page, moving| | 6844|New|Nor|2002-03-04|No line breaks inserted in list-item-label| | 6918|New|Enh|2002-03-06|reference-orientation has no effect | | 6929|New|Nor|2002-03-06|Cells border hidden by cells background | | 6997|New|Nor|2002-03-09|Row-spanned row data breaks over a page within a c| | 7140|New|Enh|2002-03-15|page-position attribute set to last on condition| | 7241|New|Nor|2002-03-19|keep-with-previous, keep-with-next only working on| | 7283|New|Nor|2002-03-20|Table border misaligned when using margin-left in | | 7337|New|Nor|2002-03-21|border around external image leaves empty space | | 7487|New|Nor|2002-03-26|break-before=page for table inserts empty page | | 7496|New|Nor|2002-03-26|The table header borders are not adjusted to the b| | 7525|New|Cri|2002-03-27|table with spans inside a list-block | | 7919|New|Cri|2002-04-10|problem to use attribute linefeed-treatment and li| | 8003|Ass|Maj|2002-04-12|FopImageFactory never releases cached images | |
RE: Just a stupid question ... =P
Ok, I see. There are probably a lot of people that want a free ride to the moon, but that really doesn't make it any more feasible to get them there. I think the main problem is to get them back alive vbg Thomas Sporbeck - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: Checkstyle max method length
Glen Mazza wrote: Victor, I noticed we had to break up a function to satisfy Checkstyle's max method length size of 150 ( http://marc.theaimsgroup.com/?l=fop-cvsm=105806596213734w=2). That seems too constricted for our use--it's may force parameter passing of local variables where none would otherwise be needed. I would double the limit to 300--the function above did not warrant rewriting--a better option may be to remove the limit entirely. Combined, the two case statement blocks tripped Checkstyle's limit, causing Checkstyle to complain: so you placed both blocks into separate functions. But what if the second case statement was much smaller? Checkstyle wouldn't complain about the method containing on the switch statement, so *neither* of the two case statements would be placed into their own function. This seems too arbitrary: something in addition to method size should play a part in the decision to create new methods. Glen, Victor, I tend to agree with Glen on this one. The limit seems too restrictive, and it is only a guideline - as are many of the other strictures of Checkstyle. They flag things which may make the code problematical, but they do not have the same simplicity as, e.g., tab width or format of names. If we follow them slavishly, we lose perspective on the code. I don't think things like method length should even be warnings; rather info flags, to indicate that something needs to be looked at. Peter -- Peter B. West http://www.powerup.com.au/~pbwest/resume.html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: Checkstyle max method length
Peter B. West wrote: Glen Mazza wrote: Victor, I noticed we had to break up a function to satisfy Checkstyle's max method length size of 150 ( http://marc.theaimsgroup.com/?l=fop-cvsm=105806596213734w=2). That seems too constricted for our use--it's may force parameter passing of local variables where none would otherwise be needed. I would double the limit to 300--the function above did not warrant rewriting--a better option may be to remove the limit entirely. Combined, the two case statement blocks tripped Checkstyle's limit, causing Checkstyle to complain: so you placed both blocks into separate functions. But what if the second case statement was much smaller? Checkstyle wouldn't complain about the method containing on the switch statement, so *neither* of the two case statements would be placed into their own function. This seems too arbitrary: something in addition to method size should play a part in the decision to create new methods. Glen, Victor, I tend to agree with Glen on this one. The limit seems too restrictive, and it is only a guideline - as are many of the other strictures of Checkstyle. They flag things which may make the code problematical, but they do not have the same simplicity as, e.g., tab width or format of names. If we follow them slavishly, we lose perspective on the code. I don't think things like method length should even be warnings; rather info flags, to indicate that something needs to be looked at. I think it is instructive that neither of you commented on whether the changes that were made actually improved the code or not. I think you both need to either 1) show that the code was better before I changed it, or 2) realize that checkstyle did what it was supposed to do by flagging based on an admittedly arbitrary limit. I will go one step further and suggest that each of you find one 150+ line method in FOP's source code that would not benefit from refactoring into smaller methods. The truth is that I too am uncomfortable with a 150-line limit, and will argue against it if I ever think it is a problem. The simple fact is that every 150+ line method I have encountered so far needed to be broken up. There was nothing slavish about it. Some of the ones in question will benefit from being broken up even further. Some other day. Victor Mote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
Re: Checkstyle max method length
Victor Mote wrote: Peter B. West wrote: Glen Mazza wrote: Victor, I noticed we had to break up a function to satisfy Checkstyle's max method length size of 150 ( http://marc.theaimsgroup.com/?l=fop-cvsm=105806596213734w=2). That seems too constricted for our use--it's may force parameter passing of local variables where none would otherwise be needed. I would double the limit to 300--the function above did not warrant rewriting--a better option may be to remove the limit entirely. Combined, the two case statement blocks tripped Checkstyle's limit, causing Checkstyle to complain: so you placed both blocks into separate functions. But what if the second case statement was much smaller? Checkstyle wouldn't complain about the method containing on the switch statement, so *neither* of the two case statements would be placed into their own function. This seems too arbitrary: something in addition to method size should play a part in the decision to create new methods. Glen, Victor, I tend to agree with Glen on this one. The limit seems too restrictive, and it is only a guideline - as are many of the other strictures of Checkstyle. They flag things which may make the code problematical, but they do not have the same simplicity as, e.g., tab width or format of names. If we follow them slavishly, we lose perspective on the code. I don't think things like method length should even be warnings; rather info flags, to indicate that something needs to be looked at. I think it is instructive that neither of you commented on whether the changes that were made actually improved the code or not. I think you both need to either 1) show that the code was better before I changed it, or 2) realize that checkstyle did what it was supposed to do by flagging based on an admittedly arbitrary limit. I will go one step further and suggest that each of you find one 150+ line method in FOP's source code that would not benefit from refactoring into smaller methods. The truth is that I too am uncomfortable with a 150-line limit, and will argue against it if I ever think it is a problem. The simple fact is that every 150+ line method I have encountered so far needed to be broken up. There was nothing slavish about it. Some of the ones in question will benefit from being broken up even further. Some other day. I didn't comment on the particulars because I was speaking generally about the way to react to the method length limit. I should have said that I was agreeing with Glen concluding remark, and I should have removed the rest of the posting. My apologies, Victor. Peter -- Peter B. West http://www.powerup.com.au/~pbwest/resume.html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
RE: Checkstyle max method length
--- Victor Mote [EMAIL PROTECTED] wrote: I think it is instructive that neither of you commented on whether the changes that were made actually improved the code or not. I think you both need to either 1) show that the code was better before I changed it, If the reason you gave in CVS for changing the code was just to make it more readable or usable, then it wouldn't have been an issue. But the reason you gave CVS for the change was primarily to make checkstyle happy: extract methods nextDecimalPoint() and nextColor() from method next(), primarily to satisfy checkstyle's method size requirement That was my concern--a too-low limit requiring us to rewrite a lot of code. But according to your response, you--not just checkstyle!--also happen to feel it is a better design, so it's OK to keep as-is. However, these changes do have a drawback because they encourage the use of global variables to avoid passing parameters from one function to another. For example, it appears that currentTokenStartIndex is actually just a throwaway local method variable so it should not be declared at class-scope but as local instead. But that's more difficult now because the two functions which use cTSI have been broken out of next()--you would need to pass cTSI as an argument between those two. (Also, as an aside, currentMaybeOperator isn't being used at all, so in such a performance-critical area as here perhaps the variable should be removed.) Glen __ Do you Yahoo!? SBC Yahoo! DSL - Now only $29.95 per month! http://sbc.yahoo.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow Table.java TableAndCaption.java TableBody.java TableCaption.java TableCell.java TableColumn.java TableFooter.java TableHeader.java TableRow.java Wrapper.java
vmote 2003/07/13 13:52:06
Modified:src/java/org/apache/fop/fo FObj.java
ToBeImplementedElement.java
src/java/org/apache/fop/fo/flow Table.java
TableAndCaption.java TableBody.java
TableCaption.java TableCell.java TableColumn.java
TableFooter.java TableHeader.java TableRow.java
Wrapper.java
Log:
style changes only
Revision ChangesPath
1.9 +1 -1 xml-fop/src/java/org/apache/fop/fo/FObj.java
Index: FObj.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObj.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FObj.java 29 Jun 2003 19:34:33 - 1.8
+++ FObj.java 13 Jul 2003 20:52:05 - 1.9
@@ -334,7 +334,7 @@
/**
* Return a LayoutManager responsible for laying out this FObj's content.
* Must override in subclasses if their content can be laid out.
- * @param list the list to add the layout manager(s) to
+ * @param list the list to which the layout manager(s) should be added
*/
public void addLayoutManager(List list) {
}
1.2 +14 -11xml-fop/src/java/org/apache/fop/fo/ToBeImplementedElement.java
Index: ToBeImplementedElement.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/ToBeImplementedElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ToBeImplementedElement.java 11 Mar 2003 13:05:19 - 1.1
+++ ToBeImplementedElement.java 13 Jul 2003 20:52:05 - 1.2
@@ -3,34 +3,34 @@
*
*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
*[EMAIL PROTECTED]
- *
+ *
* 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
@@ -42,12 +42,12 @@
* (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 [EMAIL PROTECTED]. For more information on the Apache
* Software Foundation, please see http://www.apache.org/.
- */
+ */
package org.apache.fop.fo;
/**
@@ -55,11 +55,14 @@
*/
public class ToBeImplementedElement extends FObj {
+/**
+ * @param parent FONode that is the parent of this object
+ */
protected ToBeImplementedElement(FONode parent) {
super(parent);
}
-public void setup() {
+private void setup() {
getLogger().debug(This element \ + this.name
+ \ is not yet implemented.);
}
1.2 +31 -13
Re: [VOTE] ElementMapping changes 5 FO's into pagination
J.Pietschmann wrote:
Q
Glen Mazza wrote:
(1.) I would like to remove the addToBuilder()
function (and update its subclasses) from the
ElementMapping interface and replace it with
getNamespaceURI() and getFOTable() functions
+1
BTW this is not a change which requires a vote.
/Q
Change done.
Q
(2.) I'd like to move
these five to the pagination package
-1
While the packaging of the files may be suboptimal, I
don't feel there is much to gain from moving stuff
around right now. In particular I don't think the
FO spec should be the ultimate guide. The package for
Page and Region classes are more of a concern to me
anyway.
J.Pietschmann
/Q
+1 (still)
Let me see if I can give you an acceptable
non-spec-heavy reason to make these changes. I agree
that the spec should not be the ultimate guide for
where to put the classes--but currently the spec and
Fop's architectural implementation appear to be saying
one thing, while the package/class layout is saying
another:
1) The fo.flow.Flow and its fo.flow.StaticContent
subclass, in addition to not referencing anything in
Flow package, are both referencing pagination classes.
These are the only classes in fo.flow doing so.
2) Also, in fo.pagination.*, the only fo.flow objects
being referenced are flow.Flow and flow.StaticContent.
So moving these two classes to pagination would make
both packages completely independent of each
other--meaning we've made a very nice break of the
formatting objects--hard to do considering there's 57
of them.
As for the other three still sitting in fo--I
believe the original decision to subclass the fo's is
because there are too many of them, and also a desire
to keep them separate from the FOTreeBuilder-specific
code. It is strange to move just 54 out of 57 of
them, however, and not *all* to subclasses.
Regardless, looking at their spec definitions:
fo:title: The fo:title formatting object is used to
associate a title with a given page-sequence.
(therefore, tied to pagination.PageSequence?)
fo:declarations: The fo:declarations formatting object
is used to group global declarations for a stylesheet.
(pagination.Root?)
fo:color-profile: The fo:color-profile formatting
object is used to declare an ICC Color Profile for a
stylesheet. (spec would indicate pagination.root, but
possibly {pagination}.declarations).
It seems that sooner or later these three should also
move to pagination--but I'm less certain on these than
I am on the other two.
Thanks,
Glen
__
Do you Yahoo!?
SBC Yahoo! DSL - Now only $29.95 per month!
http://sbc.yahoo.com
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
RE: Checkstyle max method length
Glen Mazza wrote: If the reason you gave in CVS for changing the code was just to make it more readable or usable, then it wouldn't have been an issue. But the reason you gave CVS for the change was primarily to make checkstyle happy: extract methods nextDecimalPoint() and nextColor() from method next(), primarily to satisfy checkstyle's method size requirement OK, if I had known I would spend my weekend defending this, I would have clarified it with something like primarily done right now (as opposed to later) to satisfy checkstyle's method size requirement. That was my concern--a too-low limit requiring us to rewrite a lot of code. But according to your response, you--not just checkstyle!--also happen to feel it is a better design, so it's OK to keep as-is. However, these changes do have a drawback because they encourage the use of global variables to avoid passing parameters from one function to another. For example, it appears that currentTokenStartIndex is actually just a throwaway local method variable so it should not be declared at class-scope but as local instead. But that's more difficult now because the two functions which use cTSI have been broken out of next()--you would need to pass cTSI as an argument between those two. You need to draw a conclusion here. If you conclude that it was better before, you have my blessing to revert the change. In any other case, I will simply say thank you for the refresher course on the tradeoffs between local/global, number of parameters, and method size. (Also, as an aside, currentMaybeOperator isn't being used at all, so in such a performance-critical area as here perhaps the variable should be removed.) Please feel free to improve it further. Victor Mote - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow MultiCase.java MultiProperties.java MultiPropertySet.java MultiSwitch.java MultiToggle.java PageNumber.java PageNumberCitation.java StaticContent.java
vmote 2003/07/13 15:41:22
Modified:src/java/org/apache/fop/fo/flow MultiCase.java
MultiProperties.java MultiPropertySet.java
MultiSwitch.java MultiToggle.java PageNumber.java
PageNumberCitation.java StaticContent.java
Log:
style changes only
Revision ChangesPath
1.2 +16 -12xml-fop/src/java/org/apache/fop/fo/flow/MultiCase.java
Index: MultiCase.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MultiCase.java11 Mar 2003 13:05:16 - 1.1
+++ MultiCase.java13 Jul 2003 22:41:21 - 1.2
@@ -3,34 +3,34 @@
*
*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
*[EMAIL PROTECTED]
- *
+ *
* 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
@@ -42,12 +42,12 @@
* (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 [EMAIL PROTECTED]. For more information on the Apache
* Software Foundation, please see http://www.apache.org/.
- */
+ */
package org.apache.fop.fo.flow;
// FOP
@@ -56,15 +56,19 @@
import org.apache.fop.layout.AccessibilityProps;
/**
- * fo:multi-case element.
+ * Class modelling the fo:multi-case object. See Sec. 6.9.4 of the XSL-FO
+ * Standard.
*/
public class MultiCase extends ToBeImplementedElement {
+/**
+ * @param parent FONode that is the parent of this object
+ */
public MultiCase(FONode parent) {
super(parent);
}
-public void setup() {
+private void setup() {
// Common Accessibility Properties
AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
1.2 +16 -12xml-fop/src/java/org/apache/fop/fo/flow/MultiProperties.java
Index: MultiProperties.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/MultiProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MultiProperties.java 11 Mar 2003 13:05:16 - 1.1
+++ MultiProperties.java 13 Jul 2003 22:41:21 - 1.2
@@ -3,34 +3,34 @@
*
*The Apache Software License, Version 1.1
*
- *
+ *
* Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
- *
+ *
* Redistribution and use in
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow InlineContainer.java Leader.java ListBlock.java ListItem.java ListItemBody.java ListItemLabel.java
vmote 2003/07/13 16:33:23
Modified:src/java/org/apache/fop/fo FObjMixed.java
src/java/org/apache/fop/fo/flow InlineContainer.java
Leader.java ListBlock.java ListItem.java
ListItemBody.java ListItemLabel.java
Log:
style changes only
Revision ChangesPath
1.4 +25 -6 xml-fop/src/java/org/apache/fop/fo/FObjMixed.java
Index: FObjMixed.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FObjMixed.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FObjMixed.java29 Jun 2003 19:34:33 - 1.3
+++ FObjMixed.java13 Jul 2003 23:33:22 - 1.4
@@ -57,22 +57,33 @@
import java.util.List;
/**
- * base class for representation of mixed content formatting objects
+ * Base class for representation of mixed content formatting objects
* and their processing
*/
public class FObjMixed extends FObj {
+/** TextInfo for this object */
protected TextInfo textInfo = null;
+/** FontInfo for this object */
protected FontInfo fontInfo = null;
+/**
+ * @param parent FONode that is the parent of this object
+ */
public FObjMixed(FONode parent) {
super(parent);
}
+/**
+ * @param st StructureHandler to set
+ */
public void setStructHandler(StructureHandler st) {
super.setStructHandler(st);
fontInfo = st.getFontInfo();
}
+/**
+ * @param lms the list to which the layout manager(s) should be added
+ */
public void addLayoutManager(List lms) {
if (children != null) {
InlineStackingLayoutManager lm;
@@ -84,12 +95,17 @@
}
}
+/**
+ * @param data array of characters containing text to be added
+ * @param start starting array element to add
+ * @param length number of characters to add
+ */
protected void addCharacters(char data[], int start, int length) {
if (textInfo == null) {
-// Really only need one of these, but need to get fontInfo
-// stored in propMgr for later use.
-propMgr.setFontInfo(fontInfo);
-textInfo = propMgr.getTextLayoutProps(fontInfo);
+// Really only need one of these, but need to get fontInfo
+// stored in propMgr for later use.
+propMgr.setFontInfo(fontInfo);
+textInfo = propMgr.getTextLayoutProps(fontInfo);
}
FOText ft = new FOText(data, start, length, textInfo, this);
@@ -98,12 +114,15 @@
addChild(ft);
}
-public void setup() {
+private void setup() {
if (this.properties != null) {
setupID();
}
}
+/**
+ * @return iterator for this object
+ */
public CharIterator charIterator() {
return new RecursiveCharIterator(this);
}
1.2 +25 -12xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java
Index: InlineContainer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InlineContainer.java 11 Mar 2003 13:05:16 - 1.1
+++ InlineContainer.java 13 Jul 2003 23:33:22 - 1.2
@@ -3,34 +3,34 @@
*
*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
cvs commit: xml-fop/examples/fo/basic leader.fo
chrisg 2003/07/13 17:16:49 Modified:examples/fo/basic Tag: fop-0_20_2-maintain leader.fo Log: made example work with latest leader changes Revision ChangesPath No revision No revision 1.1.2.3 +5 -5 xml-fop/examples/fo/basic/leader.fo Index: leader.fo === RCS file: /home/cvs/xml-fop/examples/fo/basic/leader.fo,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- leader.fo 6 Feb 2003 23:38:38 - 1.1.2.2 +++ leader.fo 14 Jul 2003 00:16:49 - 1.1.2.3 @@ -393,7 +393,7 @@ fo:table-row line-height=12pt fo:table-cellfo:block text-align=endA) /fo:block/fo:table-cell -fo:table-cellfo:block text-align=startThis is some longer sample textfo:leader leader-pattern=dots +fo:table-cellfo:block text-align=justify text-align-last=justifyThis is some longer sample textfo:leader leader-pattern=dots leader-pattern-width=8pt leader-alignment=reference-area //fo:block/fo:table-cell @@ -403,7 +403,7 @@ fo:table-row line-height=12pt fo:table-cellfo:block text-align=endB) /fo:block/fo:table-cell -fo:table-cellfo:block text-align=startSome textfo:leader leader-pattern=dots +fo:table-cellfo:block text-align=justify text-align-last=justifySome textfo:leader leader-pattern=dots leader-pattern-width=8pt leader-alignment=reference-area //fo:block/fo:table-cell @@ -412,7 +412,7 @@ fo:table-row line-height=12pt fo:table-cellfo:block text-align=end C) /fo:block/fo:table-cell -fo:table-cellfo:block text-align=startTextfo:leader leader-pattern=dots +fo:table-cellfo:block text-align=justify text-align-last=justifyTextfo:leader leader-pattern=dots leader-pattern-width=8pt leader-alignment=reference-area //fo:block/fo:table-cell @@ -421,7 +421,7 @@ fo:table-row line-height=12pt fo:table-cellfo:block text-align=endD) /fo:block/fo:table-cell -fo:table-cellfo:block text-align=startThis text is even longer than the first entry fo:leader leader-pattern=dots +fo:table-cellfo:block text-align=justify text-align-last=justifyThis text is even longer than the first entry fo:leader leader-pattern=dots leader-pattern-width=8pt leader-alignment=reference-area //fo:block/fo:table-cell @@ -430,7 +430,7 @@ fo:table-row line-height=12pt fo:table-cellfo:block text-align=endE) /fo:block/fo:table-cell -fo:table-cellfo:block text-align=startShorter text examplefo:leader leader-pattern=dots +fo:table-cellfo:block text-align=justify text-align-last=justifyShorter text examplefo:leader leader-pattern=dots leader-pattern-width=8pt leader-alignment=reference-area //fo:block/fo:table-cell - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow InstreamForeignObject.java
vmote 2003/07/13 17:41:35
Modified:src/java/org/apache/fop/fo/flow InstreamForeignObject.java
Log:
extract methods computeXOffset() and computeYOffset() from getInlineArea()
Revision ChangesPath
1.2 +50 -40
xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
Index: InstreamForeignObject.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InstreamForeignObject.java11 Mar 2003 13:05:16 - 1.1
+++ InstreamForeignObject.java14 Jul 2003 00:41:35 - 1.2
@@ -3,34 +3,34 @@
*
*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
*[EMAIL PROTECTED]
- *
+ *
* 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
@@ -42,12 +42,12 @@
* (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 [EMAIL PROTECTED]. For more information on the Apache
* Software Foundation, please see http://www.apache.org/.
- */
+ */
package org.apache.fop.fo.flow;
// FOP
@@ -254,37 +254,9 @@
}
}
-int xoffset = 0;
-int yoffset = 0;
-int da = properties.get(display-align).getEnum();
-switch (da) {
-case DisplayAlign.BEFORE:
-break;
-case DisplayAlign.AFTER:
-yoffset = bpd - cheight;
-break;
-case DisplayAlign.CENTER:
-yoffset = (bpd - cheight) / 2;
-break;
-case DisplayAlign.AUTO:
-default:
-break;
-}
+int xoffset = computeXOffset(ipd, cwidth);
+int yoffset = computeYOffset(bpd, cheight);
-int ta = properties.get(text-align).getEnum();
-switch (ta) {
-case TextAlign.CENTER:
-xoffset = (ipd - cwidth) / 2;
-break;
-case TextAlign.END:
-xoffset = ipd - cwidth;
-break;
-case TextAlign.START:
-break;
-case TextAlign.JUSTIFY:
-default:
-break;
-}
Rectangle2D placement = new Rectangle2D.Float(xoffset, yoffset, cwidth,
cheight);
Document doc = child.getDocument();
@@ -301,6 +273,44 @@
areaCurrent.setOffset(0);
return areaCurrent;
+}
+
+private int computeXOffset (int ipd, int cwidth) {
+int xoffset = 0;
+int ta = properties.get(text-align).getEnum();
+
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow InstreamForeignObject.java
vmote 2003/07/13 17:44:13 Modified:src/java/org/apache/fop/fo/flow InstreamForeignObject.java Log: remove unused local variables in getInlineArea() Revision ChangesPath 1.3 +0 -22 xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java Index: InstreamForeignObject.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- InstreamForeignObject.java14 Jul 2003 00:41:35 - 1.2 +++ InstreamForeignObject.java14 Jul 2003 00:44:13 - 1.3 @@ -65,12 +65,6 @@ import org.apache.fop.fo.properties.Overflow; import org.apache.fop.fo.properties.Scaling; import org.apache.fop.fo.properties.TextAlign; -import org.apache.fop.layout.AccessibilityProps; -import org.apache.fop.layout.AuralProps; -import org.apache.fop.layout.BackgroundProps; -import org.apache.fop.layout.BorderAndPadding; -import org.apache.fop.layout.MarginInlineProps; -import org.apache.fop.layout.RelativePositionProps; import org.apache.fop.layoutmgr.LeafNodeLayoutManager; import org.w3c.dom.Document; @@ -129,22 +123,6 @@ return null; } XMLObj child = (XMLObj)fo; - -// Common Accessibility Properties -AccessibilityProps mAccProps = propMgr.getAccessibilityProps(); - -// Common Aural Properties -AuralProps mAurProps = propMgr.getAuralProps(); - -// Common Border, Padding, and Background Properties -BorderAndPadding bap = propMgr.getBorderAndPadding(); -BackgroundProps bProps = propMgr.getBackgroundProps(); - -// Common Margin Properties-Inline -MarginInlineProps mProps = propMgr.getMarginInlineProps(); - -// Common Relative Position Properties -RelativePositionProps mRelProps = propMgr.getRelativePositionProps(); // viewport size is determined by block-progression-dimension // and inline-progression-dimension - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow Float.java Flow.java Footnote.java FootnoteBody.java InitialPropertySet.java Inline.java
vmote 2003/07/13 18:12:53
Modified:src/java/org/apache/fop/fo/flow Float.java Flow.java
Footnote.java FootnoteBody.java
InitialPropertySet.java Inline.java
Log:
style changes only
Revision ChangesPath
1.2 +11 -11xml-fop/src/java/org/apache/fop/fo/flow/Float.java
Index: Float.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Float.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Float.java11 Mar 2003 13:05:16 - 1.1
+++ Float.java14 Jul 2003 01:12:53 - 1.2
@@ -3,34 +3,34 @@
*
*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
*[EMAIL PROTECTED]
- *
+ *
* 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
@@ -42,12 +42,12 @@
* (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 [EMAIL PROTECTED]. For more information on the Apache
* Software Foundation, please see http://www.apache.org/.
- */
+ */
package org.apache.fop.fo.flow;
// FOP
@@ -67,7 +67,7 @@
this.name = fo:float;
}
-public void setup() {
+private void setup() {
// this.properties.get(float);
// this.properties.get(clear);
1.2 +42 -13xml-fop/src/java/org/apache/fop/fo/flow/Flow.java
Index: Flow.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Flow.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Flow.java 11 Mar 2003 13:05:16 - 1.1
+++ Flow.java 14 Jul 2003 01:12:53 - 1.2
@@ -3,34 +3,34 @@
*
*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
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow ExternalGraphic.java
vmote 2003/07/13 18:26:04 Modified:src/java/org/apache/fop/fo/flow ExternalGraphic.java Log: remove unused local variables Revision ChangesPath 1.2 +10 -37xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java Index: ExternalGraphic.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ExternalGraphic.java 11 Mar 2003 13:05:16 - 1.1 +++ ExternalGraphic.java 14 Jul 2003 01:26:04 - 1.2 @@ -3,34 +3,34 @@ * *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 *[EMAIL PROTECTED] - * + * * 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 @@ -42,23 +42,19 @@ * (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 [EMAIL PROTECTED]. For more information on the Apache * Software Foundation, please see http://www.apache.org/. - */ + */ package org.apache.fop.fo.flow; // FOP import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObj; -import org.apache.fop.layout.AuralProps; -import org.apache.fop.layout.AccessibilityProps; import org.apache.fop.layout.BorderAndPadding; import org.apache.fop.layout.BackgroundProps; -import org.apache.fop.layout.MarginInlineProps; -import org.apache.fop.layout.RelativePositionProps; import org.apache.fop.fo.properties.TextAlign; import org.apache.fop.fo.properties.Overflow; import org.apache.fop.fo.properties.DisplayAlign; @@ -292,29 +288,6 @@ break; } placement = new Rectangle2D.Float(xoffset, yoffset, cwidth, cheight); - -// Common Accessibility Properties -AccessibilityProps mAccProps = propMgr.getAccessibilityProps(); - -// Common Aural Properties -AuralProps mAurProps = propMgr.getAuralProps(); - -// Common Margin Properties-Inline -MarginInlineProps mProps = propMgr.getMarginInlineProps(); - -// Common Relative Position Properties -RelativePositionProps mRelProps = propMgr.getRelativePositionProps(); - -// this.properties.get(alignment-adjust); -// this.properties.get(alignment-baseline); -// this.properties.get(baseline-shift); -// this.properties.get(content-type); -// this.properties.get(dominant-baseline); -// this.properties.get(keep-with-next); -// this.properties.get(keep-with-previous); -// this.properties.get(line-height); -// this.properties.get(line-height-shift-adjustment); -//
cvs commit: xml-fop/examples/fo/basic extensive.fo
chrisg 2003/07/13 18:26:04 Modified:examples/fo/basic Tag: fop-0_20_2-maintain extensive.fo Log: fixed small problem work with latest leader changes Revision ChangesPath No revision No revision 1.1.2.2 +13 -2 xml-fop/examples/fo/basic/extensive.fo Index: extensive.fo === RCS file: /home/cvs/xml-fop/examples/fo/basic/extensive.fo,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- extensive.fo 13 Jan 2003 18:23:51 - 1.1.2.1 +++ extensive.fo 14 Jul 2003 01:26:03 - 1.1.2.2 @@ -82,9 +82,20 @@ /fo:list-block fo:block break-before=page font-size=24pt line-height=28pt space-before.optimum=12pt space-after.optimum=12ptNext Stage/fo:block fo:blockRight, now we are ready to try some newly implemented things like rules. What follows is a display rule of default thickness 1pt and a space-before and space-after of 12pt./fo:block - fo:blockfo:leader leader-pattern=rule space-before.optimum=12pt space-after.optimum=12pt//fo:block + fo:block +fo:leader leader-pattern=rule + space-before.optimum=12pt + space-after.optimum=12pt + leader-length=100%/ + /fo:block fo:blockNow what follows is a leader of thickness 5pt with start-indent of 100pt (same space-before/after as before)./fo:block - fo:blockfo:leader leader-pattern=rule space-before.optimum=12pt space-after.optimum=12pt rule-thickness=5pt start-indent=100pt//fo:block + fo:block start-indent=100pt +fo:leader leader-pattern=rule + space-before.optimum=12pt + space-after.optimum=12pt + rule-thickness=5pt + leader-length=100%/ + /fo:block fo:block font-size=24pt line-height=28pt space-before.optimum=12pt space-after.optimum=12pt fo:inline color=#500C/fo:inline fo:inline color=#700o/fo:inline - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow BasicLink.java BidiOverride.java Block.java BlockContainer.java Character.java
vmote 2003/07/13 18:53:41
Modified:src/java/org/apache/fop/fo/flow BasicLink.java
BidiOverride.java Block.java BlockContainer.java
Character.java
Log:
style changes only
Revision ChangesPath
1.2 +25 -13xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java
Index: BasicLink.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicLink.java11 Mar 2003 13:05:16 - 1.1
+++ BasicLink.java14 Jul 2003 01:53:41 - 1.2
@@ -3,34 +3,34 @@
*
*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
*[EMAIL PROTECTED]
- *
+ *
* 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
@@ -42,12 +42,12 @@
* (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 [EMAIL PROTECTED]. For more information on the Apache
* Software Foundation, please see http://www.apache.org/.
- */
+ */
package org.apache.fop.fo.flow;
// Java
@@ -77,15 +77,21 @@
* that are created by the fo element.
*/
public class BasicLink extends Inline {
-
+
private String link = null;
private boolean external = false;
+/**
+ * @param parent FONode that is the parent of this object
+ */
public BasicLink(FONode parent) {
super(parent);
}
-// add start and end properties for the link
+/**
+ * Add start and end properties for the link
+ * @see org.apache.fop.fo.FObj#addLayoutManager
+ */
public void addLayoutManager(List lms) {
setup();
InlineStackingLayoutManager lm;
@@ -119,7 +125,7 @@
}
}
-public void setup() {
+private void setup() {
String destination;
int linkType;
@@ -168,6 +174,9 @@
}
+/**
+ * @return true (BasicLink can contain Markers)
+ */
protected boolean containsMarkers() {
return true;
}
@@ -192,6 +201,9 @@
area = a;
}
+/**
+ * @return true if this link is resolved
+ */
public boolean isResolved() {
return resolved;
}
1.2 +21 -12xml-fop/src/java/org/apache/fop/fo/flow/BidiOverride.java
Index: BidiOverride.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BidiOverride.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
---
DO NOT REPLY [Bug 21554] New: - Exception in thread main java.lang.NoClassDefFoundError:
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21554.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21554
Exception in thread main java.lang.NoClassDefFoundError:
Summary: Exception in thread main
java.lang.NoClassDefFoundError:
Product: Fop
Version: 0.20.5
Platform: PC
OS/Version: Windows NT/2K
Status: NEW
Severity: Normal
Priority: Other
Component: general
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
(Probably a newbie thing but for the next newbie that might run into this...)
I was unable to run fop (0.20.5rc3a) using out-of-the-box fop.bat receiving a
NoClassDefFoundError...
After many failed attempts I finally traced it to the batch file itself:
surrounding the %LOCALCLASSPATH% with (quotes) fixed it for me!!!
So the last line of fop.bat becomes
java -cp %LOCALCLASSPATH% org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
This error will only surface when your classpath includes spaces (and probably
some other special characters...) like mine did ('Documents and Settings'!...
downloaded to personal directory...)
I suggest including quotes (by default) in scripts where it might be an issue or
making a note in the FAQ.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21555] New: - Exception in thread main java.lang.NoClassDefFoundError:
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21555.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21555
Exception in thread main java.lang.NoClassDefFoundError:
Summary: Exception in thread main
java.lang.NoClassDefFoundError:
Product: Fop
Version: 0.20.5
Platform: PC
OS/Version: Windows NT/2K
Status: NEW
Severity: Normal
Priority: Other
Component: general
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
(Probably a newbie thing but for the next newbie that might run into this...)
I was unable to run fop (0.20.5rc3a) using out-of-the-box fop.bat receiving a
NoClassDefFoundError...
After many failed attempts I finally traced it to the batch file itself:
surrounding the %LOCALCLASSPATH% with (quotes) fixed it for me!!!
So the last line of fop.bat becomes
java -cp %LOCALCLASSPATH% org.apache.fop.apps.Fop %1 %2 %3 %4 %5 %6 %7 %8
This error will only surface when your classpath includes spaces (and probably
some other special characters...) like mine did ('Documents and Settings'!...
downloaded to personal directory...)
I suggest including quotes (by default) in scripts where it might be an issue or
making a note in the FAQ.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21555] - Exception in thread main java.lang.NoClassDefFoundError:
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21555. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21555 Exception in thread main java.lang.NoClassDefFoundError: [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2003-07-14 02:24 --- *** This bug has been marked as a duplicate of 21554 *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21554] - Exception in thread main java.lang.NoClassDefFoundError:
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21554. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=21554 Exception in thread main java.lang.NoClassDefFoundError: --- Additional Comments From [EMAIL PROTECTED] 2003-07-14 02:24 --- *** Bug 21555 has been marked as a duplicate of this bug. *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
