Bug report for Fop [2004/01/04]
+---+ | 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 | | 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 | | 8050|New|Nor|2002-04-13|Soft hyphen (shy;) is not handled properly | |
Apache Account Request: New FOP committer
Finn Bock has been voted in as new FOP committer. Please create a new account for him. +1: 6 +0: 0 -1: 0 Vote: http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]by=threadfrom=563513 Full name: Finn Bock Preferred account name: bckfnn eMail-address: [EMAIL PROTECTED] Karma: xml-fop, xml-site The CLA should arrive by snail mail shortly. Thanks! Jeremias Maerki
DO NOT REPLY [Bug 25828] - [PATCH] fop.sh/bat should use java.endorsed.dirs
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=25828. 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=25828 [PATCH] fop.sh/bat should use java.endorsed.dirs --- Additional Comments From [EMAIL PROTECTED] 2004-01-04 16:27 --- I'd like to support Simon's proposed patch. I think it may help to avoid certain problems. There are quite a few other projects that do the same: Maven, Forrest, Tomcat etc.
RE: More on row and column span (was: RE: (Changing Vote) etc.)
-Original Message- From: Andreas L. Delmelle [mailto:[EMAIL PROTECTED] Just to keep everyone up to date about my excursions: snip / Another detail overlooked is the column-number property, ... Which is, for the moment quite ... unimplemented (--should've checked this sooner :) ), so that explains why the spec isn't being followed when setting the default value to 0. This makes me think that much of colspan and rowspan could already be managed at FO Tree level, so the LM's already get supplied the correct value at least for colnr from interrogating their FObj. I would judge this approach to be much cleaner... Any thoughts on this? With the current modifications I have made to the cell row LM's (--more on these soon), it should work... when support for the column-number property would be available. That is: for the moment, I have column-span working correctly apart from the fact that the column-number is always 0. If this is not the case, as I could see when hacking this support into the row LM in setupCells(), the cellIPD and xoffset for the following cells are being calculated correctly, based upon the correct table-column. (This was done in such a way that we can easily pick up the column-number from the corresponding TableCell afterwards, if and when we figure out how to correctly set the defaults for this.) The RowSpanMgr in maintenance *is* indeed very interesting... still no luck here, though Cheers, Andreas
DO NOT REPLY [Bug 25882] - PS-Renderer doesn't generate pages in landscape orientation
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=25882. 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=25882 PS-Renderer doesn't generate pages in landscape orientation [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |ASSIGNED --- Additional Comments From [EMAIL PROTECTED] 2004-01-04 17:39 --- Either you can try the AutoRotate functionality of the PSRenderer (see link below) or you can hack in a few lines in PSRenderer.java just before the following line in renderPage(): writeln(0.001 0.001 scale); The lines to insert are: writeln(); writeln(/PageSize [ + Math.round(pspagewidth) + + Math.round (pspageheight) + ]); writeln(/ImagingBBox null); writeln( setpagedevice); Note: this is only roughly tested and is probably incorrect when AutoRotate is used together with this hack but it should work in your case. Remember to rebuild FOP after that. The reason for this is the missing PageSize. Distiller doesn't interpret DSC comments where this information is provided already. AutoRotate functionality: http://marc.theaimsgroup.com/?l=fop-devm=105059583307703w=2 (keeping this bug open as a reminder and a note to myself: HEAD's PSRenderer is also missing this, but the Transcoder has is already.)
Re: Draft discussion of Federation proposal
(I'm CCing batik-dev and fop-dev once to invite everyone to discuss this on [EMAIL PROTECTED] Please repond on general only and do not cross-post unneccessarily.) Concerning the proposed TLPs I'm wondering if FOP and Batik shouldn't go together somehow. Both projects deal with XML to graphics conversions. FOP currently has 2 Batik Transcoder implementations (additional output formats for Batik: PDF, PS/EPS). So there is some kind of overlap which needs to be dealt with sooner or later. One possibility is to move the transcoders over to Batik but parts of them are FOP-specific so both projects should somehow be able to work on the common code. Moving these out of FOP still means a dependency on FOP's PDF, PostScript and font support code. These might need to be separated into Commons projects to be accessible to both projects and to ensure compatibility and cooperation. Sorry if this is a bit technical and not entirely on-topic but I thought this may have to be addressed in this discussion. To be fully on-topic again: When the XML project becomes a federation of projects it may make sense to create pointers to other rather XML-oriented projects which live in the Jakarta area (like Jakarta ECS, Jakarta Commons Betwixt, Digester, Jelly, JXPath, there may be others). As for the question about preference for XML Commons. I'd like to see Apache Commons become more live. In this aspect XML Commons should IMO go over to Apache Commons. On the other side, it may well be that Apache Commons will, to a great extent, also be a federation project. And moving too many project over there will create an oversight problem there in time. I guess the decision here depends on the development of Apache Commons and the projects intentions. So in the end I'm unsure what to prefer. In general, I currently don't see any showstoppers in Berin's proposal. On 04.01.2004 12:23:55 Berin Lautenbach wrote: Have put together a very rough draft of how a federation of projects around XML might be created. Caveat - it really is very draft, and purely there as a discussion starter. Feel free to either post comments/thoughts back to the list or to edit the document directly. (Note that this document does not yet discuss next steps, such as agreements from each sub-project etc.) All comments very welcome. The board requested a proposal by the Jan board meeting (normally around the 20th of the month), so it would be good to move the discussion forward - whether around this or another proposal. http://nagoya.apache.org/wiki/apachewiki.cgi?XMLProjectPages/FederationProposal Jeremias Maerki
RE: Draft discussion of Federation proposal
-Original Message- From: Jeremias Maerki [mailto:[EMAIL PROTECTED] To: [EMAIL PROTECTED] Cc: [EMAIL PROTECTED]; [EMAIL PROTECTED] Hi, Not being subscribed to [EMAIL PROTECTED], I'm posting on fop-dev for the time being (besides this, I'm a bit hesitant on whether I should even be responding in the first place --if anyone thinks this should be added to the wiki, just yell): Concerning the proposed TLPs I'm wondering if FOP and Batik shouldn't go together somehow. Both projects deal with XML to graphics conversions. FOP currently has 2 Batik Transcoder implementations (additional output formats for Batik: PDF, PS/EPS). So there is some kind of overlap which needs to be dealt with sooner or later. One possibility is to move the transcoders over to Batik but parts of them are FOP-specific so both projects should somehow be able to work on the common code. Moving these out of FOP still means a dependency on FOP's PDF, PostScript and font support code. These might need to be separated into Commons projects to be accessible to both projects and to ensure compatibility and cooperation. I agree, and don't want to come across as greedy here, but when it comes to use-cases, fact remains that you can have XSL-FO w/ embedded SVG, but not the other way around. (and for that matter: AFAICT XSL-FO can be rendered to SVG, but not the other way around... this could, of course, change if the two projects in question were merged somehow) On top of that, judging solely from user-list traffic, FOP seems to have had nearly thrice the attention Batik has (dev has been almost seven times as busy). Ok, maybe it takes our users three messages to explain them something, and maybe our developers are even worse :) No, I definitely see this as a pointer to the wideness of usage. I certainly support the idea of integrating the two projects one way or another. As I understand, there's a bunch of talented developers at batik-dev, so I would certainly welcome a closer cooperation between the two teams. In the long term, I think it would also be a benefit for the two specs (SVG / XSL-FO), if they become more and more directed towards combined usage, making SVG users aware of the possibilities of XSL-FO and vice versa. A combined user-list might be a good starter... Cheers, Andreas
cvs commit: xml-fop/src/java/org/apache/fop/fo PropertyList.java PropertyManager.java
gmazza 2004/01/04 13:14:34
Modified:src/java/org/apache/fop/fo PropertyList.java
PropertyManager.java
Log:
String-Int conversion: removed String version of PropertyList.get()
Revision ChangesPath
1.15 +0 -24 xml-fop/src/java/org/apache/fop/fo/PropertyList.java
Index: PropertyList.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyList.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PropertyList.java 2 Jan 2004 22:37:09 - 1.14
+++ PropertyList.java 4 Jan 2004 21:14:34 - 1.15
@@ -274,17 +274,6 @@
return p;
}
-
-/**
- * Return the property on the current FlowObject if it is specified, or if a
- * corresponding property is specified. If neither is specified, it returns
null.
- * @param propertyName name of property
- * @return the Property corresponding to that name
- */
-public Property getSpecified(String propertyName) {
-return get(propertyName, false, false);
-}
-
/**
* Return the property on the current FlowObject. If it isn't set explicitly,
* this will try to compute it based on other properties, or if it is
@@ -295,19 +284,6 @@
*/
public Property get(int propId) {
String propertyName = FOPropertyMapping.getPropertyName(propId);
-return get(propertyName, true, true);
-}
-
-/**
- * TEMPORARY until conversion to int's complete
- * Return the property on the current FlowObject. If it isn't set explicitly,
- * this will try to compute it based on other properties, or if it is
- * inheritable, to return the inherited value. If all else fails, it returns
- * the default value.
- * @param propertyName The name of the property whose value is desired.
- * @return the Property corresponding to that name
- */
-public Property get(String propertyName) {
return get(propertyName, true, true);
}
1.19 +14 -21xml-fop/src/java/org/apache/fop/fo/PropertyManager.java
Index: PropertyManager.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- PropertyManager.java 27 Dec 2003 22:00:38 - 1.18
+++ PropertyManager.java 4 Jan 2004 21:14:34 - 1.19
@@ -50,9 +50,6 @@
*/
package org.apache.fop.fo;
-// Java
-import java.text.MessageFormat;
-
// FOP
import org.apache.fop.fonts.Font;
import org.apache.fop.fo.properties.CommonBorderAndPadding;
@@ -83,16 +80,15 @@
private CommonHyphenation hyphProps = null;
private TextInfo textInfo = null;
-private static final String[] SA_BEFORE = new String[]{before};
-private static final String[] SA_AFTER = new String[]{after};
-private static final String[] SA_START = new String[]{start};
-private static final String[] SA_END = new String[]{end};
-
-private static final MessageFormat MSGFMT_COLOR = new
MessageFormat(border-{0}-color);
-private static final MessageFormat MSGFMT_STYLE = new
MessageFormat(border-{0}-style);
-private static final MessageFormat MSGFMT_WIDTH = new
MessageFormat(border-{0}-width);
-private static final MessageFormat MSGFMT_PADDING = new
MessageFormat(padding-{0});
-
+private static final int[] SA_BEFORE = new int[] {
+PR_BORDER_BEFORE_COLOR, PR_BORDER_BEFORE_STYLE, PR_BORDER_BEFORE_WIDTH,
PR_PADDING_BEFORE};
+private static final int[] SA_AFTER = new int[]{
+PR_BORDER_AFTER_COLOR, PR_BORDER_AFTER_STYLE, PR_BORDER_AFTER_WIDTH,
PR_PADDING_AFTER};
+private static final int[] SA_START = new int[]{
+PR_BORDER_START_COLOR, PR_BORDER_START_STYLE, PR_BORDER_START_WIDTH,
PR_PADDING_START};
+private static final int[] SA_END = new int[]{
+PR_BORDER_END_COLOR, PR_BORDER_END_STYLE, PR_BORDER_END_WIDTH,
PR_PADDING_END};
+
private static final String NONE = none;
/**
@@ -189,18 +185,15 @@
return borderAndPadding;
}
-private void initBorderInfo(int whichSide, String[] saSide) {
+private void initBorderInfo(int whichSide, int[] saSide) {
borderAndPadding.setPadding(whichSide,
-propertyList.get(
-
MSGFMT_PADDING.format(saSide)).getCondLength());
+propertyList.get(saSide[3]).getCondLength());
// If style = none, force width to 0, don't get Color (spec 7.7.20)
-int style = propertyList.get(MSGFMT_STYLE.format(saSide)).getEnum();
cvs commit: xml-fop/src/java/org/apache/fop/fo PropertyList.java
gmazza 2004/01/04 14:23:16
Modified:src/java/org/apache/fop/fo PropertyList.java
Log:
More string--int conversions.
Revision ChangesPath
1.17 +21 -19xml-fop/src/java/org/apache/fop/fo/PropertyList.java
Index: PropertyList.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyList.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PropertyList.java 4 Jan 2004 22:04:08 - 1.16
+++ PropertyList.java 4 Jan 2004 22:23:16 - 1.17
@@ -482,7 +482,9 @@
String basePropertyName = findBasePropertyName(attributeName);
String subPropertyName = findSubPropertyName(attributeName);
-propertyMaker = findMaker(namespace, elementName, basePropertyName);
+int propId = FOPropertyMapping.getPropertyId(basePropertyName);
+
+propertyMaker = findMaker(namespace, elementName, propId);
if (propertyMaker == null) {
handleInvalidProperty(attributeName);
return;
@@ -599,13 +601,11 @@
public Property getSubpropValue(String space, String element,
Property p, int propId) {
-String propertyName = FOPropertyMapping.getPropertyName(propId
-Constants.PROPERTY_MASK);
-
String subpropName = FOPropertyMapping.getPropertyName(propId
Constants.COMPOUND_MASK);
-Property.Maker maker = findMaker(space, element, propertyName);
+Property.Maker maker = findMaker(space, element, propId
+Constants.PROPERTY_MASK);
if (maker != null) {
return maker.getSubpropValue(p, subpropName);
} else {
@@ -619,10 +619,12 @@
* @param propertyName name of property
* @return value from the appropriate Property.Maker
*/
-public boolean isCorrespondingForced(String space, String element,
+private boolean isCorrespondingForced(String space, String element,
String propertyName) {
+int propId = FOPropertyMapping.getPropertyId(propertyName);
+
Property.Maker propertyMaker = findMaker(space, element,
- propertyName);
+ propId);
if (propertyMaker != null) {
return propertyMaker.isCorrespondingForced(this);
} else {
@@ -639,8 +641,10 @@
*/
public Property getShorthand(String space, String element,
String propertyName) {
+int propId = FOPropertyMapping.getPropertyId(propertyName);
+
Property.Maker propertyMaker = findMaker(space, element,
- propertyName);
+ propId);
if (propertyMaker != null) {
return propertyMaker.getShorthand(this);
} else {
@@ -659,11 +663,10 @@
public Property makeProperty(String space, String element,
int propId) throws FOPException {
-String propertyName = FOPropertyMapping.getPropertyName(propId);
Property p = null;
Property.Maker propertyMaker = findMaker(space, element,
- propertyName);
+ propId);
if (propertyMaker != null) {
p = propertyMaker.make(this);
} else {
@@ -683,9 +686,10 @@
public Property computeProperty(String space, String element,
String propertyName) {
+int propId = FOPropertyMapping.getPropertyId(propertyName);
Property p = null;
Property.Maker propertyMaker = findMaker(space, element,
- propertyName);
+ propId);
if (propertyMaker != null) {
try {
p = propertyMaker.compute(this);
@@ -713,8 +717,9 @@
String propertyName) {
boolean b;
+int propId = FOPropertyMapping.getPropertyId(propertyName);
Property.Maker propertyMaker = findMaker(space, element,
- propertyName);
+ propId);
if (propertyMaker != null) {
b = propertyMaker.isInherited();
} else {
@@ -727,19 +732,16 @@
/**
* @param space namespace of element
* @param elementName name of element
- * @param propertyName name of property
+ * @param propId Id of property
cvs commit: xml-fop/src/java/org/apache/fop/fo PropertyList.java
gmazza 2004/01/04 14:47:36
Modified:src/java/org/apache/fop/fo PropertyList.java
Log:
More String-Int conversion; also removed member variable passing (namespace,
element) within private functions. (Also made more methods private until external
use determined.)
Revision ChangesPath
1.18 +38 -79xml-fop/src/java/org/apache/fop/fo/PropertyList.java
Index: PropertyList.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyList.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- PropertyList.java 4 Jan 2004 22:23:16 - 1.17
+++ PropertyList.java 4 Jan 2004 22:47:36 - 1.18
@@ -197,7 +197,7 @@
p = getShorthand(namespace, elementName, baseName);
}
if (p != null sepchar -1) {
-return getSubpropValue(namespace, elementName, p, propId);
+return getSubpropValue(p, propId);
}
return p;
}
@@ -217,7 +217,7 @@
String baseName = propertyName.substring(0, sepchar);
Property p = getExplicitBaseProp(baseName);
if (p != null) {
-return getSubpropValue(namespace, elementName, p, propId);
+return getSubpropValue(p, propId);
} else {
return null;
}
@@ -245,12 +245,12 @@
int propId = FOPropertyMapping.getPropertyId(propertyName);
if (parentPropertyList != null
- isInherited(namespace, elementName, propertyName)) {
+ isInherited(propId)) {
return parentPropertyList.get(propId);
} else {
// return the initial value
try {
-return makeProperty(namespace, elementName, propId);
+return makeProperty(propId);
} catch (org.apache.fop.apps.FOPException e) {
//log.error(Exception in getInherited(): property=
// + propertyName + : + e);
@@ -284,8 +284,7 @@
bTryInherit);
if (p == null bTryDefault) {// default value for this FO!
try {
-p = makeProperty(namespace, elementName,
-propId Constants.PROPERTY_MASK);
+p = makeProperty(propId Constants.PROPERTY_MASK);
} catch (FOPException e) {
// don't know what to do here
}
@@ -300,8 +299,7 @@
}
if ((propId Constants.COMPOUND_MASK) != 0 p != null) {
-return getSubpropValue(namespace, elementName, p,
-propId);
+return getSubpropValue(p, propId);
} else {
return p;
}
@@ -313,19 +311,19 @@
* the inheritance priority (I think...)
* If the property is an absolute property and it isn't specified, then
* we try to compute it from the corresponding relative property: this
- * happends in computeProperty.
+ * happens in computeProperty.
*/
private Property findProperty(int propId, boolean bTryInherit) {
String propertyName = FOPropertyMapping.getPropertyName(propId);
Property p = null;
-if (isCorrespondingForced(namespace, elementName, propertyName)) {
-p = computeProperty(namespace, elementName, propertyName);
+if (isCorrespondingForced(propId)) {
+p = computeProperty(propId);
} else {
p = getExplicitBaseProp(propertyName);
if (p == null) {
-p = this.computeProperty(namespace, elementName, propertyName);
+p = this.computeProperty(propId);
}
if (p == null) {// check for shorthand specification
p = getShorthand(namespace, elementName, propertyName);
@@ -333,7 +331,7 @@
if (p == null bTryInherit) {
// else inherit (if has parent and is inheritable)
if (this.parentPropertyList != null
- isInherited(namespace, elementName, propertyName)) {
+ isInherited(propId)) {
p = parentPropertyList.findProperty(propId, true);
}
}
@@ -359,7 +357,7 @@
if (p == null) {
// If no explicit setting found, return initial (default) value.
try {
-p = makeProperty(namespace, elementName, propId);
+p = makeProperty(propId);
} catch (FOPException e) {
//log.error(Exception in getNearestSpecified(): property=
// +
cvs commit: xml-fop/src/java/org/apache/fop/render/rtf TableAttributesConverter.java
gmazza 2004/01/04 16:44:59
Modified:src/codegen properties.xsl
src/java/org/apache/fop/fo Property.java PropertyList.java
src/java/org/apache/fop/fo/expr LabelEndFunction.java
NearestSpecPropFunction.java
src/java/org/apache/fop/render/rtf
TableAttributesConverter.java
Log:
More String--int conversions. Work primarily from Finn Bock's patch.
Revision ChangesPath
1.26 +146 -22 xml-fop/src/codegen/properties.xsl
Index: properties.xsl
===
RCS file: /home/cvs/xml-fop/src/codegen/properties.xsl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- properties.xsl4 Jan 2004 05:42:03 - 1.25
+++ properties.xsl5 Jan 2004 00:44:59 - 1.26
@@ -563,9 +563,10 @@
return super.getSubpropMaker(subprop);
}
-protected Property setSubprop(Property baseProp, String subpropName,
+protected Property setSubprop(Property baseProp, int subpropId,
Property subProp) {
/xsl:text
+String subpropName = FOPropertyMapping.getPropertyName(subpropId);
xsl:value-of select=datatype/
xsl:text val = baseProp.get/xsl:text
xsl:value-of select=datatype/
@@ -769,14 +770,12 @@
xsl:if test=.//corresponding/@use-if-specified='true'
xsl:text
public boolean isCorrespondingForced(PropertyList propertyList) {
-FObj parentFO = propertyList.getParentFObj();
-StringBuffer sbExpr=new StringBuffer();/xsl:text
+FObj parentFO = propertyList.getParentFObj();/xsl:text
xsl:for-each select=.//corresponding/propval
xsl:text
-sbExpr.setLength(0);/xsl:text
+if (propertyList.getExplicit(/xsl:text
xsl:apply-templates select=./
-xsl:text
-if (propertyList.getExplicit(sbExpr.toString()) != null)
+xsl:text) != null)
return true;/xsl:text
/xsl:for-each
xsl:text
@@ -788,24 +787,26 @@
public Property compute(PropertyList propertyList) throws FOPException {
FObj parentFO = propertyList.getParentFObj();
-StringBuffer sbExpr=new StringBuffer();
Property p=null;/xsl:text
xsl:choose
xsl:when test=corresponding/propexpr
- xsl:apply-templates select=corresponding/propval/
xsl:text
// Make sure the property is set before calculating it!
-if (propertyList.getExplicitOrShorthand(sbExpr.toString()) == null)
+if (propertyList.getExplicitOrShorthand(/xsl:text
+ xsl:apply-templates select=corresponding/propval/
+ xsl:text) == null)
return p;
+StringBuffer sbExpr=new StringBuffer();
sbExpr.setLength(0);/xsl:text
xsl:apply-templates select=corresponding/propexpr/
xsl:text
p = make(propertyList, sbExpr.toString(),
propertyList.getParentFObj());/xsl:text
/xsl:when
xsl:otherwise
- xsl:apply-templates select=corresponding/propval/
xsl:text
-p= propertyList.getExplicitOrShorthand(sbExpr.toString());/xsl:text
+p= propertyList.getExplicitOrShorthand(/xsl:text
+ xsl:apply-templates select=corresponding/propval/
+ xsl:text);/xsl:text
/xsl:otherwise
/xsl:choose
xsl:text
@@ -818,8 +819,6 @@
Property subprop;/xsl:text
xsl:for-each select=compound/subproperty/corresponding
- xsl:text
-sbExpr.setLength(0);/xsl:text
xsl:choose
xsl:when test=propexpr
xsl:apply-templates select=propexpr/
@@ -830,16 +829,19 @@
make(propertyList, sbExpr.toString(), parentFO);/xsl:text
/xsl:when
xsl:otherwise
-xsl:apply-templates select=propval/
xsl:text
-subprop = propertyList.getExplicitOrShorthand(sbExpr.toString());/xsl:text
+subprop = propertyList.getExplicitOrShorthand(/xsl:text
+ xsl:apply-templates select=propval/
+ xsl:text);/xsl:text
/xsl:otherwise
/xsl:choose
xsl:text
if (subprop != null) {
-setSubprop(p, /xsl:text
-xsl:value-of select='../name'/
-xsl:text, subprop);
+setSubprop(p, Constants.CP_/xsl:text
+xsl:call-template name=makeEnumConstant
+ xsl:with-param name=propstr select=../name/
+/xsl:call-template
+xsl:text, subprop);
}/xsl:text
/xsl:for-each
/xsl:if
@@ -860,9 +862,11 @@
xsl:text
if (p == null) {
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination RegionBody.java
gmazza 2004/01/04 17:31:09
Modified:src/java/org/apache/fop/datatypes LengthBase.java
src/java/org/apache/fop/fo PropertyList.java
src/java/org/apache/fop/fo/expr InheritedPropFunction.java
src/java/org/apache/fop/fo/pagination RegionBody.java
Log:
More String-Int Conversions.
Revision ChangesPath
1.5 +1 -1 xml-fop/src/java/org/apache/fop/datatypes/LengthBase.java
Index: LengthBase.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/LengthBase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LengthBase.java 29 Dec 2003 23:28:47 - 1.4
+++ LengthBase.java 5 Jan 2004 01:31:09 - 1.5
@@ -142,7 +142,7 @@
case FONTSIZE:
return propertyList.get(Constants.PR_FONT_SIZE).getLength().getValue();
case INH_FONTSIZE:
-return propertyList.getInherited(font-size).getLength().getValue();
+return
propertyList.getInherited(Constants.PR_FONT_SIZE).getLength().getValue();
//case CONTAINING_BOX:
// depends on property?? inline-progression vs block-progression
//return parentFO.getContentWidth();
1.20 +20 -34xml-fop/src/java/org/apache/fop/fo/PropertyList.java
Index: PropertyList.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyList.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PropertyList.java 5 Jan 2004 00:44:59 - 1.19
+++ PropertyList.java 5 Jan 2004 01:31:09 - 1.20
@@ -184,20 +184,11 @@
*/
public Property getExplicitOrShorthand(int propId) {
/* Handle request for one part of a compound property */
-String propertyName = FOPropertyMapping.getPropertyName(propId);
-
-int sepchar = propertyName.indexOf('.');
-String baseName;
-if (sepchar -1) {
-baseName = propertyName.substring(0, sepchar);
-} else {
-baseName = propertyName;
-}
-Property p = getExplicitBaseProp(baseName);
+Property p = getExplicitBaseProp(propId Constants.PROPERTY_MASK);
if (p == null) {
p = getShorthand(propId Constants.PROPERTY_MASK);
}
-if (p != null sepchar -1) {
+if (p != null (propId Constants.PROPERTY_MASK) != 0) {
return getSubpropValue(p, propId);
}
return p;
@@ -213,10 +204,8 @@
String propertyName = FOPropertyMapping.getPropertyName(propId);
/* Handle request for one part of a compound property */
-int sepchar = propertyName.indexOf('.');
-if (sepchar -1) {
-String baseName = propertyName.substring(0, sepchar);
-Property p = getExplicitBaseProp(baseName);
+if ((propId Constants.COMPOUND_MASK) != 0) {
+Property p = getExplicitBaseProp(propId Constants.PROPERTY_MASK);
if (p != null) {
return getSubpropValue(p, propId);
} else {
@@ -231,7 +220,8 @@
* @param propertyName The name of the base property whose value is desired.
* @return The value if the property is explicitly set, otherwise null.
*/
-public Property getExplicitBaseProp(String propertyName) {
+public Property getExplicitBaseProp(int propId) {
+String propertyName = FOPropertyMapping.getPropertyName(propId);
return (Property) super.get(propertyName);
}
@@ -239,11 +229,10 @@
* Return the value of this property inherited by this FO.
* Implements the inherited-property-value function.
* The property must be inheritable!
- * @param propertyName The name of the property whose value is desired.
+ * @param propID The ID of the property whose value is desired.
* @return The inherited value, otherwise null.
*/
-public Property getInherited(String propertyName) {
-int propId = FOPropertyMapping.getPropertyId(propertyName);
+public Property getInherited(int propId) {
if (parentPropertyList != null
isInherited(propId)) {
@@ -315,14 +304,12 @@
* happens in computeProperty.
*/
private Property findProperty(int propId, boolean bTryInherit) {
-
-String propertyName = FOPropertyMapping.getPropertyName(propId);
-
Property p = null;
+
if (isCorrespondingForced(propId)) {
p = computeProperty(propId);
} else {
-p = getExplicitBaseProp(propertyName);
+p = getExplicitBaseProp(propId);
if (p == null) {
cvs commit: xml-fop/src/java/org/apache/fop/datastructs Node.java
pbwest 2004/01/04 17:45:32
Modified:src/java/org/apache/fop/datastructs Tag:
FOP_0-20-0_Alt-Design Node.java
Log:
Made children protected.
Removed redundant casts flagged by Eclipse.
Revision ChangesPath
No revision
No revision
1.1.2.2 +9 -9 xml-fop/src/java/org/apache/fop/datastructs/Attic/Node.java
Index: Node.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datastructs/Attic/Node.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Node.java 5 Jul 2003 19:06:35 - 1.1.2.1
+++ Node.java 5 Jan 2004 01:45:32 - 1.1.2.2
@@ -97,7 +97,7 @@
protected Tree tree;
protected Node parent;
-private ArrayList children; // ArrayList of Node
+protected ArrayList children; // ArrayList of Node
/** Creation size of the ichildren/i ttArrayList/tt. */
private static final int FAMILYSIZE = 4;
@@ -199,7 +199,7 @@
synchronized (tree) {
if (children == null)
children = new ArrayList(FAMILYSIZE);
-children.add((Object) child);
+children.add(child);
tree.modified();
}
}
@@ -221,7 +221,7 @@
synchronized (tree) {
if (children == null)
children = new ArrayList(FAMILYSIZE);
-children.add(index, (Object) child);
+children.add(index, child);
tree.modified();
}
}
@@ -418,7 +418,7 @@
public Node removeChild(Node child)
throws NoSuchElementException {
synchronized (tree) {
-int index = children.indexOf((Object) child);
+int index = children.indexOf(child);
if (index == -1) {
throw new NoSuchElementException();
}
@@ -531,7 +531,7 @@
* @return the parent ttNode/tt.
*/
public Node getParent() {
-return (Node) parent;
+return parent;
}
/**
@@ -956,7 +956,7 @@
// Not the root node; siblings may exist
// Set up iterator on the parent's children ArrayList
ArrayList siblings = refNode.children;
-int index = siblings.indexOf((Object) Node.this);
+int index = siblings.indexOf(Node.this);
// if this is invalid, we are in serious trouble
listIterator = siblings.listIterator(index + 1);
} // end of if (Node.this.parent != null)
@@ -1068,7 +1068,7 @@
// Not the root node; siblings may exist
// Set up iterator on the parent's children ArrayList
ArrayList siblings = refNode.children;
-int index = siblings.indexOf((Object) Node.this);
+int index = siblings.indexOf(Node.this);
// if this is invalid, we are in serious trouble
listIterator = siblings.listIterator(index);
} // end of if (Node.this.parent != null)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/datastructs ROIntArray.java
pbwest 2004/01/04 17:49:50
Modified:src/java/org/apache/fop/datastructs Tag:
FOP_0-20-0_Alt-Design ROIntArray.java
Log:
Added copyarray method.
Added javadoc comment on class.
Revision ChangesPath
No revision
No revision
1.1.2.2 +17 -6
xml-fop/src/java/org/apache/fop/datastructs/Attic/ROIntArray.java
Index: ROIntArray.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/datastructs/Attic/ROIntArray.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ROIntArray.java 5 Jul 2003 19:06:35 - 1.1.2.1
+++ ROIntArray.java 5 Jan 2004 01:49:50 - 1.1.2.2
@@ -1,7 +1,4 @@
-/**
- * Provides a Read-Only ttint/tt array.
- *
- *
+/*
*
* The Apache Software License, Version 1.1
*
@@ -56,6 +53,11 @@
// $Id$
package org.apache.fop.datastructs;
+/**
+ * Provides a Read-Only ttint/tt array.
+ *
+ * @author pbw
+ */
public class ROIntArray {
private int[] iarray;
@@ -103,5 +105,14 @@
*/
public int get(int index) {
return iarray[index];
+}
+
+/**
+ * @return a copy of the array
+ */
+public int[] copyarray() {
+int[] tmp = null;
+System.arraycopy(iarray, 0, tmp, 0, iarray.length);
+return tmp;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/datastructs ROBitSet.java SyncedCircularBuffer.java
pbwest 2004/01/04 18:01:38
Modified:src/java/org/apache/fop/datastructs Tag:
FOP_0-20-0_Alt-Design ROBitSet.java
SyncedCircularBuffer.java
Log:
Javadoc cleanup flagged by Eclipse
Revision ChangesPath
No revision
No revision
1.1.2.2 +15 -15xml-fop/src/java/org/apache/fop/datastructs/Attic/ROBitSet.java
Index: ROBitSet.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datastructs/Attic/ROBitSet.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ROBitSet.java 5 Jul 2003 19:06:35 - 1.1.2.1
+++ ROBitSet.java 5 Jan 2004 02:01:38 - 1.1.2.2
@@ -77,7 +77,7 @@
/**
* Unsupported operation. Overrides ttBitSet/tt method.
* @param set ttBitSet/tt
- * @exception ttUnsupportedOperationException/tt
+ * @exception UnsupportedOperationException
*/
public void and(BitSet set) {
throw new UnsupportedOperationException(and invalid in ROBitSet);
@@ -86,7 +86,7 @@
/**
* Unsupported operation. Overrides ttBitSet/tt method.
* @param set ttBitSet/tt
- * @exception ttUnsupportedOperationException/tt
+ * @exception UnsupportedOperationException
*/
public void andNot(BitSet set) {
throw new UnsupportedOperationException(andNot invalid in ROBitSet);
@@ -94,7 +94,7 @@
/**
* Unsupported operation. Overrides ttBitSet/tt method.
- * @exception ttUnsupportedOperationException/tt
+ * @exception UnsupportedOperationException
*/
public void clear() {
throw new UnsupportedOperationException(clear invalid in ROBitSet);
@@ -103,7 +103,7 @@
/**
* Unsupported operation. Overrides ttBitSet/tt method.
* @param bitIndex ttint/tt
- * @exception ttUnsupportedOperationException/tt
+ * @exception UnsupportedOperationException
*/
public void clear(int bitIndex) {
throw new UnsupportedOperationException(clear invalid in ROBitSet);
@@ -113,7 +113,7 @@
* Unsupported operation. Overrides ttBitSet/tt method.
* @param fromIndex ttint/tt
* @param toIndex ttint/tt
- * @exception ttUnsupportedOperationException/tt
+ * @exception UnsupportedOperationException
*/
public void clear(int fromIndex, int toIndex) {
throw new UnsupportedOperationException(clear invalid in ROBitSet);
@@ -122,7 +122,7 @@
/**
* Unsupported operation. Overrides ttBitSet/tt method.
* @param bitIndex ttint/tt
- * @exception ttUnsupportedOperationException/tt
+ * @exception UnsupportedOperationException
*/
public void flip(int bitIndex) {
throw new UnsupportedOperationException(flip invalid in ROBitSet);
@@ -132,7 +132,7 @@
* Unsupported operation. Overrides ttBitSet/tt method.
* @param fromIndex ttint/tt
* @param toIndex ttint/tt
- * @exception ttUnsupportedOperationException/tt
+ * @exception UnsupportedOperationException
*/
public void flip(int fromIndex, int toIndex) {
throw new UnsupportedOperationException(flip invalid in ROBitSet);
@@ -141,7 +141,7 @@
/**
* Unsupported operation. Overrides ttBitSet/tt method.
* @param set ttBitSet/tt
- * @exception ttUnsupportedOperationException/tt
+ * @exception UnsupportedOperationException
*/
public void or(BitSet set) {
throw new UnsupportedOperationException(or invalid in ROBitSet);
@@ -150,7 +150,7 @@
/**
* Unsupported operation. Overrides ttBitSet/tt method.
* @param bitIndex ttint/tt
- * @exception ttUnsupportedOperationException/tt
+ * @exception UnsupportedOperationException
*/
public void set(int bitIndex) {
throw new UnsupportedOperationException(set invalid in ROBitSet);
@@ -160,7 +160,7 @@
* Unsupported operation. Overrides ttBitSet/tt method.
* @param bitIndex ttint/tt
* @param value ttboolean/tt
- * @exception ttUnsupportedOperationException/tt
+ * @exception UnsupportedOperationException
*/
public void set(int bitIndex, boolean value) {
throw new UnsupportedOperationException(set invalid in ROBitSet);
@@ -170,7 +170,7 @@
* Unsupported operation. Overrides ttBitSet/tt method.
* @param fromIndex ttint/tt
* @param toIndex ttint/tt
- * @exception ttUnsupportedOperationException/tt
+ * @exception UnsupportedOperationException
*/
public void set(int fromIndex, int toIndex) {
throw new UnsupportedOperationException(set invalid in ROBitSet);
@@ -181,7 +181,7 @@
* @param
cvs commit: xml-fop/src/java/org/apache/fop/datatypes FontFamilySet.java
pbwest 2004/01/04 18:08:15
Modified:src/java/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
FontFamilySet.java
Log:
Made fontFamilyNames protected.
Javadoc fixes.
Flagged by Eclipse.
Revision ChangesPath
No revision
No revision
1.1.2.2 +9 -9
xml-fop/src/java/org/apache/fop/datatypes/Attic/FontFamilySet.java
Index: FontFamilySet.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/datatypes/Attic/FontFamilySet.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FontFamilySet.java5 Jul 2003 19:08:19 - 1.1.2.1
+++ FontFamilySet.java5 Jan 2004 02:08:15 - 1.1.2.2
@@ -77,15 +77,15 @@
* An array of ttString/tts containing a prioritized list of
* font family or generic font family names.
*/
-private String[] fontFamilyNames;
+protected final String[] fontFamilyNames;
/**
* @param property ttint/tt index of the property.
- * @param fontNames an array of ttString/tts containing a
+ * @param fontFamilyNames contains a
* prioritized list of font names, as literals or ttNCName/tts,
* being either the full name of a font, or an enumeration token
* representing a font family.
- * @exception PropertyException.
+ * @exception PropertyException
*/
public FontFamilySet(int property, String[] fontFamilyNames)
throws PropertyException
@@ -96,11 +96,11 @@
/**
* @param propertyName ttString/tt name of the property.
- * @param fontNames an array of ttString/tts containing a
+ * @param fontFamilyNames contains a
* prioritized list of font names, as literals or ttNCName/tts,
* being either the full name of a font, or an enumeration token
* representing a font family.
- * @exception PropertyException.
+ * @exception PropertyException
*/
public FontFamilySet(String propertyName, String[] fontFamilyNames)
throws PropertyException
@@ -132,7 +132,7 @@
}
public Object next() {
-if (hasNext()) return (Object)fontFamilyNames[index++];
+if (hasNext()) return fontFamilyNames[index++];
throw new NoSuchElementException();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/datatypes ColorType.java
pbwest 2004/01/04 18:15:03
Modified:src/java/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
ColorType.java
Log:
Removed spurious exception in throws clause.
Javadocs cleanup.
Revision ChangesPath
No revision
No revision
1.2.2.2 +5 -7 xml-fop/src/java/org/apache/fop/datatypes/ColorType.java
Index: ColorType.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/ColorType.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- ColorType.java5 Jul 2003 19:08:19 - 1.2.2.1
+++ ColorType.java5 Jan 2004 02:15:03 - 1.2.2.2
@@ -301,9 +301,7 @@
* @return a ttfloat[4]/tt containing the RGB information for
* that color.
*/
-public static float[] getStandardColor(String name)
-throws PropertyException
-{
+public static float[] getStandardColor(String name) {
return (float[])standardColors.get(name);
}
@@ -327,8 +325,8 @@
/**
* A ttHashMap/tt containing four-element arrays of ttfloat/tt
* with the normalized RGB values of standard colours, indexed by the
- * name of the color.
- * @return a ttfloat[4]/tt array representing the normalized color.
+ * name of the color. Individual values are ttfloat[4]/tt arrays
+ * representing the normalized color.
*/
private static final HashMap standardColors;
static {
@@ -372,8 +370,8 @@
* with the normalized RGB values of system colours, indexed by the
* system name of the color. This array is referred to when system color
* references are encountered. If the color is in the HashMap,
- * a reference to the array is returned.
- * @return a ttfloat[4]/tt array representing the normalized color.
+ * a reference to the array is returned. Individual values are
+ * ttfloat[4]/tt arrays representing the normalized color.
*/
private static final HashMap systemColors;
static {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/datatypes Numeric.java
pbwest 2004/01/04 18:17:29
Modified:src/java/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
Numeric.java
Log:
Removed redundant casts. Javadoc cleanup.
Flagged by Eclipse.
Revision ChangesPath
No revision
No revision
1.1.2.2 +6 -6 xml-fop/src/java/org/apache/fop/datatypes/Attic/Numeric.java
Index: Numeric.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/Attic/Numeric.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Numeric.java 5 Jul 2003 19:08:19 - 1.1.2.1
+++ Numeric.java 5 Jan 2004 02:17:29 - 1.1.2.2
@@ -411,7 +411,7 @@
* rounded value is equal to the value.
*/
public boolean isInteger() {
-return (isNumber() (double)(Math.round(value)) == value);
+return (isNumber() (Math.round(value)) == value);
}
/**
@@ -494,7 +494,7 @@
* @param fontSize a ttNumeric/tt containing the reference
* ifont-size/i length
* @return ithis/i, with values changed to reflect the conversion
- * @exception ttPropertyException/tt
+ * @exception PropertyException
*/
public Numeric expandEms(Numeric fontSize) throws PropertyException {
if (baseunit == EMS) {
@@ -513,7 +513,7 @@
/**
* @param ref a ttNumeric/tt containing the reference length
* @return ithis/i, with values changed to reflect the conversion
- * @exception ttPropertyException/tt
+ * @exception PropertyException
*/
public Numeric expandPercent(Numeric ref) throws PropertyException {
if (baseunit == PERCENTAGE) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/datatypes Frequency.java PropertyValueList.java TextDecorations.java Ems.java Time.java Angle.java
pbwest 2004/01/04 18:18:36
Modified:src/java/org/apache/fop/datatypes Tag: FOP_0-20-0_Alt-Design
Frequency.java PropertyValueList.java
TextDecorations.java Ems.java Time.java Angle.java
Log:
Javadoc cleanup flagged by Eclipse
Revision ChangesPath
No revision
No revision
1.1.2.2 +5 -5 xml-fop/src/java/org/apache/fop/datatypes/Attic/Frequency.java
Index: Frequency.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/Attic/Frequency.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Frequency.java5 Jul 2003 19:08:19 - 1.1.2.1
+++ Frequency.java5 Jan 2004 02:18:36 - 1.1.2.2
@@ -124,7 +124,7 @@
}
/**
- * @param ttint/tt unit as per constants defined in this class
+ * @param unit type of unit as per constants defined in this class
* @return ttdouble/tt frequency value
*/
public double getFrequency(int unit) {
@@ -132,8 +132,8 @@
}
/**
- * @param ttint/tt unit as per constants defined in this class
- * @param ttdouble/tt frequency in specified units
+ * @param unit type of unit as per constants defined in this class
+ * @param value frequency in specified units
*/
public void setFrequency(int unit, double value) {
units = unit;
@@ -141,7 +141,7 @@
}
/**
- * @param ttdouble/tt frequency in hertz
+ * @param frequency in hertz
*/
public void setFrequency(double frequency) {
units = HZ;
1.1.2.2 +2 -3
xml-fop/src/java/org/apache/fop/datatypes/Attic/PropertyValueList.java
Index: PropertyValueList.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/datatypes/Attic/PropertyValueList.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PropertyValueList.java5 Jul 2003 19:08:19 - 1.1.2.1
+++ PropertyValueList.java5 Jan 2004 02:18:36 - 1.1.2.2
@@ -199,7 +199,6 @@
* Append a PropertyValue to the end of the list.
* @param o a ttPropertyValue/tt; the element to add. Defined as an
* ttObject/tt to override the definition in ttLinkedList/tt.
- * @return a ttboolean/tt success or failure(?).
* @exception IllegalArgumentException if the object is not a
* ttPropertyValue/tt.
*/
1.1.2.2 +5 -5
xml-fop/src/java/org/apache/fop/datatypes/Attic/TextDecorations.java
Index: TextDecorations.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/datatypes/Attic/TextDecorations.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TextDecorations.java 5 Jul 2003 19:08:19 - 1.1.2.1
+++ TextDecorations.java 5 Jan 2004 02:18:36 - 1.1.2.2
@@ -123,7 +123,7 @@
/**
* Set the color associated with this set of decorations.
- * @param the color.
+ * @param color the color.
*/
public void setColor(ColorType color) {
this.color = color;
@@ -132,7 +132,7 @@
/**
* Apply the decoration masks of a ttTextDecorator/tt object to
* these decorations.
- * @param the ttTextDecorator/tt.
+ * @param decorator the ttTextDecorator/tt.
*/
public byte maskDecorations(TextDecorator decorator) {
decorations |= decorator.onMask;
1.1.2.2 +3 -4 xml-fop/src/java/org/apache/fop/datatypes/Attic/Ems.java
Index: Ems.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/Attic/Ems.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Ems.java 5 Jul 2003 19:08:18 - 1.1.2.1
+++ Ems.java 5 Jan 2004 02:18:36 - 1.1.2.2
@@ -105,7 +105,6 @@
* @param node - the ttFONode/tt with reference to which this
* iEM/i value is being consructed. A null value imples the
* construction of an iinitial value/i.
- * @param property the index of the property with which this value
* @param propertyName the name of the property with which this value
* is associated.
* @param value the number of units.
1.1.2.2 +7 -7 xml-fop/src/java/org/apache/fop/datatypes/Attic/Time.java
Index: Time.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/Attic/Time.java,v
cvs commit: xml-fop/src/java/org/apache/fop/datatypes/indirect IndirectValue.java
pbwest 2004/01/04 18:20:41
Modified:src/java/org/apache/fop/datatypes/indirect Tag:
FOP_0-20-0_Alt-Design IndirectValue.java
Log:
Removed spurious exception in throws clause.
Revision ChangesPath
No revision
No revision
1.1.2.2 +4 -6
xml-fop/src/java/org/apache/fop/datatypes/indirect/Attic/IndirectValue.java
Index: IndirectValue.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/datatypes/indirect/Attic/IndirectValue.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- IndirectValue.java5 Jul 2003 19:08:20 - 1.1.2.1
+++ IndirectValue.java5 Jan 2004 02:20:41 - 1.1.2.2
@@ -218,9 +218,7 @@
return pv;
}
-public static boolean isUnresolved(PropertyValue value)
-throws PropertyException
-{
+public static boolean isUnresolved(PropertyValue value) {
return (value.getType() == PropertyValue.NUMERIC
((Numeric)(value)).isPercentage());
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/configuration Configuration.java
pbwest 2004/01/04 18:21:37 Modified:src/java/org/apache/fop/configuration Tag: FOP_0-20-0_Alt-Design Configuration.java Log: Javadoc cleanup flagged by Eclipse Revision ChangesPath No revision No revision 1.1.2.3 +1 -2 xml-fop/src/java/org/apache/fop/configuration/Attic/Configuration.java Index: Configuration.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/configuration/Attic/Configuration.java,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- Configuration.java21 Dec 2003 01:38:52 - 1.1.2.2 +++ Configuration.java5 Jan 2004 02:21:37 - 1.1.2.3 @@ -324,7 +324,6 @@ /** * method to access fonts values in the standard configuration * - * @param key a string containing the key for the configuration value * @return HashMap a HashMap containing the values * null if the key is not defined. */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps Driver.java
pbwest 2004/01/04 18:24:05
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Driver.java
Log:
Removed unused setParserFeatures.
Removed redundant throws exception clause.
Revision ChangesPath
No revision
No revision
1.9.2.4 +5 -5 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -r1.9.2.3 -r1.9.2.4
--- Driver.java 28 Dec 2003 04:16:00 - 1.9.2.3
+++ Driver.java 5 Jan 2004 02:24:04 - 1.9.2.4
@@ -95,7 +95,7 @@
/**
* Error handling, version and logging initialization.
*/
-public Driver() throws FOPException {
+public Driver() {
_errorDump =
Configuration.getBooleanValue(debugMode).booleanValue();
String version = Version.getVersion();
@@ -135,7 +135,8 @@
setInputHandler(Options.getInputHandler());
parser = inputHandler.getParser();
source = inputHandler.getInputSource();
-setParserFeatures(parser);
+// Setting of namespace-prefixes feature no longer required
+//setParserFeatures(parser);
xmlevents = new SyncedFoXmlEventsBuffer();
xmlhandler = new FoXMLSerialHandler(xmlevents, parser, source);
@@ -197,11 +198,10 @@
* @param parser the XMLReader used to parse the input
* @throws FOPException
*/
+/*
public void setParserFeatures(XMLReader parser) throws FOPException {
-/*
- Setting of namespaces-prefixes feature removed.
-*/
}
+*/
/**
* Prints stack trace of an exception
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps Options.java
pbwest 2004/01/04 18:26:54
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
Options.java
Log:
Removed spurious exception in throws clause.
Javadocs cleanup.
Revision ChangesPath
No revision
No revision
1.1.2.4 +7 -10 xml-fop/src/java/org/apache/fop/apps/Attic/Options.java
Index: Options.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Attic/Options.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Options.java 31 Dec 2003 04:28:27 - 1.1.2.3
+++ Options.java 5 Jan 2004 02:26:54 - 1.1.2.4
@@ -272,7 +272,7 @@
*
* It remains for any related variables defined in this class to be set.
*
- * @exception org.apache.fop.fo.FOPException
+ * @exception FOPException
*/
static void initOptions() throws FOPException {
Boolean bool = null;
@@ -339,7 +339,7 @@
* Load the standard configuration file and the user-defined configuration
* file if one has been defined. The definition can occur in either the
* standard file or as a command line argument.
- * @exception org.apache.fop.fo.FOPException
+ * @exception FOPException
*/
private static void loadConfigFiles() throws FOPException {
String str = null;
@@ -362,7 +362,7 @@
* Convenience class for common functionality required by the config
* files.
* @param fname the configuration file name.
- * @param classobj the ttClass/tt object of requesting class.
+ * @param classob the requesting class
* @return an ttInputStream/tt generated through a call to
* ttgetResourceAsStream/tt on the context ttClassLoader/tt
* or the ttClassLoader/tt for the conf class provided as an argument.
@@ -402,7 +402,7 @@
* class loader are asked in turn to codegetResourceAsStream/code
* on ifname/i from a directory called iconf/i.
* @param fname the name of the configuration file to load.
- * @exception org.apache.fop.fo.FOPException if the configuration file
+ * @exception FOPException if the configuration file
* cannot be discovered.
*/
public static void loadConfiguration(String fname)
@@ -430,11 +430,8 @@
* source. If this fails, an attempt is made to load the file using
* codeloadConfiguration/code.
* @param userConfigFileName the name of the user configuration file.
- * @exception org.apache.fop.fo.FOPException thrown when the file cannot
- * be located.
*/
-public static void loadUserConfiguration(String userConfigFileName)
-throws FOPException {
+public static void loadUserConfiguration(String userConfigFileName) {
// read user configuration file
boolean readOk = true;
userConfigFile = new File(userConfigFileName);
@@ -687,7 +684,7 @@
}
}
-public static CommandLineStarter getStarter() throws FOPException {
+public static CommandLineStarter getStarter() {
switch (outputmode) {
default:
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/apps CommandLineStarter.java
pbwest 2004/01/04 18:27:33
Modified:src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
CommandLineStarter.java
Log:
Removed spurious exception in throws clause.
Javadocs cleanup.
Revision ChangesPath
No revision
No revision
1.3.2.3 +1 -3
xml-fop/src/java/org/apache/fop/apps/Attic/CommandLineStarter.java
Index: CommandLineStarter.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/apps/Attic/CommandLineStarter.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- CommandLineStarter.java 10 Jul 2003 11:26:28 - 1.3.2.2
+++ CommandLineStarter.java 5 Jan 2004 02:27:33 - 1.3.2.3
@@ -60,10 +60,8 @@
/**
* Empty constructor.
- *
- * @throws FOPException
*/
-public CommandLineStarter() throws FOPException {
+public CommandLineStarter() {
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/xml XMLEvent.java SyncedFoXmlEventsBuffer.java
pbwest 2004/01/04 18:29:50
Modified:src/java/org/apache/fop/xml Tag: FOP_0-20-0_Alt-Design
XMLEvent.java SyncedFoXmlEventsBuffer.java
Log:
Javadoc cleanup flagged by Eclipse
Revision ChangesPath
No revision
No revision
1.1.2.2 +5 -5 xml-fop/src/java/org/apache/fop/xml/Attic/XMLEvent.java
Index: XMLEvent.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/XMLEvent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- XMLEvent.java 5 Jul 2003 19:12:36 - 1.1.2.1
+++ XMLEvent.java 5 Jan 2004 02:29:50 - 1.1.2.2
@@ -269,7 +269,7 @@
/**
* Set the ttAttributesImpl/tt object associated with this event.
- * @param the ttAttributesImpl/tt object.
+ * @param attributes the attributes
*/
public void setAttributes(AttributesImpl attributes) {
this.attributes = attributes;
@@ -277,7 +277,7 @@
/**
* Set the ttXMLNamespaces/tt object associated with this event.
- * @param the ttXMLNamespaces/tt object.
+ * @param namespaces the XMLNamespaces
*/
public void setNamespaces(XMLNamespaces namespaces) {
this.namespaces = namespaces;
1.1.2.2 +5 -6
xml-fop/src/java/org/apache/fop/xml/Attic/SyncedFoXmlEventsBuffer.java
Index: SyncedFoXmlEventsBuffer.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/xml/Attic/SyncedFoXmlEventsBuffer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SyncedFoXmlEventsBuffer.java 5 Jul 2003 19:12:36 - 1.1.2.1
+++ SyncedFoXmlEventsBuffer.java 5 Jan 2004 02:29:50 - 1.1.2.2
@@ -129,9 +129,9 @@
/**
* @return next event from the SyncedCircularBuffer
- * @exception FOPException. The purpose of this method is to catch
- * and transform any InterruptedException exceptions thrown by the
- * ttSyncedCircularBuffer/tt.
+ * @exception FOPException exception into which
+ * any InterruptedException exceptions thrown by the
+ * ttSyncedCircularBuffer/tt are transformed
*/
public FoXMLEvent getEvent() throws FOPException {
FoXMLEvent ev;
@@ -1037,7 +1037,6 @@
* @exception FOPException if buffer errors or interrupts occur
* @exception NoSuchElementException if ENDELEMENT is not the next
* event detected. The erroneous event is pushed back.
- * @exception NoSuchElementException if end of buffer detected.
*/
public FoXMLEvent expectEndElement(boolean discardWhiteSpace)
throws FOPException
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/tools DocumentReader.java
pbwest 2004/01/04 18:31:04
Modified:src/java/org/apache/fop/tools Tag: FOP_0-20-0_Alt-Design
DocumentReader.java
Log:
Removed spurious exception in throws clause.
Javadocs cleanup.
Revision ChangesPath
No revision
No revision
1.1.2.2 +30 -63xml-fop/src/java/org/apache/fop/tools/DocumentReader.java
Index: DocumentReader.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/DocumentReader.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- DocumentReader.java 5 Jul 2003 19:11:22 - 1.1.2.1
+++ DocumentReader.java 5 Jan 2004 02:31:04 - 1.1.2.2
@@ -52,8 +52,6 @@
package org.apache.fop.tools;
-import java.io.IOException;
-
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@@ -65,7 +63,6 @@
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;
@@ -132,17 +129,13 @@
* pImplementors are free (and encouraged) to invent their own features,
* using names built on their own URIs./p
*
- * @param name The feature name, which is a fully-qualified URI.
- * @return The current state of the feature (true or false).
- * @exception org.xml.sax.SAXNotRecognizedException When the
- * XMLReader does not recognize the feature name.
- * @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the feature name but
- * cannot determine its value at this time.
- * @see #setFeature
+ * @param name of the feature, which is a fully-qualified URI
+ * @return the current state of the feature (true or false)
+ * @exception org.xml.sax.SAXNotRecognizedException thrown when the
+ * XMLReader does not recognize the feature name
*/
public boolean getFeature(String name)
-throws SAXNotRecognizedException, SAXNotSupportedException {
+throws SAXNotRecognizedException {
if (http://xml.org/sax/features/namespaces.equals(name)) {
return _namespaces;
} else if (http://xml.org/sax/features/namespace-prefixes.equals(name)) {
@@ -174,24 +167,21 @@
* in specific contexts, such as before, during, or after
* a parse./p
*
- * @param name The feature name, which is a fully-qualified URI.
- * @param state The requested state of the feature (true or false).
- * @exception org.xml.sax.SAXNotRecognizedException When the
- * XMLReader does not recognize the feature name.
- * @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the feature name but
- * cannot set the requested value.
- * @see #getFeature
+ * @param name of the feature, which is a fully-qualified URI
+ * @param value of the requested state of the feature (true or false)
+ * @exception org.xml.sax.SAXNotRecognizedException thrown when the
+ * XMLReader does not recognize the feature name
*/
public void setFeature(String name, boolean value)
-throws SAXNotRecognizedException, SAXNotSupportedException {
+throws SAXNotRecognizedException {
if (http://xml.org/sax/features/namespaces.equals(name)) {
_namespaces = value;
-} else if (http://xml.org/sax/features/namespace-prefixes.equals(name)) {
+} else
+if (http://xml.org/sax/features/namespace-prefixes.equals(name)) {
_namespace_prefixes = value;
} else {
throw new SAXNotRecognizedException(Feature ' + name
-+ ' not recognized or supported by
Document2SAXAdapter);
+ + ' not recognized or supported by Document2SAXAdapter);
}
}
@@ -217,19 +207,15 @@
* pImplementors are free (and encouraged) to invent their own properties,
* using names built on their own URIs./p
*
- * @param name The property name, which is a fully-qualified URI.
- * @return The current value of the property.
- * @exception org.xml.sax.SAXNotRecognizedException When the
- * XMLReader does not recognize the property name.
- * @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the property name but
- * cannot determine its value at this time.
- * @see #setProperty
+ * @param name of the property, which is a fully-qualified URI
+ * @return the current value of the property
+ *
cvs commit: xml-fop/src/codegen xml-lang.xsl
pbwest 2004/01/04 18:34:23
Modified:src/codegen/org/apache/fop/datatypes Tag:
FOP_0-20-0_Alt-Design CountryLanguageScript.java
src/codegen Tag: FOP_0-20-0_Alt-Design xml-lang.xsl
Log:
Fixed href links in Javadocs.
Revision ChangesPath
No revision
No revision
1.1.2.4 +112 -116
xml-fop/src/codegen/org/apache/fop/datatypes/Attic/CountryLanguageScript.java
Index: CountryLanguageScript.java
===
RCS file:
/home/cvs/xml-fop/src/codegen/org/apache/fop/datatypes/Attic/CountryLanguageScript.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- CountryLanguageScript.java10 Jul 2003 22:51:57 - 1.1.2.3
+++ CountryLanguageScript.java5 Jan 2004 02:34:22 - 1.1.2.4
@@ -64,13 +64,9 @@
* ISO 3166 country codes,
* ISO 639-2T, 639-2B and 639-1 language codes,
* and ISO 15924 script codes.
- * @see a href=
-
http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/index.html;
-http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/index.html/a
- * @see a href=http://www.loc.gov/standards/iso639-2/;
-http://www.loc.gov/standards/iso639-2//a
- * @see a href=http://www.evertype.com/standards/iso15924/document/index.html;
-http://www.evertype.com/standards/iso15924/document/index.html/a
+ * @see a
href=http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/index.html;iso3166/a
+ * @see a href=http://www.loc.gov/standards/iso639-2/;iso639-2/a
+ * @see a
href=http://www.evertype.com/standards/iso15924/document/index.html;iso15924/a
*/
public class CountryLanguageScript {
@@ -649,7 +645,7 @@
// Aleut
iso639_2T_ToENLang.put(ale, Aleut);
-iso639_2T_ToFRLang.put(ale, aléoute);
+iso639_2T_ToFRLang.put(ale, al�oute);
// Algonquian languages
iso639_2T_ToENLang.put(alg, Algonquian languages);
@@ -677,11 +673,11 @@
// Aramaic
iso639_2T_ToENLang.put(arc, Aramaic);
-iso639_2T_ToFRLang.put(arc, araméen);
+iso639_2T_ToFRLang.put(arc, aram�en);
// Armenian
iso639_2T_ToENLang.put(hye, Armenian);
-iso639_2T_ToFRLang.put(hye, arménien);
+iso639_2T_ToFRLang.put(hye, arm�nien);
iso639_2B_To_639_2T.put(arm, hye);
@@ -743,7 +739,7 @@
// Azerbaijani
iso639_2T_ToENLang.put(aze, Azerbaijani);
-iso639_2T_ToFRLang.put(aze, azéri);
+iso639_2T_ToFRLang.put(aze, az�ri);
iso639_1_To_639_2T.put(az, aze);
@@ -753,7 +749,7 @@
// Bamileke languages
iso639_2T_ToENLang.put(bai, Bamileke languages);
-iso639_2T_ToFRLang.put(bai, bamilékés, langues);
+iso639_2T_ToFRLang.put(bai, bamil�k�s, langues);
// Bashkir
iso639_2T_ToENLang.put(bak, Bashkir);
@@ -795,7 +791,7 @@
// Belarusian
iso639_2T_ToENLang.put(bel, Belarusian);
-iso639_2T_ToFRLang.put(bel, biélorusse);
+iso639_2T_ToFRLang.put(bel, bi�lorusse);
iso639_1_To_639_2T.put(be, bel);
@@ -811,7 +807,7 @@
// Berber (Other)
iso639_2T_ToENLang.put(ber, Berber (Other));
-iso639_2T_ToFRLang.put(ber, berbères, autres langues);
+iso639_2T_ToFRLang.put(ber, berb�res, autres langues);
// Bhojpuri
iso639_2T_ToENLang.put(bho, Bhojpuri);
@@ -847,7 +843,7 @@
// Tibetan
iso639_2T_ToENLang.put(bod, Tibetan);
-iso639_2T_ToFRLang.put(bod, tibétain);
+iso639_2T_ToFRLang.put(bod, tib�tain);
iso639_2B_To_639_2T.put(tib, bod);
@@ -871,7 +867,7 @@
// Batak (Indonesia)
iso639_2T_ToENLang.put(btk, Batak (Indonesia));
-iso639_2T_ToFRLang.put(btk, batak (Indonésie));
+iso639_2T_ToFRLang.put(btk, batak (Indon�sie));
// Buriat
iso639_2T_ToENLang.put(bua, Buriat);
@@ -901,7 +897,7 @@
// Central American Indian (Other)
iso639_2T_ToENLang.put(cai, Central American Indian (Other));
-iso639_2T_ToFRLang.put(cai, indiennes d'Amérique centrale, autres
langues);
+iso639_2T_ToFRLang.put(cai, indiennes d'Am�rique centrale, autres
langues);
// Carib
iso639_2T_ToENLang.put(car, Carib);
@@ -927,7 +923,7 @@
// Czech
iso639_2T_ToENLang.put(ces, Czech);
-iso639_2T_ToFRLang.put(ces, tchèque);
+iso639_2T_ToFRLang.put(ces, tch�que);
iso639_2B_To_639_2T.put(cze,
cvs commit: xml-fop/src/java/org/apache/fop/messaging MessageEvent.java MessageHandler.java
pbwest 2004/01/04 18:35:47
Modified:src/java/org/apache/fop/messaging Tag: FOP_0-20-0_Alt-Design
MessageEvent.java MessageHandler.java
Log:
Javadoc cleanup flagged by Eclipse
Revision ChangesPath
No revision
No revision
1.1.2.2 +2 -2
xml-fop/src/java/org/apache/fop/messaging/Attic/MessageEvent.java
Index: MessageEvent.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/messaging/Attic/MessageEvent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MessageEvent.java 5 Jul 2003 19:10:38 - 1.1.2.1
+++ MessageEvent.java 5 Jan 2004 02:35:47 - 1.1.2.2
@@ -58,7 +58,7 @@
* a container for the text and the type of a message
* MessageEvents are created by MessageHandler and can be received by any
* MessageListener, which is added to MessageHandler;
- * @see org.apache.fop.MessageListener MessageListener
+ * @see org.apache.fop.messaging.MessageListener MessageListener
*
*/
1.1.2.2 +2 -2
xml-fop/src/java/org/apache/fop/messaging/Attic/MessageHandler.java
Index: MessageHandler.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/messaging/Attic/MessageHandler.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MessageHandler.java 5 Jul 2003 19:10:38 - 1.1.2.1
+++ MessageHandler.java 5 Jan 2004 02:35:47 - 1.1.2.2
@@ -222,7 +222,7 @@
/**
* adds a MessageListener which listens for MessageEvents
- * @param MessageListener the listener to add
+ * @param listener the MessageListener to add
*/
public static void addListener(MessageListener listener) {
listeners.addElement(listener);
@@ -230,7 +230,7 @@
/**
* removes a MessageListener
- * @param MessageListener the listener to remove
+ * @param listener the MessageListener to remove
*/
public static void removeListener(MessageListener listener) {
listeners.removeElement(listener);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination FoPageSequenceMaster.java
pbwest 2004/01/04 18:40:43
Modified:src/java/org/apache/fop/fo/pagination Tag:
FOP_0-20-0_Alt-Design FoPageSequenceMaster.java
Log:
private static final int[] arrays made protected.
private static final int made public.
Flagged by Eclipse.
Revision ChangesPath
No revision
No revision
1.1.2.2 +14 -14
xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
Index: FoPageSequenceMaster.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FoPageSequenceMaster.java 5 Jul 2003 19:16:49 - 1.1.2.1
+++ FoPageSequenceMaster.java 5 Jan 2004 02:40:43 - 1.1.2.2
@@ -110,13 +110,13 @@
/** Constant values for FoSinglePageMasterReference.
See [EMAIL PROTECTED] #sparsePropsMap sparsePropsMap}. */
-private static final int[] s_p_m_r_PropsMap;
+protected static final int[] s_p_m_r_PropsMap;
/** See [EMAIL PROTECTED] #sparseIndices sparseIndices}. */
-private static final int[] s_p_m_r_Indices;
+protected static final int[] s_p_m_r_Indices;
/** See [EMAIL PROTECTED] #numProps numProps}. */
-private static final int s_p_m_r_numProps;
+public static final int s_p_m_r_numProps;
static {
// applicableProps is a HashMap containing the indicies of the
@@ -130,13 +130,13 @@
}
/** See [EMAIL PROTECTED] #sparsePropsMap sparsePropsMap}. */
-private static final int[] r_p_m_r_PropsMap;
+protected static final int[] r_p_m_r_PropsMap;
/** See [EMAIL PROTECTED] #sparseIndices sparseIndices}. */
-private static final int[] r_p_m_r_Indices;
+protected static final int[] r_p_m_r_Indices;
/** See [EMAIL PROTECTED] #numProps numProps}. */
-private static final int r_p_m_r_numProps;
+public static final int r_p_m_r_numProps;
static {
// Collect the sets of properties that apply
@@ -162,13 +162,13 @@
}
/** See [EMAIL PROTECTED] #sparsePropsMap sparsePropsMap}. */
-private static final int[] r_p_m_a_PropsMap;
+protected static final int[] r_p_m_a_PropsMap;
/** See [EMAIL PROTECTED] #sparseIndices sparseIndices}. */
-private static final int[] r_p_m_a_Indices;
+protected static final int[] r_p_m_a_Indices;
/** See [EMAIL PROTECTED] #numProps numProps}. */
-private static final int r_p_m_a_numProps;
+protected static final int r_p_m_a_numProps;
static {
r_p_m_a_PropsMap = new int[PropNames.LAST_PROPERTY_INDEX + 1];
@@ -179,13 +179,13 @@
}
/** See [EMAIL PROTECTED] #sparsePropsMap sparsePropsMap}. */
-private static final int[] c_p_m_r_PropsMap;
+protected static final int[] c_p_m_r_PropsMap;
/** See [EMAIL PROTECTED] #sparseIndices sparseIndices}. */
-private static final int[] c_p_m_r_Indices;
+protected static final int[] c_p_m_r_Indices;
/** See [EMAIL PROTECTED] #numProps numProps}. */
-private static final int c_p_m_r_numProps;
+public static final int c_p_m_r_numProps;
static {
// Collect the sets of properties that apply
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination FoLayoutMasterSet.java
pbwest 2004/01/04 18:41:15 Modified:src/java/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design FoLayoutMasterSet.java Log: Javadoc cleanup flagged by Eclipse Revision ChangesPath No revision No revision 1.1.2.2 +4 -4 xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java Index: FoLayoutMasterSet.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- FoLayoutMasterSet.java5 Jul 2003 19:16:49 - 1.1.2.1 +++ FoLayoutMasterSet.java5 Jan 2004 02:41:15 - 1.1.2.2 @@ -159,7 +159,7 @@ * fo:layout-master-set contents are * (simple-page-master|page-sequence-master)+ * @param event - the layout page-master-set STARTELEMENT event. - * @throws ttFOPException/tt. + * @throws FOPException */ public void setupPageMasters(FoXMLEvent event) throws FOPException, PropertyException - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/expr PropertyParser.java
pbwest 2004/01/04 18:43:11
Modified:src/java/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design
PropertyParser.java
Log:
Removed redundant casts. Flagged by Eclipse.
Revision ChangesPath
No revision
No revision
1.1.2.2 +7 -12 xml-fop/src/java/org/apache/fop/fo/expr/PropertyParser.java
Index: PropertyParser.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/expr/PropertyParser.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- PropertyParser.java 5 Jul 2003 19:14:07 - 1.1.2.1
+++ PropertyParser.java 5 Jan 2004 02:43:11 - 1.1.2.2
@@ -314,8 +314,7 @@
((Numeric)prop).add((Numeric)pv);
break inner;
case PropertyValue.INTEGER:
-((Numeric)prop).add((double)
-(((IntegerType)pv).getInt()));
+((Numeric)prop).add(((IntegerType)pv).getInt());
break inner;
default:
throw new PropertyException(arithErrorStr());
@@ -328,8 +327,7 @@
((Numeric)prop).subtract((Numeric)pv);
break inner;
case PropertyValue.INTEGER:
-((Numeric)prop).subtract((double)
- (((IntegerType)pv).getInt()));
+((Numeric)prop).subtract(((IntegerType)pv).getInt());
break inner;
default:
throw new PropertyException(arithErrorStr());
@@ -346,7 +344,7 @@
pv = parseMultiplicativeExpr();
switch (pv.getType()) {
case PropertyValue.NUMERIC:
-prop = ((Numeric)pv).add((double)intVal);
+prop = ((Numeric)pv).add(intVal);
break inner;
case PropertyValue.INTEGER:
((IntegerType)prop).setInt(intVal +
@@ -360,7 +358,7 @@
pv = parseMultiplicativeExpr();
switch (pv.getType()) {
case PropertyValue.NUMERIC:
-((Numeric)pv).add((double)(-intVal));
+((Numeric)pv).add(-intVal);
prop = ((Numeric)pv).negate();
break inner;
case PropertyValue.INTEGER:
@@ -405,8 +403,7 @@
pv = parseUnaryExpr();
switch (pv.getType()) {
case PropertyValue.INTEGER:
-((Numeric)prop).divide
-((double)(((IntegerType)pv).getInt()));
+((Numeric)prop).divide(((IntegerType)pv).getInt());
break inner;
case PropertyValue.NUMERIC:
((Numeric)prop).divide((Numeric)pv);
@@ -419,8 +416,7 @@
pv = parseUnaryExpr();
switch (pv.getType()) {
case PropertyValue.INTEGER:
-((Numeric)prop).mod
-((double)(((IntegerType)pv).getInt()));
+((Numeric)prop).mod(((IntegerType)pv).getInt());
break inner;
case PropertyValue.NUMERIC:
((Numeric)prop).mod((Numeric)pv);
@@ -433,8 +429,7 @@
pv = parseUnaryExpr();
switch (pv.getType()) {
case PropertyValue.INTEGER:
-((Numeric)prop).multiply
-((double)(((IntegerType)pv).getInt()));
+((Numeric)prop).multiply(((IntegerType)pv).getInt());
break inner;
case PropertyValue.NUMERIC:
((Numeric)prop).multiply((Numeric)pv);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/expr SystemFontFunction.java
pbwest 2004/01/04 18:44:28
Modified:src/java/org/apache/fop/fo/expr Tag: FOP_0-20-0_Alt-Design
SystemFontFunction.java
Log:
Argument name changed from Property to property.
Revision ChangesPath
No revision
No revision
1.1.2.2 +4 -4
xml-fop/src/java/org/apache/fop/fo/expr/Attic/SystemFontFunction.java
Index: SystemFontFunction.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/expr/Attic/SystemFontFunction.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SystemFontFunction.java 5 Jul 2003 19:14:07 - 1.1.2.1
+++ SystemFontFunction.java 5 Jan 2004 02:44:28 - 1.1.2.2
@@ -57,7 +57,7 @@
* if any other errors occur in the processing of the property
*/
public static PropertyValue systemFontCharacteristic
-(int Property, String font, String propName)
+(int property, String font, String propName)
throws FunctionNotImplementedException, PropertyException
{
throw new FunctionNotImplementedException(system-font);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo PropertyConsts.java
pbwest 2004/01/04 18:48:25
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropertyConsts.java
Log:
Removed spurious exception in throws clause.
Javadocs cleanup.
Cleaned up unnecessary try/catch clause.
Revision ChangesPath
No revision
No revision
1.1.2.3 +23 -28xml-fop/src/java/org/apache/fop/fo/Attic/PropertyConsts.java
Index: PropertyConsts.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/PropertyConsts.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PropertyConsts.java 3 Jan 2004 13:00:50 - 1.1.2.2
+++ PropertyConsts.java 5 Jan 2004 02:48:25 - 1.1.2.3
@@ -88,11 +88,7 @@
public static final PropertyConsts pconsts;
static {
-try {
pconsts = new PropertyConsts();
-} catch (PropertyException e) {
-throw new RuntimeException(e.getMessage());
-}
}
public static final PropertyConsts getPropertyConsts() {
@@ -231,10 +227,10 @@
* Get the initial value ttPropertyValue/tt for a given property.
* Note that this is a braw/b value; if it is
* an unresolved percentage that value will be returned.
- * @param index - the property index.
+ * @param propindex - the property index.
* @return a ttPropertyValue/tt containing the initial property
* value element for the indexed property.
- * @exception ttPropertyException/tt
+ * @exception PropertyException
*/
public PropertyValue getInitialValue(int propindex)
throws PropertyException
@@ -254,7 +250,7 @@
* @param value the ttPropertyValue/tt being refined.
* @return ttPropertyValue/tt constructed by the property's
* irefineParsing/i method
- * @exception ttPropertyException/tt
+ * @exception PropertyException
*/
public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value)
@@ -268,13 +264,12 @@
* @param propindex ttint/tt index of the property
* @param foNode the node whose properties are being constructed.
* @param value the ttPropertyValue/tt being refined.
- * @param nested - ttboolean/tt indicating whether this method is
+ * @param isNested indicates whether this method is
* called normally (false), or as part of another irefineParsing/i
- * method.
- * @see #refineParsing(FOTree,PropertyValue)
+ * method
* @return ttPropertyValue/tt constructed by the property's
* irefineParsing/i method
- * @exception ttPropertyException/tt
+ * @exception PropertyException
*/
public PropertyValue refineParsing
(int propindex, FONode foNode, PropertyValue value, boolean isNested)
@@ -290,7 +285,7 @@
* @param propindex int index of the FO property
* @param enum - the integer equivalent of the enumeration keyword.
* @return the ttNumeric/tt result.
- * @throws PropertyException.
+ * @throws PropertyException
*/
public Numeric getMappedNumeric(FONode foNode, int propindex, int enum)
throws PropertyException
@@ -305,10 +300,10 @@
}
/**
- * @param propindex int index of the FO property
+ * @param property name of the FO property
* @return int type of inheritance for this property
* (See constants defined in Properties.)
- * @throws PropertyException.
+ * @throws PropertyException
*/
public int inheritance(String property) throws PropertyException {
return inheritance(PropNames.getPropertyIndex(property));
@@ -318,7 +313,7 @@
* @param propindex int index of the FO property
* @return int type of inheritance for this property
* (See constants defined in Property.)
- * @throws PropertyException.
+ * @throws PropertyException
*/
public int inheritance(int propindex) throws PropertyException {
setupProperty(propindex);
@@ -328,7 +323,7 @@
/**
* @param propindex int index of the FO property
* @return ttboolean/tt is property inherited?
- * @throws PropertyException.
+ * @throws PropertyException
*/
public boolean isInherited(int propindex) throws PropertyException {
Property property = setupProperty(propindex);
@@ -338,7 +333,7 @@
/**
* @param property String name of the FO property
* @return ttboolean/tt is property inherited?
- * @throws PropertyException.
+ * @throws PropertyException
*/
public boolean isInherited(String property) throws PropertyException {
cvs commit: xml-fop/src/java/org/apache/fop/fo ShorthandPropSets.java
pbwest 2004/01/04 18:50:28
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
ShorthandPropSets.java
Log:
Removed redundant casts.
Javadocs cleanupo.
Flagged by Eclipse.
Revision ChangesPath
No revision
No revision
1.1.2.2 +16 -16xml-fop/src/java/org/apache/fop/fo/Attic/ShorthandPropSets.java
Index: ShorthandPropSets.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/ShorthandPropSets.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ShorthandPropSets.java5 Jul 2003 19:26:05 - 1.1.2.1
+++ ShorthandPropSets.java5 Jan 2004 02:50:28 - 1.1.2.2
@@ -353,8 +353,8 @@
shorthandMap = new HashMap(shorthands.length);
for (int i = 0; i shorthands.length; i++) {
shorthandMap.put
-((Object)(Ints.consts.get(shorthands[i])),
- (Object)(Ints.consts.get(i)));
+((Ints.consts.get(shorthands[i])),
+ (Ints.consts.get(i)));
}
}
@@ -380,7 +380,7 @@
* @param property ttint/tt property index
* @return ttROIntArray/tt containing the expansion list for
* this shorthand.
- * @exception ttPropertyException/tt if this is not a valid
+ * @exception PropertyException if this is not a valid
* shorthand property
*/
public static ROIntArray getSHandExpansionSet(int property)
@@ -464,7 +464,7 @@
* @param element the overriding ttPropertyValue/tt
* @return ttPropertyValueList/tt the expansion list with the
* appropriate element reset
- * @exception ttPropertyException/tt
+ * @exception PropertyException
*/
public static PropertyValueList overrideSHandElement
(PropertyValueList expansionList, PropertyValue element)
@@ -494,7 +494,7 @@
* @param list the overriding ttPropertyValueList/tt
* @return ttPropertyValueList/tt the new expansion list with
* appropriate elements reset
- * @exception ttPropertyException/tt
+ * @exception PropertyException
*/
public static PropertyValueList overrideSHandElements
(PropertyValueList expansionList, PropertyValueList list)
@@ -814,8 +814,8 @@
compoundMap = new HashMap(compounds.length);
for (int i = 0; i compounds.length; i++) {
compoundMap.put
-((Object)(Ints.consts.get(compounds[i])),
- (Object)(Ints.consts.get(i)));
+((Ints.consts.get(compounds[i])),
+ (Ints.consts.get(i)));
}
}
@@ -961,7 +961,7 @@
* @param list - the list to which to append the expansion elements.
* @return the original ttPropertyValueList/tt containing the
* appended expansions.
- * @exception ttPropertyException/tt
+ * @exception PropertyException
*/
private static PropertyValueList copyValueToSet(PropertyValue value,
ROIntArray expansionSet, PropertyValueList list)
@@ -991,13 +991,13 @@
* breferences/b to the initial values. Note also that, in the
* expansion of a compound value, the initial value comonents are
* regarded as having been specified.
- * @param foTree - the ttFOTree/tt of the node whose properties are
- * being processed.
- * @param expansion - the set of indices of the expansion properties.
- * @param list - the list to which to append the expansion elements.
+ * @param foTree tree of the node whose properties are
+ * being processed
+ * @param expansion the set of indices of the expansion properties
+ * @param list the list to which to append the expansion elements
* @return the original ttPropertyValueList/tt containing the
* appended initial value expansions for the (compound) property.
- * @exception ttPropertyException/tt
+ * @exception PropertyException
*/
public static PropertyValueList initialValueCompoundExpansion
(FOTree foTree, ROIntArray expansion, PropertyValueList list)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FOAttributes.java
pbwest 2004/01/04 18:52:10
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FOAttributes.java
Log:
Removed redundant casts.
Flagged by Eclipse.
Revision ChangesPath
No revision
No revision
1.1.2.4 +5 -5 xml-fop/src/java/org/apache/fop/fo/Attic/FOAttributes.java
Index: FOAttributes.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FOAttributes.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- FOAttributes.java 1 Jan 2004 12:39:30 - 1.1.2.3
+++ FOAttributes.java 5 Jan 2004 02:52:09 - 1.1.2.4
@@ -210,7 +210,7 @@
* ttPropNames/tt.
*/
public Map getFixedFoAttrMap() {
-return Collections.unmodifiableMap((Map)foAttrMap);
+return Collections.unmodifiableMap(foAttrMap);
}
/**
@@ -274,7 +274,7 @@
*/
public Map getAttrMap(int uriIndex) {
if (uriIndex == XMLNamespaces.DefAttrNSIndex)
-return Collections.unmodifiableMap((Map)foAttrMap);
+return Collections.unmodifiableMap(foAttrMap);
if (nSpaceAttrMaps != null) {
if (uriIndex = nSpaceAttrMaps.size()) return null;
return Collections.unmodifiableMap
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FObjects.java
pbwest 2004/01/04 18:53:04
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FObjects.java
Log:
Removed redundant casts.
Flagged by Eclipse.
Revision ChangesPath
No revision
No revision
1.1.2.3 +5 -5 xml-fop/src/java/org/apache/fop/fo/Attic/FObjects.java
Index: FObjects.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FObjects.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FObjects.java 1 Jan 2004 23:19:49 - 1.1.2.2
+++ FObjects.java 5 Jan 2004 02:53:04 - 1.1.2.3
@@ -187,7 +187,7 @@
// Set up the foToIndex Hashmap with the name of the
// flow object as a key, and the integer index as a value
-if (foToIndex.put((Object) foName,
+if (foToIndex.put(foName,
Ints.consts.get(i)) != null) {
throw new RuntimeException(
Duplicate values in propertyToIndex for key +
@@ -197,7 +197,7 @@
// Set up the foClassToIndex Hashmap with the name of the
// fo class as a key, and the integer index as a value
-if (foClassToIndex.put((Object) foClassNames[i],
+if (foClassToIndex.put(foClassNames[i],
Ints.consts.get(i)) != null) {
throw new RuntimeException(
Duplicate values in foClassToIndex for key +
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo PropNames.java FObjectNames.java FONode.java
pbwest 2004/01/04 18:54:59
Modified:src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
PropNames.java FObjectNames.java FONode.java
Log:
Javadoc cleanup flagged by Eclipse
Revision ChangesPath
No revision
No revision
1.1.2.3 +4 -4 xml-fop/src/java/org/apache/fop/fo/Attic/PropNames.java
Index: PropNames.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/PropNames.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- PropNames.java1 Jan 2004 23:59:30 - 1.1.2.2
+++ PropNames.java5 Jan 2004 02:54:59 - 1.1.2.3
@@ -820,7 +820,7 @@
/**
* Get the property index of a property name.
- * @param propindex ttint/tt index of the FO property.
+ * @param name of the FO property.
* @return ttString/tt name of the indexd FO property.
* @exception PropertyException if the property index is invalid.
*/
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/Attic/FObjectNames.java
Index: FObjectNames.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FObjectNames.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FObjectNames.java 1 Jan 2004 12:55:46 - 1.1.2.2
+++ FObjectNames.java 5 Jan 2004 02:54:59 - 1.1.2.3
@@ -236,7 +236,7 @@
* Get the FObject index corresponding to the FObject name.
* @param foName - the FO name.
* @return the ttint/tt index.
- * @throws ttFOPException/tt.
+ * @throws FOPException
*/
public static int getFOIndex(String foName)
throws FOPException
1.2.2.2 +10 -10xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- FONode.java 5 Jul 2003 19:26:05 - 1.2.2.1
+++ FONode.java 5 Jan 2004 02:54:59 - 1.2.2.2
@@ -240,9 +240,9 @@
* @param stateFlags - the set of states relevant at this point in the
* tree. Includes the state information necessaryto select an attribute
* set for this node.
- * @param sparsePropsMap - an ttint[]/tt mapping the property indices
+ * @param sparsePropsMap maps the property indices
* to their offsets in the set of properties applicable to this node.
- * @param sparseindices - an ttint[]/tt holding the set of property
+ * @param sparseIndices holds the set of property
* indices applicable to this node, in ascending order.
* isparsePropsMap/i maps property indices to a position in this array.
* Together they provide a sparse array facility for this node's
@@ -350,9 +350,9 @@
* properties are no longer required. The property set for the node can
* be reduced to the minimum required for this formatting object.
* This minimal set is maintained in a sparse array.
- * @see sparsePropsSet
- * @see sparsePropsMap
- * @see sparseIndices
+ * @see #sparsePropsSet
+ * @see #sparsePropsMap
+ * @see #sparseIndices
*/
public void makeSparsePropsSet() throws PropertyException {
sparsePropsSet = new PropertyValue[numProps];
@@ -401,7 +401,7 @@
/**
* Get the adjusted ttPropertyValue/tt of the property
* on the nearest ancestor with a specified value for that property.
- * @see #fromNearestSpecified(init,int)
+ * @see #fromNearestSpecified(int,int)
* @see #getNearestSpecifiedValue(int)
* @param property - the index of both target and source properties.
* to the PropertyTriplet.
@@ -475,7 +475,7 @@
/**
* Get the adjusted value from the parent FO of the source property.
- * @see #fromParent(init,int)
+ * @see #fromParent(int,int)
* @see #getPropertyValue(int)
* @param property - the index of both target and source properties.
* @return - the adjusted value from the parent FO node, if it exists.
@@ -534,10 +534,10 @@
* pre
* pThe badjusted value/b is either the value itself, or, if the
* value is an unresolved relative length, an ttIndirectValue/tt
- * referring to that unresolved length.
- * @param index - the property index.
+ * referring to that unresolved length
+ * @param property the property index
* @return a ttPropertyValue/tt containing the adjusted property
- * value for the
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties Property.java
pbwest 2004/01/04 19:58:51
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design Property.java
Log:
Removed redundant casts.
Javadocs cleanup.
Flagged by Eclipse.
Revision ChangesPath
No revision
No revision
1.1.2.4 +11 -11
xml-fop/src/java/org/apache/fop/fo/properties/Attic/Property.java
Index: Property.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/Property.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Property.java 3 Jan 2004 11:14:46 - 1.1.2.3
+++ Property.java 5 Jan 2004 03:58:51 - 1.1.2.4
@@ -488,7 +488,7 @@
// TODO: validate here
return pv;
case PropertyValue.LIST:
-System.out.println((PropertyValueList)value);
+System.out.println(value);
throw new PropertyException
(PropertyValueList passed to Property.refineParsing for
+ propName);
@@ -557,7 +557,7 @@
* ttPropertyValueList/tt.
* @param list - the containing list.
* @return the contained space-separated list.
- * @throws ttPropertyException/tt if ilist/i contains more than
+ * @throws PropertyException if ilist/i contains more than
* one element or if the contained element is not a list.
*/
protected PropertyValueList spaceSeparatedList
@@ -585,7 +585,7 @@
* @param type ttString/tt type of expected enum - for
* exception messages only
* @return ttEnumValue/tt equivalent of the argument
- * @exception ttPropertyException/tt
+ * @exception PropertyException
*/
protected EnumType getEnum(PropertyValue value,
int property, String type)
@@ -656,9 +656,9 @@
* fallback implementation of this function for properties which do not
* support a MAPPED_LENGTH type. Those which do must override this
* method.
- * @param enum - the ttint/tt enumeration index.
+ * @param enum - the enumeration index.
* @return a ttNumeric/tt. This implementation never returns.
- * @throws ttPropertyException/tt.
+ * @throws PropertyException
*/
public Numeric getMappedLength(FONode node, int enum)
throws PropertyException
@@ -674,8 +674,8 @@
* that set.
* @param property ttint/tt property index
* @return ttPropertyValue/tt
- * @exception ttPropertyException/tt
- * @exception ttPropertyNotImplementedException/tt
+ * @exception PropertyException
+ * @exception PropertyNotImplementedException
*/
public PropertyValue getInitialValue(int property)
throws PropertyException
@@ -799,7 +799,7 @@
if (value.size() == 0)
throw new PropertyException
(Empty list for + propName);
-Iterator elements = ((PropertyValueList)value).iterator();
+Iterator elements = (value).iterator();
scanning_elements: while (elements.hasNext()) {
PropertyValue pval = (PropertyValue)(elements.next());
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties FontStretch.java RuleStyle.java WritingMode.java Margin.java PageBreakCommon.java BackgroundPosition.java TextDecoration.java FontSize.java RegionName.java CaptionSide.java BreakCommon.java WhiteSpaceTreatment.java AlignmentAdjust.java TextAlign.java BorderStyle.java ForcePageCount.java VerticalAlign.java ColorCommon.java Font.java ColorNonTransparent.java BorderColor.java Background.java ActiveState.java Float.java AlignmentBaseline.java DominantBaseline.java FontWeight.java BorderWidth.java BorderCommonWidth.java BorderCommonStyle.java TextAlignLast.java
pbwest 2004/01/04 20:01:09
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design FontStretch.java
RuleStyle.java WritingMode.java Margin.java
PageBreakCommon.java BackgroundPosition.java
TextDecoration.java FontSize.java RegionName.java
CaptionSide.java BreakCommon.java
WhiteSpaceTreatment.java AlignmentAdjust.java
TextAlign.java BorderStyle.java ForcePageCount.java
VerticalAlign.java ColorCommon.java Font.java
ColorNonTransparent.java BorderColor.java
Background.java ActiveState.java Float.java
AlignmentBaseline.java DominantBaseline.java
FontWeight.java BorderWidth.java
BorderCommonWidth.java BorderCommonStyle.java
TextAlignLast.java
Log:
Removed redundant casts.
Flagged by Eclipse.
Revision ChangesPath
No revision
No revision
1.1.2.3 +3 -3
xml-fop/src/java/org/apache/fop/fo/properties/Attic/FontStretch.java
Index: FontStretch.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/FontStretch.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FontStretch.java 3 Jan 2004 10:48:35 - 1.1.2.2
+++ FontStretch.java 5 Jan 2004 04:01:09 - 1.1.2.3
@@ -121,8 +121,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i rwEnums.length; i++ ) {
-rwEnumHash.put((Object)rwEnums[i],
-(Object) Ints.consts.get(i));
+rwEnumHash.put(rwEnums[i],
+Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +3 -3
xml-fop/src/java/org/apache/fop/fo/properties/Attic/RuleStyle.java
Index: RuleStyle.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/RuleStyle.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RuleStyle.java3 Jan 2004 10:48:34 - 1.1.2.2
+++ RuleStyle.java5 Jan 2004 04:01:09 - 1.1.2.3
@@ -109,8 +109,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i rwEnums.length; i++ ) {
-rwEnumHash.put((Object)rwEnums[i],
-(Object) Ints.consts.get(i));
+rwEnumHash.put(rwEnums[i],
+Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +3 -3
xml-fop/src/java/org/apache/fop/fo/properties/Attic/WritingMode.java
Index: WritingMode.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/WritingMode.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- WritingMode.java 3 Jan 2004 10:48:34 - 1.1.2.2
+++ WritingMode.java 5 Jan 2004 04:01:09 - 1.1.2.3
@@ -109,8 +109,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i rwEnums.length; i++ ) {
-rwEnumHash.put((Object)rwEnums[i],
-(Object) Ints.consts.get(i));
+rwEnumHash.put(rwEnums[i],
+Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/Margin.java
Index: Margin.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/Margin.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Margin.java 3 Jan 2004 10:48:33 - 1.1.2.2
+++ Margin.java 5 Jan 2004 04:01:09 - 1.1.2.3
@@ -182,7 +182,7 @@
* @return ttPropertyValue/t the same value, with its property set
* to the iproperty/i argument, if it is an Auto or a
* ttNumeric/tt distance
- * @exception ttPropertyException/tt if the conditions are not met
+ * @exception PropertyException if the conditions are not met
*/
private static PropertyValue autoOrDistance
(PropertyValue value, int property)
@@ -202,7 +202,7
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties RenderingIntent.java FontFamily.java Clear.java
pbwest 2004/01/04 20:03:30
Modified:src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design RenderingIntent.java
FontFamily.java Clear.java
Log:
Removed redundant casts.
Flagged by Eclipse.
Revision ChangesPath
No revision
No revision
1.1.2.3 +3 -3
xml-fop/src/java/org/apache/fop/fo/properties/Attic/RenderingIntent.java
Index: RenderingIntent.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/RenderingIntent.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RenderingIntent.java 3 Jan 2004 10:48:34 - 1.1.2.2
+++ RenderingIntent.java 5 Jan 2004 04:03:30 - 1.1.2.3
@@ -97,8 +97,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i rwEnums.length; i++ ) {
-rwEnumHash.put((Object)rwEnums[i],
-(Object) Ints.consts.get(i));
+rwEnumHash.put(rwEnums[i],
+Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
1.1.2.3 +3 -3
xml-fop/src/java/org/apache/fop/fo/properties/Attic/FontFamily.java
Index: FontFamily.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/FontFamily.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FontFamily.java 3 Jan 2004 10:48:35 - 1.1.2.2
+++ FontFamily.java 5 Jan 2004 04:03:30 - 1.1.2.3
@@ -106,8 +106,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i rwEnums.length; i++ ) {
-rwEnumHash.put((Object)rwEnums[i],
-(Object) Ints.consts.get(i));
+rwEnumHash.put(rwEnums[i],
+Ints.consts.get(i));
}
}
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/fo/properties/Attic/Clear.java
Index: Clear.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/Clear.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- Clear.java3 Jan 2004 10:48:34 - 1.1.2.2
+++ Clear.java5 Jan 2004 04:03:30 - 1.1.2.3
@@ -101,8 +101,8 @@
static {
rwEnumHash = new HashMap((int)(rwEnums.length / 0.75) + 1);
for (int i = 1; i rwEnums.length; i++ ) {
-rwEnumHash.put((Object)rwEnums[i],
-(Object) Ints.consts.get(i));
+rwEnumHash.put(rwEnums[i],
+Ints.consts.get(i));
}
}
public int getEnumIndex(String enum)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop .project
pbwest 2004/01/04 20:06:49 Modified:.Tag: FOP_0-20-0_Alt-Design .project Log: Project mods Revision ChangesPath No revision No revision 1.1.2.5 +1 -1 xml-fop/Attic/.project Index: .project === RCS file: /home/cvs/xml-fop/Attic/.project,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- .project 3 Jan 2004 13:10:41 - 1.1.2.4 +++ .project 5 Jan 2004 04:06:49 - 1.1.2.5 @@ -22,7 +22,7 @@ dictionary keyLaunchConfigHandle/key valuelt;?xml version=quot;1.0quot; encoding=quot;UTF-8quot;?gt; -lt;launchConfiguration local=quot;falsequot; path=quot;/FOP_Alt-Design/.externalToolBuilders/alt.design build.xml [Builder].launchquot;/gt; +lt;launchConfiguration local=quot;falsequot; path=quot;/FOP_Alt-Design/.externalToolBuilders/Alt-Design build.xml.launchquot;/gt; /value /dictionary /arguments - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/configuration LanguageFileReader.java
pbwest 2004/01/04 20:07:12 Removed: src/java/org/apache/fop/configuration Tag: FOP_0-20-0_Alt-Design LanguageFileReader.java Log: No longer required. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/flow Dummy.java
pbwest 2004/01/04 20:07:32 Removed: src/java/org/apache/fop/fo/flow Tag: FOP_0-20-0_Alt-Design Dummy.java Log: No longer required. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
