foray-commit Mailing List for FOray (Page 291)
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
foray-commit — FOray repository commit log messages
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(139) |
Apr
(98) |
May
(250) |
Jun
(394) |
Jul
(84) |
Aug
(13) |
Sep
(420) |
Oct
(186) |
Nov
(1) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(108) |
Feb
(202) |
Mar
(291) |
Apr
(247) |
May
(374) |
Jun
(227) |
Jul
(231) |
Aug
(60) |
Sep
(31) |
Oct
(45) |
Nov
(18) |
Dec
|
| 2008 |
Jan
(38) |
Feb
(71) |
Mar
(142) |
Apr
|
May
(59) |
Jun
(6) |
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(12) |
Feb
(4) |
Mar
(88) |
Apr
(121) |
May
(17) |
Jun
(30) |
Jul
|
Aug
(5) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
(11) |
Feb
(76) |
Mar
(11) |
Apr
|
May
(11) |
Jun
|
Jul
|
Aug
(44) |
Sep
(14) |
Oct
(7) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(168) |
| 2017 |
Jan
(77) |
Feb
(11) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
(6) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
(88) |
Mar
(118) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(141) |
| 2021 |
Jan
(170) |
Feb
(20) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(62) |
Nov
(189) |
Dec
(162) |
| 2022 |
Jan
(201) |
Feb
(118) |
Mar
(8) |
Apr
|
May
(2) |
Jun
(47) |
Jul
(19) |
Aug
(14) |
Sep
(3) |
Oct
|
Nov
(28) |
Dec
(235) |
| 2023 |
Jan
(112) |
Feb
(23) |
Mar
(2) |
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(70) |
Sep
(92) |
Oct
(20) |
Nov
(1) |
Dec
(1) |
| 2024 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(14) |
Jun
(11) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(10) |
Feb
(29) |
Mar
|
Apr
(162) |
May
(245) |
Jun
(83) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(4) |
Dec
(23) |
| 2026 |
Jan
(119) |
Feb
(335) |
Mar
(103) |
Apr
(43) |
May
(154) |
Jun
(107) |
Jul
(187) |
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <vic...@us...> - 2006-06-17 21:32:49
|
Revision: 7690 Author: victormote Date: 2006-06-17 14:32:45 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7690&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java Modified: trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java =================================================================== --- trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java 2006-06-17 21:32:36 UTC (rev 7689) +++ trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java 2006-06-17 21:32:45 UTC (rev 7690) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.mif; import org.apache.commons.logging.Log; @@ -48,7 +48,7 @@ protected BookComponent bookComponent; /* this is a ref to the current flow which could be a textflow or a table */ - private Flow curFlow; // + private Flow curFlow; // private ID curIDCounter = new ID(); private Log logger; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 21:32:42
|
Revision: 7689 Author: victormote Date: 2006-06-17 14:32:36 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7689&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- trunk/foray/foray-output/src/java/org/foray/output/Converter.java trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java trunk/foray/foray-output/src/java/org/foray/output/OutputConfig.java trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java Modified: trunk/foray/foray-output/src/java/org/foray/output/Converter.java =================================================================== --- trunk/foray/foray-output/src/java/org/foray/output/Converter.java 2006-06-17 21:25:29 UTC (rev 7688) +++ trunk/foray/foray-output/src/java/org/foray/output/Converter.java 2006-06-17 21:32:36 UTC (rev 7689) @@ -1,19 +1,19 @@ /* * Copyright 2005 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -33,7 +33,7 @@ public abstract class Converter extends OutputTarget { /** - * + * */ public Converter(Log logger, OutputConfig outputConfig) { super(logger, outputConfig); Modified: trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java =================================================================== --- trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java 2006-06-17 21:25:29 UTC (rev 7688) +++ trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java 2006-06-17 21:32:36 UTC (rev 7689) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.output; import org.foray.mif.MIFDocument; Modified: trunk/foray/foray-output/src/java/org/foray/output/OutputConfig.java =================================================================== --- trunk/foray/foray-output/src/java/org/foray/output/OutputConfig.java 2006-06-17 21:25:29 UTC (rev 7688) +++ trunk/foray/foray-output/src/java/org/foray/output/OutputConfig.java 2006-06-17 21:32:36 UTC (rev 7689) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.output; import org.foray.common.Configuration; Modified: trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java =================================================================== --- trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java 2006-06-17 21:25:29 UTC (rev 7688) +++ trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java 2006-06-17 21:32:36 UTC (rev 7689) @@ -1,19 +1,19 @@ /* * Copyright 2005 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -47,7 +47,7 @@ protected OutputConfig options; /** - * + * */ public OutputTarget(Log logger, OutputConfig outputConfig) { this.logger = logger; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 21:25:55
|
Revision: 7688 Author: victormote Date: 2006-06-17 14:25:29 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7688&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- trunk/foray/foray-hyphen-r/resource/hyph-patterns/en.xml trunk/foray/foray-hyphen-r/resource/hyph-patterns/es.xml trunk/foray/foray-hyphen-r/resource/hyph-patterns/hyphenation.dtd trunk/foray/foray-hyphen-r/resource/hyph-patterns/it.xml trunk/foray/foray-hyphen-r/resource/hyph-patterns/pl.xml trunk/foray/foray-hyphen-r/resource/hyph-patterns/ru.xml trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/ByteVector.java trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/CharVector.java trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphen.java trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternConsumer.java trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternParser.java trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/SerializeHyphPattern.java trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/TernaryTree.java Modified: trunk/foray/foray-hyphen-r/resource/hyph-patterns/en.xml =================================================================== --- trunk/foray/foray-hyphen-r/resource/hyph-patterns/en.xml 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/resource/hyph-patterns/en.xml 2006-06-17 21:25:29 UTC (rev 7688) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="US-ASCII"?> <!DOCTYPE hyphenation-info SYSTEM "hyphenation.dtd"> -<!-- +<!-- % % Created by Jeff Kingston, 16 November 1996, from a TeX % hyphenation file with the following header comment: @@ -10,18 +10,18 @@ % Version 1.0. Released 17 April 1992. % % Created by Dominik Wujastyk and Graham Toal using Frank Liang's PATGEN 1.0. -% Like the US patterns, these UK patterns correctly hyphenate about 90% of -% the words in the input list, and produce no hyphens not in the list +% Like the US patterns, these UK patterns correctly hyphenate about 90% of +% the words in the input list, and produce no hyphens not in the list % (see TeXbook pp. 451-2). % % These patterns are based on a file of 114925 British-hyphenated words % generously made available to Dominik Wujastyk by Oxford University Press. -% This list of words is copyright to the OUP and may not be redistributed. -% The hyphenation break points in the words in the abovementioned file is +% This list of words is copyright to the OUP and may not be redistributed. +% The hyphenation break points in the words in the abovementioned file is % also copyright to the OUP. % -% We are very grateful to Oxford University Press for allowing us to use -% their list of hyphenated words to produce the following TeX hyphenation +% We are very grateful to Oxford University Press for allowing us to use +% their list of hyphenated words to produce the following TeX hyphenation % patterns. This file of hyphenation patterns may be freely distributed. % % These patterns require a value of about 14000 for TeX's pattern memory size. @@ -29,7 +29,7 @@ --> <hyphenation-info> -<hyphen-char value="-"/> +<hyphen-char value="-"/> <hyphen-min before="3" after="2"/> <classes> Modified: trunk/foray/foray-hyphen-r/resource/hyph-patterns/es.xml =================================================================== --- trunk/foray/foray-hyphen-r/resource/hyph-patterns/es.xml 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/resource/hyph-patterns/es.xml 2006-06-17 21:25:29 UTC (rev 7688) @@ -76,12 +76,12 @@ % details on use of the mail server. % % Rules mentioned below are those described in that paper. After -% several unsatisfactory attempts to pretend I knew better, these -% patterns closely follow that paper. Pattern 'tl' is not considered. +% several unsatisfactory attempts to pretend I knew better, these +% patterns closely follow that paper. Pattern 'tl' is not considered. % It is conflictive and ftc does not use it either. % -% These patterns have been generated by shyphen.sh version 1.2, -% shyphen.sh is a sh script that allows a number of choices. +% These patterns have been generated by shyphen.sh version 1.2, +% shyphen.sh is a sh script that allows a number of choices. % Full benefit from some of these options can only be % obtained if appropriate fonts are available. % @@ -98,17 +98,17 @@ % expected to provide back-benefits to GMV in that it can help keeping % GMV in the mainstream of spanish users. However, this is given % for free and WITHOUT ANY WARRANTY. Under no circumstances can Julio -% Sanchez, GMV, Jos'e A. Ma~nas or any agents or representatives thereof +% Sanchez, GMV, Jos'e A. Ma~nas or any agents or representatives thereof % be held responsible for any errors in this software nor for any damages % derived from its use, even in case any of the above has been notified % of the possibility of such damages. If any such situation arises, you % responsible for repair. Use of this software is an explicit -% acceptance of these conditions. -% +% acceptance of these conditions. +% % You can use this software for any purpose. You cannot delete this -% copyright notice. If you change this software, you must include -% comments explaining who, when and why. You are kindly requested to -% send any changes to te...@gm.... If you change the generating +% copyright notice. If you change this software, you must include +% comments explaining who, when and why. You are kindly requested to +% send any changes to te...@gm.... If you change the generating % script, you must include code in it such that any output is clearly % labeled as generated by a modified script. % @@ -141,50 +141,50 @@ % Rule SR2 % Attach vowel groups to left consonant --> -1ba 1be 1bo 1b\xE1 1b\xE9 1b\xED 1b\xF3 1b\xFA 1bi 1bu 1b\xFC -1ca 1ce 1co 1c\xE1 1c\xE9 1c\xED 1c\xF3 1c\xFA 1ci 1cu 1c\xFC -1da 1de 1do 1d\xE1 1d\xE9 1d\xED 1d\xF3 1d\xFA 1di 1du 1d\xFC -1fa 1fe 1fo 1f\xE1 1f\xE9 1f\xED 1f\xF3 1f\xFA 1fi 1fu 1f\xFC -1ga 1ge 1go 1g\xE1 1g\xE9 1g\xED 1g\xF3 1g\xFA 1gi 1gu 1g\xFC -1ja 1je 1jo 1j\xE1 1j\xE9 1j\xED 1j\xF3 1j\xFA 1ji 1ju 1j\xFC -1ka 1ke 1ko 1k\xE1 1k\xE9 1k\xED 1k\xF3 1k\xFA 1ki 1ku 1k\xFC -1la 1le 1lo 1l\xE1 1l\xE9 1l\xED 1l\xF3 1l\xFA 1li 1lu 1l\xFC -1ma 1me 1mo 1m\xE1 1m\xE9 1m\xED 1m\xF3 1m\xFA 1mi 1mu 1m\xFC -1na 1ne 1no 1n\xE1 1n\xE9 1n\xED 1n\xF3 1n\xFA 1ni 1nu 1n\xFC -1pa 1pe 1po 1p\xE1 1p\xE9 1p\xED 1p\xF3 1p\xFA 1pi 1pu 1p\xFC -1qa 1qe 1qo 1q\xE1 1q\xE9 1q\xED 1q\xF3 1q\xFA 1qi 1qu 1q\xFC -1ra 1re 1ro 1r\xE1 1r\xE9 1r\xED 1r\xF3 1r\xFA 1ri 1ru 1r\xFC -1sa 1se 1so 1s\xE1 1s\xE9 1s\xED 1s\xF3 1s\xFA 1si 1su 1s\xFC -1ta 1te 1to 1t\xE1 1t\xE9 1t\xED 1t\xF3 1t\xFA 1ti 1tu 1t\xFC -1va 1ve 1vo 1v\xE1 1v\xE9 1v\xED 1v\xF3 1v\xFA 1vi 1vu 1v\xFC -1wa 1we 1wo 1w\xE1 1w\xE9 1w\xED 1w\xF3 1w\xFA 1wi 1wu 1w\xFC -1xa 1xe 1xo 1x\xE1 1x\xE9 1x\xED 1x\xF3 1x\xFA 1xi 1xu 1x\xFC -1ya 1ye 1yo 1y\xE1 1y\xE9 1y\xED 1y\xF3 1y\xFA 1yi 1yu 1y\xFC -1za 1ze 1zo 1z\xE1 1z\xE9 1z\xED 1z\xF3 1z\xFA 1zi 1zu 1z\xFC -1\xF1a 1\xF1e 1\xF1o 1\xF1\xE1 1\xF1\xE9 1\xF1\xED 1\xF1\xF3 1\xF1\xFA 1\xF1i 1\xF1u 1\xF1\xFC +1ba 1be 1bo 1b\xE1 1b\xE9 1b\xED 1b\xF3 1b\xFA 1bi 1bu 1b\xFC +1ca 1ce 1co 1c\xE1 1c\xE9 1c\xED 1c\xF3 1c\xFA 1ci 1cu 1c\xFC +1da 1de 1do 1d\xE1 1d\xE9 1d\xED 1d\xF3 1d\xFA 1di 1du 1d\xFC +1fa 1fe 1fo 1f\xE1 1f\xE9 1f\xED 1f\xF3 1f\xFA 1fi 1fu 1f\xFC +1ga 1ge 1go 1g\xE1 1g\xE9 1g\xED 1g\xF3 1g\xFA 1gi 1gu 1g\xFC +1ja 1je 1jo 1j\xE1 1j\xE9 1j\xED 1j\xF3 1j\xFA 1ji 1ju 1j\xFC +1ka 1ke 1ko 1k\xE1 1k\xE9 1k\xED 1k\xF3 1k\xFA 1ki 1ku 1k\xFC +1la 1le 1lo 1l\xE1 1l\xE9 1l\xED 1l\xF3 1l\xFA 1li 1lu 1l\xFC +1ma 1me 1mo 1m\xE1 1m\xE9 1m\xED 1m\xF3 1m\xFA 1mi 1mu 1m\xFC +1na 1ne 1no 1n\xE1 1n\xE9 1n\xED 1n\xF3 1n\xFA 1ni 1nu 1n\xFC +1pa 1pe 1po 1p\xE1 1p\xE9 1p\xED 1p\xF3 1p\xFA 1pi 1pu 1p\xFC +1qa 1qe 1qo 1q\xE1 1q\xE9 1q\xED 1q\xF3 1q\xFA 1qi 1qu 1q\xFC +1ra 1re 1ro 1r\xE1 1r\xE9 1r\xED 1r\xF3 1r\xFA 1ri 1ru 1r\xFC +1sa 1se 1so 1s\xE1 1s\xE9 1s\xED 1s\xF3 1s\xFA 1si 1su 1s\xFC +1ta 1te 1to 1t\xE1 1t\xE9 1t\xED 1t\xF3 1t\xFA 1ti 1tu 1t\xFC +1va 1ve 1vo 1v\xE1 1v\xE9 1v\xED 1v\xF3 1v\xFA 1vi 1vu 1v\xFC +1wa 1we 1wo 1w\xE1 1w\xE9 1w\xED 1w\xF3 1w\xFA 1wi 1wu 1w\xFC +1xa 1xe 1xo 1x\xE1 1x\xE9 1x\xED 1x\xF3 1x\xFA 1xi 1xu 1x\xFC +1ya 1ye 1yo 1y\xE1 1y\xE9 1y\xED 1y\xF3 1y\xFA 1yi 1yu 1y\xFC +1za 1ze 1zo 1z\xE1 1z\xE9 1z\xED 1z\xF3 1z\xFA 1zi 1zu 1z\xFC +1\xF1a 1\xF1e 1\xF1o 1\xF1\xE1 1\xF1\xE9 1\xF1\xED 1\xF1\xF3 1\xF1\xFA 1\xF1i 1\xF1u 1\xF1\xFC <!-- % Rule SR3 -% Build legal consonant groups, leave other consonants bound to +% Build legal consonant groups, leave other consonants bound to % the previous group. This overrides part of the SR2 pattern % group. --> -1c2ha 1c2he 1c2ho 1c2h\xE1 1c2h\xE9 1c2h\xED 1c2h\xF3 1c2h\xFA 1c2hi 1c2hu 1c2h\xFC -1l2la 1l2le 1l2lo 1l2l\xE1 1l2l\xE9 1l2l\xED 1l2l\xF3 1l2l\xFA 1l2li 1l2lu 1l2l\xFC -1r2ra 1r2re 1r2ro 1r2r\xE1 1r2r\xE9 1r2r\xED 1r2r\xF3 1r2r\xFA 1r2ri 1r2ru 1r2r\xFC -1b2la 1b2le 1b2lo 1b2l\xE1 1b2l\xE9 1b2l\xED 1b2l\xF3 1b2l\xFA 1b2li 1b2lu 1b2l\xFC -1b2ra 1b2re 1b2ro 1b2r\xE1 1b2r\xE9 1b2r\xED 1b2r\xF3 1b2r\xFA 1b2ri 1b2ru 1b2r\xFC -1c2la 1c2le 1c2lo 1c2l\xE1 1c2l\xE9 1c2l\xED 1c2l\xF3 1c2l\xFA 1c2li 1c2lu 1c2l\xFC -1c2ra 1c2re 1c2ro 1c2r\xE1 1c2r\xE9 1c2r\xED 1c2r\xF3 1c2r\xFA 1c2ri 1c2ru 1c2r\xFC -1d2ra 1d2re 1d2ro 1d2r\xE1 1d2r\xE9 1d2r\xED 1d2r\xF3 1d2r\xFA 1d2ri 1d2ru 1d2r\xFC -1f2la 1f2le 1f2lo 1f2l\xE1 1f2l\xE9 1f2l\xED 1f2l\xF3 1f2l\xFA 1f2li 1f2lu 1f2l\xFC -1f2ra 1f2re 1f2ro 1f2r\xE1 1f2r\xE9 1f2r\xED 1f2r\xF3 1f2r\xFA 1f2ri 1f2ru 1f2r\xFC -1g2la 1g2le 1g2lo 1g2l\xE1 1g2l\xE9 1g2l\xED 1g2l\xF3 1g2l\xFA 1g2li 1g2lu 1g2l\xFC -1g2ra 1g2re 1g2ro 1g2r\xE1 1g2r\xE9 1g2r\xED 1g2r\xF3 1g2r\xFA 1g2ri 1g2ru 1g2r\xFC -1k2la 1k2le 1k2lo 1k2l\xE1 1k2l\xE9 1k2l\xED 1k2l\xF3 1k2l\xFA 1k2li 1k2lu 1k2l\xFC -1k2ra 1k2re 1k2ro 1k2r\xE1 1k2r\xE9 1k2r\xED 1k2r\xF3 1k2r\xFA 1k2ri 1k2ru 1k2r\xFC -1p2la 1p2le 1p2lo 1p2l\xE1 1p2l\xE9 1p2l\xED 1p2l\xF3 1p2l\xFA 1p2li 1p2lu 1p2l\xFC -1p2ra 1p2re 1p2ro 1p2r\xE1 1p2r\xE9 1p2r\xED 1p2r\xF3 1p2r\xFA 1p2ri 1p2ru 1p2r\xFC -1t2ra 1t2re 1t2ro 1t2r\xE1 1t2r\xE9 1t2r\xED 1t2r\xF3 1t2r\xFA 1t2ri 1t2ru 1t2r\xFC +1c2ha 1c2he 1c2ho 1c2h\xE1 1c2h\xE9 1c2h\xED 1c2h\xF3 1c2h\xFA 1c2hi 1c2hu 1c2h\xFC +1l2la 1l2le 1l2lo 1l2l\xE1 1l2l\xE9 1l2l\xED 1l2l\xF3 1l2l\xFA 1l2li 1l2lu 1l2l\xFC +1r2ra 1r2re 1r2ro 1r2r\xE1 1r2r\xE9 1r2r\xED 1r2r\xF3 1r2r\xFA 1r2ri 1r2ru 1r2r\xFC +1b2la 1b2le 1b2lo 1b2l\xE1 1b2l\xE9 1b2l\xED 1b2l\xF3 1b2l\xFA 1b2li 1b2lu 1b2l\xFC +1b2ra 1b2re 1b2ro 1b2r\xE1 1b2r\xE9 1b2r\xED 1b2r\xF3 1b2r\xFA 1b2ri 1b2ru 1b2r\xFC +1c2la 1c2le 1c2lo 1c2l\xE1 1c2l\xE9 1c2l\xED 1c2l\xF3 1c2l\xFA 1c2li 1c2lu 1c2l\xFC +1c2ra 1c2re 1c2ro 1c2r\xE1 1c2r\xE9 1c2r\xED 1c2r\xF3 1c2r\xFA 1c2ri 1c2ru 1c2r\xFC +1d2ra 1d2re 1d2ro 1d2r\xE1 1d2r\xE9 1d2r\xED 1d2r\xF3 1d2r\xFA 1d2ri 1d2ru 1d2r\xFC +1f2la 1f2le 1f2lo 1f2l\xE1 1f2l\xE9 1f2l\xED 1f2l\xF3 1f2l\xFA 1f2li 1f2lu 1f2l\xFC +1f2ra 1f2re 1f2ro 1f2r\xE1 1f2r\xE9 1f2r\xED 1f2r\xF3 1f2r\xFA 1f2ri 1f2ru 1f2r\xFC +1g2la 1g2le 1g2lo 1g2l\xE1 1g2l\xE9 1g2l\xED 1g2l\xF3 1g2l\xFA 1g2li 1g2lu 1g2l\xFC +1g2ra 1g2re 1g2ro 1g2r\xE1 1g2r\xE9 1g2r\xED 1g2r\xF3 1g2r\xFA 1g2ri 1g2ru 1g2r\xFC +1k2la 1k2le 1k2lo 1k2l\xE1 1k2l\xE9 1k2l\xED 1k2l\xF3 1k2l\xFA 1k2li 1k2lu 1k2l\xFC +1k2ra 1k2re 1k2ro 1k2r\xE1 1k2r\xE9 1k2r\xED 1k2r\xF3 1k2r\xFA 1k2ri 1k2ru 1k2r\xFC +1p2la 1p2le 1p2lo 1p2l\xE1 1p2l\xE9 1p2l\xED 1p2l\xF3 1p2l\xFA 1p2li 1p2lu 1p2l\xFC +1p2ra 1p2re 1p2ro 1p2r\xE1 1p2r\xE9 1p2r\xED 1p2r\xF3 1p2r\xFA 1p2ri 1p2ru 1p2r\xFC +1t2ra 1t2re 1t2ro 1t2r\xE1 1t2r\xE9 1t2r\xED 1t2r\xF3 1t2r\xFA 1t2ri 1t2ru 1t2r\xFC <!-- % Rule SR4 is implicitly implemented by the default values % Rule HE1 is implemented by TeX parameters \lefthyphenmin and @@ -194,7 +194,7 @@ % Rule HE2 % Break between a consonant and an h --> -b1h d1h f1h g1h j1h k1h l1h m1h n1h p1h q1h r1h s1h t1h v1h w1h x1h y1h z1h \xF11h +b1h d1h f1h g1h j1h k1h l1h m1h n1h p1h q1h r1h s1h t1h v1h w1h x1h y1h z1h \xF11h <!-- % We now avoid some problematic breaks. --> su2b2r su2b2l <!-- Modified: trunk/foray/foray-hyphen-r/resource/hyph-patterns/hyphenation.dtd =================================================================== --- trunk/foray/foray-hyphen-r/resource/hyph-patterns/hyphenation.dtd 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/resource/hyph-patterns/hyphenation.dtd 2006-06-17 21:25:29 UTC (rev 7688) @@ -12,7 +12,7 @@ <!-- Default minimun length in characters of hyphenated word fragments before and after the line break. For some languages this is not only for aesthetic purposes, wrong hyphens may be generated if this - is not accounted for. + is not accounted for. --> <!ELEMENT hyphen-min EMPTY> <!ATTLIST hyphen-min before CDATA #REQUIRED> @@ -42,7 +42,7 @@ of words. --> <!ELEMENT patterns (#PCDATA)> -<!-- A "full hyphen" equivalent to TeX's \discretionary +<!-- A "full hyphen" equivalent to TeX's \discretionary with pre-break, post-break and no-break attributes. To be used in the exceptions list, the hyphen character is not automatically added --> Modified: trunk/foray/foray-hyphen-r/resource/hyph-patterns/it.xml =================================================================== --- trunk/foray/foray-hyphen-r/resource/hyph-patterns/it.xml 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/resource/hyph-patterns/it.xml 2006-06-17 21:25:29 UTC (rev 7688) @@ -2,7 +2,7 @@ <!DOCTYPE hyphenation-info SYSTEM "hyphenation.dtd"> <!-- Created by St\xE9phane Bline - Peregrine Systems - sb...@ap... - Conversion of the original TEX italian hyphenation patterns written by + Conversion of the original TEX italian hyphenation patterns written by Claudio Beccari (be...@po...). Use of the original work granted by the author. --> @@ -73,7 +73,7 @@ .wa2g3n .wel2t1 a1ia a1ie a1io a1iu a1uo a1ya 2at. -e1iu e2w +e1iu e2w o1ia o1ie o1io o1iu '2 1b 2bb 2bc 2bd 2bf 2bm 2bn 2bp 2bs 2bt 2bv Modified: trunk/foray/foray-hyphen-r/resource/hyph-patterns/pl.xml =================================================================== --- trunk/foray/foray-hyphen-r/resource/hyph-patterns/pl.xml 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/resource/hyph-patterns/pl.xml 2006-06-17 21:25:29 UTC (rev 7688) @@ -5,7 +5,7 @@ Hyphenation patterns for Polish. Constructed by Marcin Kuthan <mk...@el...> from TeX's plhypht.tex file. - + Original comments preserved: % This is PLHYPH.TeX - the Polish hyphenation patterns Modified: trunk/foray/foray-hyphen-r/resource/hyph-patterns/ru.xml =================================================================== --- trunk/foray/foray-hyphen-r/resource/hyph-patterns/ru.xml 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/resource/hyph-patterns/ru.xml 2006-06-17 21:25:29 UTC (rev 7688) @@ -2,19 +2,19 @@ <!-- * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/ByteVector.java =================================================================== --- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/ByteVector.java 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/ByteVector.java 2006-06-17 21:25:29 UTC (rev 7688) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.hyphenR; import java.io.Serializable; Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/CharVector.java =================================================================== --- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/CharVector.java 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/CharVector.java 2006-06-17 21:25:29 UTC (rev 7688) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.hyphenR; import java.io.Serializable; Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphen.java =================================================================== --- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphen.java 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphen.java 2006-06-17 21:25:29 UTC (rev 7688) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.hyphenR; import java.io.Serializable; Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java =================================================================== --- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphenation.java 2006-06-17 21:25:29 UTC (rev 7688) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -26,7 +26,7 @@ * Known contributors: * Carlos Villegas <ca...@un...> (original author) */ - + package org.foray.hyphenR; import org.axsl.hyphenR.HyphenBreak; Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java =================================================================== --- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java 2006-06-17 21:25:29 UTC (rev 7688) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -26,7 +26,7 @@ * Known contributors: * @author Carlos Villegas <ca...@un...> (original author) */ - + package org.foray.hyphenR; import org.foray.common.StringUtilPre5; @@ -368,7 +368,7 @@ switch(c) { case '"': case '\'': { - + continue; } default: { Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java =================================================================== --- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java 2006-06-17 21:25:29 UTC (rev 7688) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.hyphenR; import org.foray.common.Logging; Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternConsumer.java =================================================================== --- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternConsumer.java 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternConsumer.java 2006-06-17 21:25:29 UTC (rev 7688) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.hyphenR; import java.util.ArrayList; Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternParser.java =================================================================== --- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternParser.java 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternParser.java 2006-06-17 21:25:29 UTC (rev 7688) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.hyphenR; import org.foray.common.Logging; Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/SerializeHyphPattern.java =================================================================== --- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/SerializeHyphPattern.java 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/SerializeHyphPattern.java 2006-06-17 21:25:29 UTC (rev 7688) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.hyphenR; import org.foray.common.Logging; Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/TernaryTree.java =================================================================== --- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/TernaryTree.java 2006-06-17 21:25:06 UTC (rev 7687) +++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/TernaryTree.java 2006-06-17 21:25:29 UTC (rev 7688) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.hyphenR; import org.foray.common.Logging; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 21:25:27
|
Revision: 7687 Author: victormote Date: 2006-06-17 14:25:06 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7687&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- trunk/foray/foray-graphic/src/java/org/foray/graphic/BMPGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java trunk/foray/foray-graphic/src/java/org/foray/graphic/GIFGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/Graphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/ImageConsumerImpl.java trunk/foray/foray-graphic/src/java/org/foray/graphic/JAIGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/PDFGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/PNGGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/BMPFactory.java trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/EPSFactory.java trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/GIFFactory.java trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/GraphicFactory.java trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/JPEGFactory.java trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/PDFFactory.java trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/PNGFactory.java trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/SVGFactory.java trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/TIFFFactory.java Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/BMPGraphic.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/BMPGraphic.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/BMPGraphic.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic; import org.axsl.graphicR.GraphicException; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic; import org.foray.common.RandomReader; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/FOrayGraphicServer.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic; import org.foray.common.Logging; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/GIFGraphic.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/GIFGraphic.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/GIFGraphic.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic; import org.axsl.graphicR.GraphicException; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/Graphic.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/Graphic.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/Graphic.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic; import org.foray.graphic.factory.GraphicFactory; @@ -136,7 +136,7 @@ } /** - * Return the image color space: DeviceGray, DeviceRGB, or DeviceCMYK. + * Return the image color space: DeviceGray, DeviceRGB, or DeviceCMYK. * @return the image color space * @exception GraphicException an error occured during property retriaval */ @@ -238,7 +238,7 @@ * <p>This method handles some of the common housekeeping work for * {@link #parseBasics()} so that it can focus on parsing. Specifically, * this method is responsible to:</p> - * + * * <ul> * <li>(Before} Check the {@link #basicsParsed} flag, and exit the parsing * if it has already been done. Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/ImageConsumerImpl.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/ImageConsumerImpl.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/ImageConsumerImpl.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic; import java.awt.image.ColorModel; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/JAIGraphic.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/JAIGraphic.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/JAIGraphic.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic; import org.axsl.graphicR.GraphicException; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/JPEGGraphic.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic; import org.axsl.graphicR.GraphicException; @@ -248,7 +248,7 @@ // Check if ICC profile byte[] icc_string = new byte[11]; System.arraycopy(this.content, index+4, icc_string, 0, 11); - + /* byte[] acsp = new byte[4]; System.arraycopy(this.m_bitmaps, index+18+36, acsp, 0, 4); @@ -264,7 +264,7 @@ // eller 18.. iccStream.write(this.content, index+16, chunkSize - 18); } - + } private void getColorSpace(int index) { @@ -327,7 +327,7 @@ /** * Override the Graphic method because, for JPEG, we load the whole image - * to get its dimensions. + * to get its dimensions. */ public int pixelWidth() throws GraphicException { this.loadImageWrapper(); @@ -336,7 +336,7 @@ /** * Override the Graphic method because, for JPEG, we load the whole image - * to get its dimensions. + * to get its dimensions. */ public int pixelHeight() throws GraphicException { this.loadImageWrapper(); Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/PDFGraphic.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/PDFGraphic.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/PDFGraphic.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic; import org.axsl.graphicR.GraphicException; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/PNGGraphic.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/PNGGraphic.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/PNGGraphic.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic; import java.io.BufferedInputStream; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/SVGGraphic.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic; import org.axsl.graphicR.GraphicException; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/BMPFactory.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/BMPFactory.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/BMPFactory.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic.factory; import org.foray.graphic.Graphic; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/EPSFactory.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/EPSFactory.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/EPSFactory.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic.factory; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/GIFFactory.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/GIFFactory.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/GIFFactory.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic.factory; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/GraphicFactory.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/GraphicFactory.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/GraphicFactory.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/JPEGFactory.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/JPEGFactory.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/JPEGFactory.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic.factory; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/PDFFactory.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/PDFFactory.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/PDFFactory.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2005 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic.factory; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/PNGFactory.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/PNGFactory.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/PNGFactory.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic.factory; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/SVGFactory.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/SVGFactory.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/SVGFactory.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic.factory; import org.foray.graphic.Graphic; Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/TIFFFactory.java =================================================================== --- trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/TIFFFactory.java 2006-06-17 21:18:47 UTC (rev 7686) +++ trunk/foray/foray-graphic/src/java/org/foray/graphic/factory/TIFFFactory.java 2006-06-17 21:25:06 UTC (rev 7687) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.graphic.factory; import org.foray.graphic.Graphic; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 21:19:28
|
Revision: 7686 Author: victormote Date: 2006-06-17 14:18:47 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7686&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java trunk/foray/foray-font/src/java/org/foray/font/FontConfig.java trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java trunk/foray/foray-font/src/java/org/foray/font/charset/CharSet.java trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetExtendedRoman.java trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetParser.java trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java trunk/foray/foray-font/src/java/org/foray/font/format/FontFileReader.java trunk/foray/foray-font/src/java/org/foray/font/format/Kerning.java trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileReader.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFFile.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFFileSingle.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFMtxEntry.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFReader.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTable.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCFF.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirEntry.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirectory.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableGLYF.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHEAD.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHHEA.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHMTX.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableKERN.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableLOCA.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableMAXP.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableNAME.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableOS2.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTablePCLT.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTablePOST.java trunk/foray/foray-font/src/java/org/foray/font/format/Type1File.java trunk/foray/foray-font/src/java/org/foray/font/format/Type1PFAFile.java trunk/foray/foray-font/src/java/org/foray/font/format/Type1PFBFile.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -44,7 +44,7 @@ * a FontConsumer.</li> * <li>To handle subsetting.</li> * </ul> - * + * */ public class FOrayConsumerFont { Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2005 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,23 +1,23 @@ /* * Copyright 2005 The aXSL Project. * http://www.axsl.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * */ /* $Id$ */ - + package org.foray.font; import org.axsl.fontR.Font; @@ -35,7 +35,7 @@ * An implementation of the aXSL {@link FontConsumer} interface. * Instances are obtained by using the FOrayFontConsumer constructor(s). * FOrayFontConsumer instances can then be used to obtain implementations of - * FontUse and Font which provide direct services to the client application. + * FontUse and Font which provide direct services to the client application. */ public class FOrayFontConsumer implements FontConsumer { @@ -452,7 +452,7 @@ } /** - * + * * @param font The Font instance for which we wish to find the * related FontUse instance. * @return The related FontUse instance. Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.foray.common.Environment; @@ -482,7 +482,7 @@ } if (fontFamilyAliases.containsKey(alias)) { RegisteredFontFamily family = - ((RegisteredFontFamily)fontFamilyAliases.get(alias)); + ((RegisteredFontFamily)fontFamilyAliases.get(alias)); throw new FontException("Alias " + alias + " already registered to family " + family.getName()); } Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.axsl.fontR.FontConsumer; Modified: trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FSTrueTypeFont.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.foray.common.IOUtil; Modified: trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.foray.font.format.FontFileReader; @@ -114,7 +114,7 @@ * http://www.adobe.com/support/salesdocs/10702.htm, which states: * "Although all Type 1 fonts can be embedded in PDF files, some * TrueType font manufacturers place embedding restrictions on their - * fonts...." + * fonts...." */ fontAllowsEmbedding = true; Modified: trunk/foray/foray-font/src/java/org/foray/font/FontConfig.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontConfig.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FontConfig.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.foray.common.ClasspathHandler; Modified: trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FontSelector.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FontSelectorCBC.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -37,7 +37,7 @@ /** * Base class for all fonts that are registered independently of the operating * system's font registration. - * + * * Fonts that are not FreeStandingFonts are SystemFonts. Access to SystemFont * capabilities is handled entirely through the parent Font class. However, * FreeStandingFonts can be embedded, and this capability requires that more of @@ -212,7 +212,7 @@ } /* If the fontFile exists, embed it. */ if (getRegisteredFont().getFontFileReader() != null) { - return true; + return true; } return false; } @@ -311,7 +311,7 @@ if (compare != 0) { return compare; } - // If those are equal, test the configured font name + // If those are equal, test the configured font name compare = getRegisteredFont().getConfiguredFontName().compareTo( anotherFSF.getRegisteredFont().getConfiguredFontName()); if (compare != 0) { Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.foray.font.format.FontFileReader; @@ -44,14 +44,14 @@ * turn points to RegisteredFont instance. * It then, as requested, converts that information into actual Font instances * that can be used by the client application.</p> - * + * * It is tempting to question why this separate class is needed. Because fonts * can be registered from several sources (hard-coded, font configuration, * operating system registration, and directly by the client application), a * separate registry concept ensures that all of the registered fonts can be * managed, even though they may not have been parsed yet. It is good to not * parse the font until it is known to be necessary. - * + * * Note that the data stored in RegisteredFont corresponds to the data passed * in the <font> element of the font configuration file. * Data from the actual font file itself tends to be stored in FreeStandingFont @@ -92,7 +92,7 @@ * the TTC that should be used. */ private String ttcName = null; - + /** {@link FOrayFont#FORMAT_UNKNOWN}, {@link FOrayFont#FORMAT_TYPE1}, or * {@link FOrayFont#FORMAT_TRUETYPE}. */ private int fontFormat = FOrayFont.FORMAT_UNKNOWN; @@ -194,7 +194,7 @@ } /** - * + * */ private void createSystemFont() { if (this.systemFontCreationCompleted) { Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontDesc.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2005 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFontFamily.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.axsl.fontR.FontException; Modified: trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font; import org.foray.font.charset.CharSet; Modified: trunk/foray/foray-font/src/java/org/foray/font/charset/CharSet.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/charset/CharSet.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/charset/CharSet.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2005 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -31,7 +31,7 @@ * <p>Instances of CharSet are collections of related characters. * Fonts are frequently designed to cover a specific collection of characters. * For example, 12 of the Base-14 fonts cover the ExtendedRoman collection.</p> - * + * * <p>The main purpose of the class is to efficiently map a Unicode code point * to an array index that can be used in other classes to store information * about that code point. Modified: trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetExtendedRoman.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetExtendedRoman.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetExtendedRoman.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetParser.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetParser.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetParser.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2005 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.charset; import org.foray.common.Logging; @@ -206,7 +206,7 @@ /** * Main method useful for parsing a glyph list file from the command-line - * and generating the java code that encapsulates that glyph list. + * and generating the java code that encapsulates that glyph list. * @param args Element 0 is the URL of the glyph list to be parsed. * Element 1 is the URL of the file to which the java source code should be * written. Modified: trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/charset/CharSetWindowsANSI.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-font/src/java/org/foray/font/format/FontFileReader.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/FontFileReader.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/FontFileReader.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.common.RandomReader; @@ -158,7 +158,7 @@ /** * Per the TTF Spec, Chapter 2 (Data Types), the "FIXED" data type is a * 16-bit signed twos-complement mantissa, followed by a 16-bit unsigned - * fraction. + * fraction. */ public float readTTFFixed() throws IOException { float ttfFixed = readShort(); Modified: trunk/foray/foray-font/src/java/org/foray/font/format/Kerning.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/Kerning.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/Kerning.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; /** Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFile.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.font.charset.CharSet; @@ -52,7 +52,7 @@ protected int dfMaxWidth; protected int dfMinWidth; protected int[] fontBBox = new int[4]; - + // Extension stuff // --- Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileAFM.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.font.charset.CharSet; @@ -1019,7 +1019,7 @@ /* * Per Section 3, para 4, this is a user-defined non-standard * entry, and we should just ignore it. - */ + */ return; } if (firstChar < 0x20) { Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFilePFM.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.font.charset.CharSet; Modified: trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileReader.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileReader.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/MetricsFileReader.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.common.RandomReader; Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFFile.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFFile.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFFile.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.apache.commons.logging.Log; @@ -44,7 +44,7 @@ * TTFTable</pre></p> * * Each child keeps a reference to its parent. - * + * * Each TTFTable instance is essentially a parsed TTFDirTabEntry instance, and * therefore there is a logical one-to-one relationship between the instances. * However, it is possible that not all TTFDirTabEntrie instances will be parsed @@ -58,7 +58,7 @@ * Because TTFDirTabEntry/TTFTable instances can be shared between fonts, they * are directly children of a TTFFile instance, not to a * TTFTableDirectory/TTFFont pair. - * + * * The TrueType spec can be found at the Microsoft * Typography site: http://www.microsoft.com/truetype/ */ Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFFileSingle.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFFileSingle.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFFileSingle.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import java.io.IOException; Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFFont.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.ps.encode.CMap; @@ -82,7 +82,7 @@ /** * This method should never need to be used by anything except * {@link TTFTableDirectory#getTTFFont()}, which ensures that there is a - * one-to-one relationship between TTFFont and TTFTableDirectory. + * one-to-one relationship between TTFFont and TTFTableDirectory. */ static TTFFont makeTTFFont(TTFTableDirectory ttfTableDir) { if (ttfTableDir == null) { Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFMtxEntry.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFMtxEntry.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFMtxEntry.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; class TTFMtxEntry { Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFReader.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFReader.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFReader.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.common.Logging; Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.font.Subset; @@ -289,7 +289,7 @@ return null; } ttfFont.seek_tab("maxp"); - byte[] byteArray = copyTableToByteArray(entry.getLength()); + byte[] byteArray = copyTableToByteArray(entry.getLength()); /* Set numGlyphs to its proper value. */ writeUShort(byteArray, 4, this.subset.numGlyphsUsed()); return byteArray; @@ -304,7 +304,7 @@ return null; } ttfFont.seek_tab("prep"); - return copyTableToByteArray(entry.getLength()); + return copyTableToByteArray(entry.getLength()); } @@ -422,7 +422,7 @@ byte[] byteArray = createTableByteArray(arraySize); for (int i = 0; i < subset.numGlyphsUsed(); i ++) { int originalIndex = this.subset.decodeSubsetIndex(i); - writeUShort(byteArray, i * 4, + writeUShort(byteArray, i * 4, ttfFont.getTTFTableHMTX().metrics[originalIndex].wx); writeUShort(byteArray, (i * 4) + 2, ttfFont.getTTFTableHMTX().metrics[originalIndex].lsb); Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTable.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTable.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTable.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.apache.commons.logging.Log; Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCFF.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCFF.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCFF.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import java.io.IOException; Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.font.format; import org.foray.ps.encode.CMap; @@ -136,30 +136,30 @@ getReader().skipBytes(2); // Skip searchRange getReader().skipBytes(2); // Skip entrySelector getReader().skipBytes(2); // Skip rangeShift - + char[] endCount = new char[segCountX2 / 2]; char[] startCount = new char[segCountX2 / 2]; int deltas[] = new int[segCountX2 / 2]; int rangeOffset[] = new int[segCountX2 / 2]; - + for (int i = 0; i < (segCountX2 / 2); i++) { endCount[i] = (char) getReader().readUnsignedShort(); } - + getReader().skipBytes(2); // Skip reservedPad - + for (int i = 0; i < (segCountX2 / 2); i++) { startCount[i] = (char) getReader().readUnsignedShort(); } - + for (int i = 0; i < (segCountX2 / 2); i++) { deltas[i] = getReader().readShort(); } - + for (int i = 0; i < (segCountX2 / 2); i++) { rangeOffset[i] = getReader().readUnsignedShort(); } - + int glyphIdArrayOffset = (int)getReader().getFilePointer(); // Parse the table entries and build a CMap4 from them. @@ -209,7 +209,7 @@ String encodingName = "internal-" + this.ttfFont.getPostscriptName(); CMap12 cmap12 = new CMap12(encodingName, nGroups); - + for (int i = 0; i < nGroups; i++) { int startCharCode = (int) getReader().readUnsignedInt(); int endCharCode = (int) getReader().readUnsignedInt(); Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirEntry.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirEntry.java 2006-06-17 21:13:33 UTC (rev 7685) +++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableDirEntry.java 2006-06-17 21:18:47 UTC (rev 7686) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software *... [truncated message content] |
|
From: <vic...@us...> - 2006-06-17 21:13:44
|
Revision: 7685 Author: victormote Date: 2006-06-17 14:13:33 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7685&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- trunk/foray/foray-core/src/java/org/foray/core/Application.java trunk/foray/foray-core/src/java/org/foray/core/ConfigurationParser.java trunk/foray/foray-core/src/java/org/foray/core/DocumentInputSource.java trunk/foray/foray-core/src/java/org/foray/core/DocumentReader.java trunk/foray/foray-core/src/java/org/foray/core/FOInputHandler.java trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java trunk/foray/foray-core/src/java/org/foray/core/FOraySession.java trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java trunk/foray/foray-core/src/java/org/foray/core/InputHandler.java trunk/foray/foray-core/src/java/org/foray/core/SessionConfig.java trunk/foray/foray-core/src/java/org/foray/core/TraxInputHandler.java Modified: trunk/foray/foray-core/src/java/org/foray/core/Application.java =================================================================== --- trunk/foray/foray-core/src/java/org/foray/core/Application.java 2006-06-17 21:11:11 UTC (rev 7684) +++ trunk/foray/foray-core/src/java/org/foray/core/Application.java 2006-06-17 21:13:33 UTC (rev 7685) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.core; /** Modified: trunk/foray/foray-core/src/java/org/foray/core/ConfigurationParser.java =================================================================== --- trunk/foray/foray-core/src/java/org/foray/core/ConfigurationParser.java 2006-06-17 21:11:11 UTC (rev 7684) +++ trunk/foray/foray-core/src/java/org/foray/core/ConfigurationParser.java 2006-06-17 21:13:33 UTC (rev 7685) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.core; import org.foray.common.Configuration; @@ -241,7 +241,7 @@ return ""; } return locator.getSystemId() + ":" + locator.getLineNumber() + ":" - + locator.getColumnNumber(); + + locator.getColumnNumber(); } } Modified: trunk/foray/foray-core/src/java/org/foray/core/DocumentInputSource.java =================================================================== --- trunk/foray/foray-core/src/java/org/foray/core/DocumentInputSource.java 2006-06-17 21:11:11 UTC (rev 7684) +++ trunk/foray/foray-core/src/java/org/foray/core/DocumentInputSource.java 2006-06-17 21:13:33 UTC (rev 7685) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.core; import org.w3c.dom.Document; Modified: trunk/foray/foray-core/src/java/org/foray/core/DocumentReader.java =================================================================== --- trunk/foray/foray-core/src/java/org/foray/core/DocumentReader.java 2006-06-17 21:11:11 UTC (rev 7684) +++ trunk/foray/foray-core/src/java/org/foray/core/DocumentReader.java 2006-06-17 21:13:33 UTC (rev 7685) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.core; Modified: trunk/foray/foray-core/src/java/org/foray/core/FOInputHandler.java =================================================================== --- trunk/foray/foray-core/src/java/org/foray/core/FOInputHandler.java 2006-06-17 21:11:11 UTC (rev 7684) +++ trunk/foray/foray-core/src/java/org/foray/core/FOInputHandler.java 2006-06-17 21:13:33 UTC (rev 7685) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.core; Modified: trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java =================================================================== --- trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java 2006-06-17 21:11:11 UTC (rev 7684) +++ trunk/foray/foray-core/src/java/org/foray/core/FOrayDocument.java 2006-06-17 21:13:33 UTC (rev 7685) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java =================================================================== --- trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java 2006-06-17 21:11:11 UTC (rev 7684) +++ trunk/foray/foray-core/src/java/org/foray/core/FOrayException.java 2006-06-17 21:13:33 UTC (rev 7685) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.core; import org.xml.sax.SAXException; Modified: trunk/foray/foray-core/src/java/org/foray/core/FOraySession.java =================================================================== --- trunk/foray/foray-core/src/java/org/foray/core/FOraySession.java 2006-06-17 21:11:11 UTC (rev 7684) +++ trunk/foray/foray-core/src/java/org/foray/core/FOraySession.java 2006-06-17 21:13:33 UTC (rev 7685) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java =================================================================== --- trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java 2006-06-17 21:11:11 UTC (rev 7684) +++ trunk/foray/foray-core/src/java/org/foray/core/FOrayTarget.java 2006-06-17 21:13:33 UTC (rev 7685) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.core; import org.axsl.output.OutputTarget; @@ -148,7 +148,7 @@ this.fontConsumer = server.makeFontConsumer(); this.fontConsumer.setFontSources(this.getOutputTarget() .getFontSources()); - + /* Finish configuring the OutputTarget. */ this.outputTarget.setOutputStream(this.getOutputStream()); this.outputTarget.setApplicationName( @@ -296,7 +296,7 @@ } public synchronized void queuePage(PageArea page) throws AreaWException { - /* + /* * We run the pages through a queue because any page page that contains * an unresolved ref-id prevents subsequent pages from being rendered. * So, first we add them to the queue. Then, we check to see if Modified: trunk/foray/foray-core/src/java/org/foray/core/InputHandler.java =================================================================== --- trunk/foray/foray-core/src/java/org/foray/core/InputHandler.java 2006-06-17 21:11:11 UTC (rev 7684) +++ trunk/foray/foray-core/src/java/org/foray/core/InputHandler.java 2006-06-17 21:13:33 UTC (rev 7685) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.core; Modified: trunk/foray/foray-core/src/java/org/foray/core/SessionConfig.java =================================================================== --- trunk/foray/foray-core/src/java/org/foray/core/SessionConfig.java 2006-06-17 21:11:11 UTC (rev 7684) +++ trunk/foray/foray-core/src/java/org/foray/core/SessionConfig.java 2006-06-17 21:13:33 UTC (rev 7685) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.core; import org.foray.common.Configuration; Modified: trunk/foray/foray-core/src/java/org/foray/core/TraxInputHandler.java =================================================================== --- trunk/foray/foray-core/src/java/org/foray/core/TraxInputHandler.java 2006-06-17 21:11:11 UTC (rev 7684) +++ trunk/foray/foray-core/src/java/org/foray/core/TraxInputHandler.java 2006-06-17 21:13:33 UTC (rev 7685) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.core; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 21:11:32
|
Revision: 7684 Author: victormote Date: 2006-06-17 14:11:11 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7684&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- trunk/foray/foray-common/src/java/org/foray/common/ClassService.java trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java trunk/foray/foray-common/src/java/org/foray/common/ColorSpaceCMYK.java trunk/foray/foray-common/src/java/org/foray/common/Configuration.java trunk/foray/foray-common/src/java/org/foray/common/Environment.java trunk/foray/foray-common/src/java/org/foray/common/IOUtil.java trunk/foray/foray-common/src/java/org/foray/common/Logging.java trunk/foray/foray-common/src/java/org/foray/common/MUserAgent.java trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java trunk/foray/foray-common/src/java/org/foray/common/RandomInput.java trunk/foray/foray-common/src/java/org/foray/common/RandomReader.java trunk/foray/foray-common/src/java/org/foray/common/RandomReaderArray.java trunk/foray/foray-common/src/java/org/foray/common/RandomReaderRAFile.java trunk/foray/foray-common/src/java/org/foray/common/RandomReaderURL.java trunk/foray/foray-common/src/java/org/foray/common/SVGUserAgent.java trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java trunk/foray/foray-common/src/java/org/foray/common/URLBuilder.java trunk/foray/foray-common/src/java/org/foray/common/XMLCharacter.java trunk/foray/foray-common/src/java/org/foray/common/XMLParser.java trunk/foray/foray-common/src/java/org/foray/common/XMLUtil.java Modified: trunk/foray/foray-common/src/java/org/foray/common/ClassService.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/ClassService.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/ClassService.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-common/src/java/org/foray/common/ColorSpaceCMYK.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/ColorSpaceCMYK.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/ColorSpaceCMYK.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-common/src/java/org/foray/common/Configuration.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/Configuration.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/Configuration.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.common; import org.apache.commons.logging.Log; @@ -41,7 +41,7 @@ * All options are stored in key / value pairs. * Protected Convenience methods are available to handle Boolean, Int, String, * and List values. - * + * * <p>Most accessor methods are protected. The purpose is to force clients * to use the subclass accessor methods instead, where more intelligence can * be applied with regard to handling null values, etc. Applications that wish Modified: trunk/foray/foray-common/src/java/org/foray/common/Environment.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/Environment.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/Environment.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.common; import java.awt.GraphicsEnvironment; Modified: trunk/foray/foray-common/src/java/org/foray/common/IOUtil.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/IOUtil.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/IOUtil.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.common; import java.io.ByteArrayOutputStream; Modified: trunk/foray/foray-common/src/java/org/foray/common/Logging.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/Logging.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/Logging.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2005 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-common/src/java/org/foray/common/MUserAgent.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/MUserAgent.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/MUserAgent.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2005 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -34,7 +34,7 @@ /** * An implementation of the TreeNode interface that provides methods for various * traversal needs. - * + * * <p>Consideration was given to using * {@link DefaultMutableTreeNode} instead of creating this class. * However, the data portion of that class was not deemed suitable.</p> Modified: trunk/foray/foray-common/src/java/org/foray/common/RandomInput.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/RandomInput.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/RandomInput.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.common; import java.io.DataInput; @@ -35,7 +35,7 @@ * RandomAccessFile. This interface will generally be useful for classes * providing random input access to a file or file-like structure, i.e. file * readers or parsers. - * + * * @see java.io.DataInput * @see java.io.RandomAccessFile */ Modified: trunk/foray/foray-common/src/java/org/foray/common/RandomReader.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/RandomReader.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/RandomReader.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.common; import java.io.EOFException; @@ -31,7 +31,7 @@ import java.net.URL; /** - * Class managing random-access input. + * Class managing random-access input. * This class both wraps a RandomInput implementation and implements RandomInput * itself. This is so that the wrapping will be totally transparent. The main * reason for wrapping another instance is so that different readers can be @@ -369,7 +369,7 @@ * amount of memory is read and searched. * Please note that searchBytes is looking for bytes that match, not * characters that match. - * @param bytesToFind The byte array containing the content to be matched. + * @param bytesToFind The byte array containing the content to be matched. * @param startRange The offset in the file for the start of the range that * should be searched. To have the range start at the beginning of the file, * set this value to zero. startRange should always be less than endRange, @@ -432,7 +432,7 @@ /** * Returns the first URL in an array that is suitable for use as a - * parameter to the RandomReader constructor. + * parameter to the RandomReader constructor. * @param urlArray An array containing a list of URLs to be tested. * @return The first qualifying URL, or null if there are none. */ @@ -459,7 +459,7 @@ * viewbox over the contents of the file to see it. (We slide the * box in big chunks to minimize the cost of i/o operations. If performance * were not an issue, we could just read the file one byte at a time). - * + * * If we are reading the file forward, we will be sliding the right end of * the viewbox over the left end of the file. If we are reading the file * backward, we will be sliding the left end of the viewbox over the right @@ -571,7 +571,7 @@ // Read the first two chunks to get the pump primed readNextChunk(); readNextChunk(); - + while (offsetToContent < 0 && ! endOfFile) { searchForMatch(); if (endOfFile) { @@ -619,7 +619,7 @@ viewboxTarget = computeViewboxTarget(); /* * Shift the contents of the viewbox as needed to make room for the - * read. Only move it by the actual number of bytes to be read. + * read. Only move it by the actual number of bytes to be read. */ if (readBackward) { // Shift the array elements to the right by actualReadSize @@ -678,7 +678,7 @@ } } if (value < startRange) { - value = startRange; + value = startRange; } return value; } @@ -699,7 +699,7 @@ } } if (value > endRange) { - readEnd = endRange; + readEnd = endRange; } return value; } @@ -721,7 +721,7 @@ if (startRange >= endRange) { return false; } - return true; + return true; } } Modified: trunk/foray/foray-common/src/java/org/foray/common/RandomReaderArray.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/RandomReaderArray.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/RandomReaderArray.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.common; import java.io.ByteArrayInputStream; Modified: trunk/foray/foray-common/src/java/org/foray/common/RandomReaderRAFile.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/RandomReaderRAFile.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/RandomReaderRAFile.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.common; import java.io.File; @@ -139,7 +139,7 @@ * {@inheritDoc} */ public void reset() { - /* For now, do nothing here. It is possible that nullifying the + /* For now, do nothing here. It is possible that nullifying the * RandomAccessFile instance variable would release some resources, but * probably not enough to make it worth the cost of restarting later. */ Modified: trunk/foray/foray-common/src/java/org/foray/common/RandomReaderURL.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/RandomReaderURL.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/RandomReaderURL.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.common; import java.io.IOException; Modified: trunk/foray/foray-common/src/java/org/foray/common/SVGUserAgent.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/SVGUserAgent.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/SVGUserAgent.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.common; import org.apache.batik.bridge.UserAgentAdapter; Modified: trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/StringUtil.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.common; /** Modified: trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/StringUtilPre5.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id: StringUtil.java 6807 2006-02-24 22:48:53Z victormote $ */ - + package org.foray.common; import com.ibm.icu.lang.UCharacter; Modified: trunk/foray/foray-common/src/java/org/foray/common/URLBuilder.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/URLBuilder.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/URLBuilder.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.common; import java.io.File; @@ -54,7 +54,7 @@ public static URL buildURL(String spec) throws MalformedURLException { if (spec == null) { throw new NullPointerException("spec must not be null"); - } + } File f = new File(spec); if (f.exists()) { return f.toURL(); @@ -83,7 +83,7 @@ } catch (MalformedURLException mfue) { if (baseURL == null) { throw mfue; - } + } URL u2 = new URL(baseURL, spec); return u2; } @@ -97,7 +97,7 @@ * frequently the case that resources identified by URL must be tried * several times as various possibilities are attempted. To standardize * this, three possibilities were considered:</p> - * + * * <ol> * <li>Loop through the possibilities here, attempting to open each * one. When one is successfully opened, return the URL.</li> @@ -106,13 +106,13 @@ * <li>Build and return a collection of possibilities & let the client * manage the process.</li> * </ol> - * + * * <p>Of these three, 1 forces the URL to be opened twice, which was deemed * wasteful. 2 seems like way too much trouble for such a simple task. * An object would have to be created to manage the state information. * 3, while somewhat wasteful, seems much less wasteful than the other two, * and is the plan that was adopted.</p> - * + * * @param baseURLs Array of URLs containing possible paths that should be * tried used as the base for relative URLs. * @param urlSpecified String containing the name of the URL. @@ -155,13 +155,13 @@ /* * The following piece of code is based on the following statement in * RFC2396 section 5.2: - * + * * 3) If the scheme component is defined, indicating that the * reference starts with a scheme name, then the reference is * interpreted as an absolute URI and we are done. Otherwise, * the reference URI's scheme is inherited from the base URI's * scheme component. - * + * * Due to a loophole in prior specifications [RFC1630], some * parsers allow the scheme name to be present in a relative * URI if it is the same as the base URI scheme. Unfortunately, @@ -170,7 +170,7 @@ * implementation may work around such references by removing * the scheme if it matches that of the base URI and the scheme * is known to always use the <hier_part> syntax. - * + * * The URL class does not implement this work around, so we do. */ if (baseURLs != null) { @@ -210,7 +210,7 @@ * preceded by "url(" and followed by ")". This method validates and * normalizes that input. * @param input The uri-specification as defined in the XSL-FO Standard 1.0, - * Section 5.11. + * Section 5.11. * @return The normalized String, or null if the input is not valid. */ public static String normalizeURISpecification(String input) { Modified: trunk/foray/foray-common/src/java/org/foray/common/XMLCharacter.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/XMLCharacter.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/XMLCharacter.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -244,7 +244,7 @@ private static final char[] IDEOGRAPHIC = { 0x4E00, 0x9FA5, 0x3007, 0x3007, - 0x3021, 0x3029, + 0x3021, 0x3029, }; private static final char[] COMBINING_CHAR = { @@ -555,7 +555,7 @@ * @param c The char which should be converted to a predefined XML entity * reference. * @return A string containing the predefined XML entity reference for - * <code>c</code>. + * <code>c</code>. */ public static String expandEntityReference(char c) { switch (c) { Modified: trunk/foray/foray-common/src/java/org/foray/common/XMLParser.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/XMLParser.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/XMLParser.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2005 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-common/src/java/org/foray/common/XMLUtil.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/XMLUtil.java 2006-06-17 20:59:22 UTC (rev 7683) +++ trunk/foray/foray-common/src/java/org/foray/common/XMLUtil.java 2006-06-17 21:11:11 UTC (rev 7684) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 20:59:59
|
Revision: 7683 Author: victormote Date: 2006-06-17 13:59:22 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7683&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/Area.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java trunk/foray/foray-areatree/src/java/org/foray/area/FOrayAreaTreeFactory.java trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NonArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java trunk/foray/foray-areatree/src/java/org/foray/area/SVGArea.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableBodyContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableFooterContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableHeaderContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRA.java trunk/foray/foray-areatree/src/java/org/foray/area/TableRowContainer.java trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractInlineArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.GeneralInlineArea; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractNormalBlockArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractPlaceholder.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaW.TableRowContainer; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaW.AreaWException; @@ -51,7 +51,7 @@ org.axsl.areaW.Area { /** - * + * * @param generatedBy * @param parentArea */ @@ -611,7 +611,7 @@ } return y; } - + /** * @return The inline-progression-dimension of the * normal-allocation-rectangle for this Area. @@ -825,7 +825,7 @@ } /** - * + * * @return -1 for "auto. */ public int traitBPDimensionMin() { @@ -833,7 +833,7 @@ } /** - * + * * @return -1 for "auto. */ public int traitBPDimensionOpt() { @@ -841,7 +841,7 @@ } /** - * + * * @return -1 for "auto. */ public int traitBPDimensionMax() { @@ -858,7 +858,7 @@ } /** - * + * * @return -1 for "auto. */ public int traitIPDimensionMin() { @@ -866,7 +866,7 @@ } /** - * + * * @return -1 for "auto. */ public int traitIPDimensionOpt() { @@ -874,7 +874,7 @@ } /** - * + * * @return -1 for "auto. */ public int traitIPDimensionMax() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFixed.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaFlexible.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -67,7 +67,7 @@ * factor in determining what absolute position the Area occupies. * This should not be used for items like start-indent, which are actually * inside the Area itself.</p> - * + * * <p>Systems that <em>compute</em> anteriorSpace need to consider * space-after and space-end constraints from previous Areas in that * computation, but only the resolved value needs to be stored in the Area @@ -77,11 +77,11 @@ * Area needs to know how much space to place before itself, but the last * Area does not need to know how much space to place after itself, i.e. * space after the last Area is a no op.</p> - * + * * <p>The value is stored in the AreaFlexible, and the AreaFlexible will * initialize it with some reasonable amount, but the Layout system is * responsible to compute and set its final value.</p> - * + * * @return Returns the anteriorSpace. */ public int getAnteriorSpace() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.foray.common.OrderedTreeNode; @@ -367,7 +367,7 @@ } /** - * @return The ancestor SpanRA, or null if there is none. + * @return The ancestor SpanRA, or null if there is none. */ public SpanRA ancestorSpanRA() { AreaNode parent = getAreaNodeParent(); @@ -378,7 +378,7 @@ } /** - * @return The ancestor LineArea, or null if there is none. + * @return The ancestor LineArea, or null if there is none. */ public LineArea ancestorLineArea() { AreaNode parent = getAreaNodeParent(); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BasicLinkArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BeforeFloatRA.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.RenderVisitor; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.foR.FObj; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.BlockContainerArea; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTitleArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -28,7 +28,7 @@ import org.axsl.foR.fo.BookmarkTitle; /** - * The AreaTree representation of an fo:bookmark-title object. + * The AreaTree representation of an fo:bookmark-title object. */ public class BookmarkTitleArea extends NonArea implements org.axsl.areaR.BookmarkTitleArea { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BookmarkTreeArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ContainerRA.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaW.AreaWException; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.RenderVisitor; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkage.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageMarker.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOLinkageNormal.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FOrayAreaTreeFactory.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FOrayAreaTreeFactory.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FOrayAreaTreeFactory.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2005 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaW.AreaTreeFactory; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/FootnoteRA.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.RenderVisitor; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.RenderVisitor; @@ -55,7 +55,7 @@ // Create the reference area for the content. ForeignXML foreign = generatedBy.getForeignXML(); - if (foreign instanceof SVGElement) { + if (foreign instanceof SVGElement) { new SVGArea((SVGElement) foreign, this, retrieveMarker); } this.ancestorLineArea().lineContentChanged(); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.foR.FObj; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/InlineArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.foR.FOText; @@ -185,7 +185,7 @@ */ public int dotLeaderTextOffset() { switch (traitLeaderAlignment()) { - case Constants.FOVAL_REFERENCE_AREA: { + case Constants.FOVAL_REFERENCE_AREA: { } case Constants.FOVAL_PAGE: { } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.RenderVisitor; @@ -219,7 +219,7 @@ } /** - * + * */ private void optimizeSpecifiedWordSpacing() { int unusedSpace = this.progressionDimensionAvailable(); @@ -360,7 +360,7 @@ } /** - * + * */ private void optimizeImpliedWordSpacing() { int unusedSpace = this.progressionDimensionAvailable(); @@ -438,7 +438,7 @@ } return true; } - + /** * @return True iff this is the last LineArea instance generated by the * parent Block. @@ -515,7 +515,7 @@ default: { return 0; } - } + } } /* Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ListBlockArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.MainReferenceArea; @@ -146,7 +146,7 @@ if ((span == Constants.FOVAL_ALL) && (spanArea.traitColumnCount() == 1)) { return false; - } else if ((span == Constants.FOVAL_NONE) + } else if ((span == Constants.FOVAL_NONE) && (spanArea.traitColumnCount() == traitColumnCount())) { return false; } else if (span == Constants.FOVAL_ALL) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/MarkerContentArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NonArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NonArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NonArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalBlockArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.RenderVisitor; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.NormalFlowArea; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.RenderVisitor; @@ -68,7 +68,7 @@ super(pageSeq, areaTree); } - /* + /* * Overrides Area method, because anybody trying to run that method * on an AreaTree instance will get an NPE, since it uses getParent(). */ @@ -197,38 +197,38 @@ if (pagesToAdd > 0) { /* * For now, the most number of blank pages we will create here is 1. - * + * * We could conceivably create as many blank pages as would be required * to get to a user-set initial-page-number="<number>", but for now we * won't. - * + * * It is tempting to ensure that an odd initial-page-number will start * on an odd page, and vice versa, but we won't do that because the * user has the ability to tell us to do that explicitly. - * + * * For other initial-page-number settings, there could be as many as * 3 blank pages generated between page-sequences. We're not sure, but * we think that this is not the intent of the standard. Here are some * examples: - * + * * Example 1: The previous page-sequence has * force-page-count="end-on-even", the last page with content in that * page-sequence is an odd page, and the current page-sequence has * initial-page-number="auto-odd". There must be two blank pages to * satisfy these constraints, one created at the end of the previous * page-sequence, one at the beginning of this one. - * + * * Example 2: The same as Example 1, except that the current * page-sequence has initial-page-number="auto-even". Unless a page * can be part of two different page sequences, this requires a total * of three blank pages, one created at the end of the previous * page-sequence, and two at the beginning of this one. - * + * * The standard does not seem to be clear on this issue. For now, we * will assume that the intent of the standard is that there could be * 0, 1, or 2 blank pages, but not any more than that. For there to be * more than one, one would have to be generated in the padPagesAtEnd - * method, so the most we should allow here is 1. + * method, so the most we should allow here is 1. */ PageSequence previousPageSequence = previousPageCollection.getPageSequence(); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.RenderVisitor; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.area; import org.axsl.areaR.RenderVisitor; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-06-17 20:53:41 UTC (rev 7682) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-06-17 20:59:22 UTC (rev 7683) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is dis... [truncated message content] |
|
From: <vic...@us...> - 2006-06-17 20:54:10
|
Revision: 7682 Author: victormote Date: 2006-06-17 13:53:41 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7682&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java trunk/foray/foray-app/src/java/org/foray/app/FOray.java trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java trunk/foray/foray-app/src/java/org/foray/app/Options.java trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java trunk/foray/foray-app/src/java/org/foray/app/Starter.java trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java trunk/foray/foray-app/src/java/org/foray/app/ant/RunTest.java trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2XML.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2FO.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/embed/EmbedDemo.java trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectMember.java trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeam.java trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamInputSource.java trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamXMLReader.java trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/AbstractObjectReader.java trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyContentHandlerProxy.java trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java Modified: trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.app; /* * originally contributed by Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.app; import org.foray.common.Logging; Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.app; import org.foray.core.FOrayDocument; @@ -69,7 +69,7 @@ /* * In addition to actually starting and running a FOray session, this * method serves as de facto documentation of the process for those - * who wish to embed FOray in other applications. + * who wish to embed FOray in other applications. */ /* Instantiate the FOraySession. */ @@ -136,7 +136,7 @@ * Start instructions for internal FOray control. Ignore this section * if you are controlling externally. * ****************************************************************************/ - /* + /* * Just push the button, and let FOray do the rest ... */ session.process(); Modified: trunk/foray/foray-app/src/java/org/foray/app/FOray.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOray.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/app/FOray.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.app; import org.foray.common.Logging; Modified: trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/app/FOraySpecific.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.app; import org.foray.area.FOrayAreaTreeFactory; Modified: trunk/foray/foray-app/src/java/org/foray/app/Options.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/Options.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/app/Options.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.app; import org.foray.core.ConfigurationParser; Modified: trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2006 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation Modified: trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/app/PrintStarter.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.app; import org.foray.core.FOrayException; Modified: trunk/foray/foray-app/src/java/org/foray/app/Starter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/Starter.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/app/Starter.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.app; import org.foray.core.FOrayException; Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.app.ant; import org.foray.app.OutputTargetFactory; Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.app.ant; import org.foray.app.FOraySpecific; Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/RunTest.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ant/RunTest.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/RunTest.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.app.ant; import org.foray.common.Logging; Modified: trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.app.test; import org.foray.app.FOraySpecific; Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.embed; import java.awt.Dimension; Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.embed; import org.foray.app.FOraySpecific; @@ -75,13 +75,13 @@ app.getLogger().info(Application.getApplicationNameShort() + " ExampleFO2PDF\n"); app.getLogger().info("Preparing..."); - + //Setup directories File baseDir = new File("../resource/embedding"); File outDir = new File(baseDir, "out"); outDir.mkdirs(); - //Setup input and output files + //Setup input and output files File fofile = new File(baseDir, "xml/helloworld.fo"); File pdffile = new File(outDir, "ResultFO2PDF.pdf"); @@ -89,10 +89,10 @@ app.getLogger().info("Output: PDF (" + pdffile + ")"); app.getLogger().info(""); app.getLogger().info("Transforming..."); - + try { app.convertFO2PDF(fofile, pdffile); - + } catch (Exception e) { app.getLogger().error("Demo FO to PDF Error", e); System.exit(-1); Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.embed; import org.foray.app.FOraySpecific; @@ -47,14 +47,14 @@ import javax.xml.transform.stream.StreamSource; /** - * This class demonstrates the conversion of an arbitrary object file to a + * This class demonstrates the conversion of an arbitrary object file to a * PDF using JAXP (XSLT) and FOray (XSL:FO). */ public class DemoObj2PDF extends EmbedDemo { - public void convertProjectTeam2PDF(ProjectTeam team, File xslt, File pdf) + public void convertProjectTeam2PDF(ProjectTeam team, File xslt, File pdf) throws IOException, FOrayException, TransformerException { - + // Setup FOraySession FOraySession session = FOraySpecific.makeFOraySession(null); @@ -71,7 +71,7 @@ */ FOrayDocument document = new FOrayDocument(session, transformer, source); - + //Setup Renderer OutputTarget renderer = OutputTargetFactory.makeOutputTarget( OutputTargetFactory.RENDER_PDF, null, session.getLogger()); @@ -90,7 +90,7 @@ app.getLogger().info(Application.getApplicationNameShort() + " ExampleObj2PDF\n"); app.getLogger().info("Preparing..."); - + //Setup directories File baseDir = new File("."); File outDir = new File(baseDir, "out"); Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2XML.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2XML.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2XML.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.embed; import org.foray.core.Application; @@ -39,25 +39,25 @@ import javax.xml.transform.stream.StreamResult; /** - * This class demonstrates the conversion of an arbitrary object file to an + * This class demonstrates the conversion of an arbitrary object file to an * XML file. */ public class DemoObj2XML extends EmbedDemo { - public void convertProjectTeam2XML(ProjectTeam team, File xml) + public void convertProjectTeam2XML(ProjectTeam team, File xml) throws IOException, TransformerException { - + //Setup XSLT TransformerFactory factory = TransformerFactory.newInstance(); Transformer transformer = factory.newTransformer(); /* Note: We use the identity transformer, no XSL transformation is done. - The transformer is basically just used to serialize the + The transformer is basically just used to serialize the generated document to XML. */ - + //Setup input Source src = team.getSourceForProjectTeam(); - + //Setup output Result res = new StreamResult(xml); @@ -84,7 +84,7 @@ app.getLogger().info(Application.getApplicationNameShort() + " ExampleObj2XML\n"); app.getLogger().info("Preparing..."); - + //Setup directories File baseDir = new File("."); File outDir = new File(baseDir, "out"); Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2FO.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2FO.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2FO.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.embed; import org.foray.core.Application; @@ -44,9 +44,9 @@ */ public class DemoXML2FO extends EmbedDemo { - public void convertXML2FO(File xml, File xslt, File fo) + public void convertXML2FO(File xml, File xslt, File fo) throws IOException, TransformerException { - + //Setup output OutputStream out = new java.io.FileOutputStream(fo); try { @@ -54,10 +54,10 @@ TransformerFactory factory = TransformerFactory.newInstance(); Transformer transformer = factory.newTransformer( new StreamSource(xslt)); - + //Setup input for XSLT transformation Source src = new StreamSource(xml); - + /* Resulting SAX events (the generated FO) must be piped through to * FOray. */ Result res = new StreamResult(out); @@ -82,7 +82,7 @@ File outDir = new File(baseDir, "out"); outDir.mkdirs(); - //Setup input and output files + //Setup input and output files File xmlfile = new File(baseDir, "xml/xml/projectteam.xml"); File xsltfile = new File(baseDir, "xml/xslt/projectteam2FO.xsl"); File fofile = new File(outDir, "ResultXML2FO.fo"); @@ -92,7 +92,7 @@ app.getLogger().info("Output: XSL-FO (" + fofile + ")"); app.getLogger().info(""); app.getLogger().info("Transforming..."); - + try { app.convertXML2FO(xmlfile, xsltfile, fofile); } catch (Exception e) { Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.embed; import org.foray.app.FOraySpecific; @@ -47,12 +47,12 @@ import javax.xml.transform.stream.StreamSource; /** - * This class demonstrates the conversion of an XML file to PDF using + * This class demonstrates the conversion of an XML file to PDF using * JAXP (XSLT) and FOray (XSL:FO). */ public class DemoXML2PDF extends EmbedDemo { - public void convertXML2PDF(File xml, File xslt, File pdf) + public void convertXML2PDF(File xml, File xslt, File pdf) throws IOException, FOrayException, TransformerException { // Setup FOraySession @@ -97,7 +97,7 @@ File outDir = new File(baseDir, "out"); outDir.mkdirs(); - //Setup input and output files + //Setup input and output files File xmlfile = new File(baseDir, "xml/xml/projectteam.xml"); File xsltfile = new File(baseDir, "xml/xslt/projectteam2FO.xsl"); File pdffile = new File(outDir, "ResultXML2PDF.pdf"); Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/EmbedDemo.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/EmbedDemo.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/EmbedDemo.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.embed; import org.foray.common.Logging; Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectMember.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectMember.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectMember.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.embed.model; /** @@ -39,8 +39,8 @@ */ public ProjectMember() { } - - + + /** * Convenience constructor. * @param name Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeam.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeam.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeam.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.embed.model; import java.util.List; Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamInputSource.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamInputSource.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamInputSource.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.embed.model; import org.xml.sax.InputSource; Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamXMLReader.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamXMLReader.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamXMLReader.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.embed.model; import java.util.Iterator; @@ -64,18 +64,18 @@ if (handler == null) { throw new IllegalStateException("ContentHandler not set"); } - + //Start the document handler.startDocument(); - + //Generate SAX events for the ProjectTeam generateFor(projectTeam); - + //End the document - handler.endDocument(); + handler.endDocument(); } - + /** * Generates SAX events for a ProjectTeam object. * @param projectTeam ProjectTeam object to use @@ -89,7 +89,7 @@ if (handler == null) { throw new IllegalStateException("ContentHandler not set"); } - + handler.startElement("projectteam"); handler.element("projectname", projectTeam.getProjectName()); Iterator i = projectTeam.getMembers().iterator(); @@ -114,7 +114,7 @@ if (handler == null) { throw new IllegalStateException("ContentHandler not set"); } - + handler.startElement("member"); handler.element("name", projectMember.getName()); handler.element("function", projectMember.getFunction()); Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/AbstractObjectReader.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/AbstractObjectReader.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/AbstractObjectReader.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.embed.tools; import java.io.IOException; @@ -36,7 +36,7 @@ import org.xml.sax.EntityResolver; /** - * This class can be used as base class for XMLReaders that generate SAX + * This class can be used as base class for XMLReaders that generate SAX * events from Java objects. */ @@ -46,10 +46,10 @@ "http://xml.org/sax/features/namespaces"; private static final String NS_PREFIXES = "http://xml.org/sax/features/namespace-prefixes"; - + private Map features = new java.util.HashMap(); private ContentHandler orgHandler; - + /** Proxy for easy SAX event generation */ protected EasyContentHandlerProxy handler; /** Error handler */ @@ -63,7 +63,7 @@ setFeature(NAMESPACES, false); setFeature(NS_PREFIXES, false); } - + /* ============ XMLReader interface ============ */ /** Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyContentHandlerProxy.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyContentHandlerProxy.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyContentHandlerProxy.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -23,7 +23,7 @@ /* $Id$ */ - + package org.foray.demo.embed.tools; import org.xml.sax.ContentHandler; @@ -34,10 +34,10 @@ /** * This class is an implementation of ContentHandler which acts as a proxy to - * another ContentHandler and has the purpose to provide a few handy methods + * another ContentHandler and has the purpose to provide a few handy methods * that make life easier when generating SAX events. * <br> - * Note: This class is only useful for simple cases with no namespaces. + * Note: This class is only useful for simple cases with no namespaces. */ public class EasyContentHandlerProxy implements ContentHandler { @@ -71,8 +71,8 @@ /** * Sends the notification of the beginning of an element. * @param name Name for the element. - * @param atts The attributes attached to the element. If there are no - * attributes, it shall be an empty Attributes object. + * @param atts The attributes attached to the element. If there are no + * attributes, it shall be an empty Attributes object. * @throws SAXException Any SAX exception, possibly wrapping another * exception. */ @@ -119,8 +119,8 @@ * Sends notifications for a whole element with some String content. * @param name Name for the element. * @param value Content of the element. - * @param atts The attributes attached to the element. If there are no - * attributes, it shall be an empty Attributes object. + * @param atts The attributes attached to the element. If there are no + * attributes, it shall be an empty Attributes object. * @throws SAXException Any SAX exception, possibly wrapping another * exception. */ Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.servlet; import org.foray.app.FOraySpecific; Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.servlet; import org.foray.app.OutputTargetFactory; Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java 2006-06-17 20:49:06 UTC (rev 7681) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java 2006-06-17 20:53:41 UTC (rev 7682) @@ -1,19 +1,19 @@ /* * Copyright 2004 The FOray Project. * http://www.foray.org - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * This work is in part derived from the following work(s), used with the * permission of the licensor: * Apache FOP, licensed by the Apache Software Foundation @@ -21,7 +21,7 @@ */ /* $Id$ */ - + package org.foray.demo.servlet; import org.foray.app.OutputTargetFactory; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 20:49:28
|
Revision: 7681 Author: victormote Date: 2006-06-17 13:49:06 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7681&view=rev Log Message: ----------- Whitespace changes only. Modified Paths: -------------- trunk/foray/doc/dtd/xhtml-special.ent trunk/foray/doc/dtd/xhtml-symbol.ent trunk/foray/doc/dtd/xhtml1-strict.dtd trunk/foray/doc/web/app/features/extensions.html trunk/foray/doc/web/app/using/run.html trunk/foray/doc/web/app/using/start.html trunk/foray/doc/web/dev/admin/release.html trunk/foray/doc/web/dev/font/planning.html trunk/foray/doc/web/dev/fotree/index.html trunk/foray/doc/web/dev/layout/index.html trunk/foray/doc/web/module/app/index.html trunk/foray/doc/web/module/font/index.html trunk/foray/doc/web/module/fotree/index.html trunk/foray/doc/web/module/text/index.html trunk/foray/doc/web/project/team.html Modified: trunk/foray/doc/dtd/xhtml-special.ent =================================================================== --- trunk/foray/doc/dtd/xhtml-special.ent 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/dtd/xhtml-special.ent 2006-06-17 20:49:06 UTC (rev 7681) @@ -18,7 +18,7 @@ existing ISO 8879 entity names. ISO 10646 character numbers are given for each character, in hex. values are decimal conversions of the ISO 10646 values and refer to the document - character set. Names are Unicode names. + character set. Names are Unicode names. --> <!-- C0 Controls and Basic Latin --> Modified: trunk/foray/doc/dtd/xhtml-symbol.ent =================================================================== --- trunk/foray/doc/dtd/xhtml-symbol.ent 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/dtd/xhtml-symbol.ent 2006-06-17 20:49:06 UTC (rev 7681) @@ -18,7 +18,7 @@ existing ISO 8879 entity names. ISO 10646 character numbers are given for each character, in hex. values are decimal conversions of the ISO 10646 values and refer to the document - character set. Names are Unicode names. + character set. Names are Unicode names. --> <!-- Latin Extended-B --> @@ -144,7 +144,7 @@ <!ENTITY uArr "⇑"> <!-- upwards double arrow, U+21D1 ISOamsa --> <!ENTITY rArr "⇒"> <!-- rightwards double arrow, U+21D2 ISOtech --> -<!-- Unicode does not say this is the 'implies' character but does not have +<!-- Unicode does not say this is the 'implies' character but does not have another character with this function so rArr can be used for 'implies' as ISOtech suggests --> <!ENTITY dArr "⇓"> <!-- downwards double arrow, U+21D3 ISOamsa --> @@ -217,11 +217,11 @@ <!ENTITY rfloor "⌋"> <!-- right floor, U+230B ISOamsc --> <!ENTITY lang "〈"> <!-- left-pointing angle bracket = bra, U+2329 ISOtech --> -<!-- lang is NOT the same character as U+003C 'less than sign' +<!-- lang is NOT the same character as U+003C 'less than sign' or U+2039 'single left-pointing angle quotation mark' --> <!ENTITY rang "〉"> <!-- right-pointing angle bracket = ket, U+232A ISOtech --> -<!-- rang is NOT the same character as U+003E 'greater than sign' +<!-- rang is NOT the same character as U+003E 'greater than sign' or U+203A 'single right-pointing angle quotation mark' --> <!-- Geometric Shapes --> Modified: trunk/foray/doc/dtd/xhtml1-strict.dtd =================================================================== --- trunk/foray/doc/dtd/xhtml1-strict.dtd 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/dtd/xhtml1-strict.dtd 2006-06-17 20:49:06 UTC (rev 7681) @@ -9,7 +9,7 @@ For further information, see: http://www.w3.org/TR/xhtml1 Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio), - All Rights Reserved. + All Rights Reserved. This DTD module is identified by the PUBLIC and SYSTEM identifiers: @@ -263,7 +263,7 @@ window title. Exactly one title is required per document. --> <!ELEMENT title (#PCDATA)> -<!ATTLIST title +<!ATTLIST title %i18n; id ID #IMPLIED > @@ -801,7 +801,7 @@ <!-- Content is %Flow; excluding a, form and form controls ---> +--> <!ELEMENT button %button.content;> <!-- push button --> <!ATTLIST button %attrs; @@ -834,7 +834,7 @@ --> <!ENTITY % TRules "(none | groups | rows | cols | all)"> - + <!-- horizontal alignment attributes for cell contents char alignment char, e.g. char=':' Modified: trunk/foray/doc/web/app/features/extensions.html =================================================================== --- trunk/foray/doc/web/app/features/extensions.html 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/web/app/features/extensions.html 2006-06-17 20:49:06 UTC (rev 7681) @@ -104,8 +104,8 @@ unwanted linefeeds and other characters in the text of the bookmark-title): white-space-treatment, linefeed-treatment, white-space-collapse.</li> </ul> - + <h3><a name="destination">Named Destinations</a></h3> <p>Named destinations were formerly created through an extension. They are now automatically created for the first area generated by any FO with an "id" Modified: trunk/foray/doc/web/app/using/run.html =================================================================== --- trunk/foray/doc/web/app/using/run.html 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/web/app/using/run.html 2006-06-17 20:49:06 UTC (rev 7681) @@ -136,7 +136,7 @@ <p>The -so option allows any configuration option to be set from the command-line by supplying the key and value for that option. See <a href="configuration.html">FOray Configuration</a> for details.</p> - + <h2><a name="check-input">Using Xalan to Check XSL-FO Input</a></h2> <p>FOray sessions that use -xml and -xsl input instead of -fo input are actually controlling two distinct conversions: Tranforming XML to XSL-FO, then formatting @@ -203,7 +203,7 @@ compression rate may help. If FOray is running embedded, clearing the image from time to time cache might prevent memory exhaustion, you can call -<code>org.foray.graphic.GraphicFactory.resetCache()</code> to empty the +<code>org.foray.graphic.GraphicFactory.resetCache()</code> to empty the <a href="../features/graphics.html#caching">image cache</a>.</li> <li>Use multiple page sequences. FOray starts rendering after the end of a page sequence is encountered. Modified: trunk/foray/doc/web/app/using/start.html =================================================================== --- trunk/foray/doc/web/app/using/start.html 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/web/app/using/start.html 2006-06-17 20:49:06 UTC (rev 7681) @@ -37,7 +37,7 @@ You may also have read-only access to this list through its <a href="http://sourceforge.net/mailarchive/forum.php?forum=foray-announce" rel="external">public archive</a>.</p> - + <h2>Getting Help</h2> <p>If you need help, the following resources are available to help you, listed in the order that they should be consulted.</p> Modified: trunk/foray/doc/web/dev/admin/release.html =================================================================== --- trunk/foray/doc/web/dev/admin/release.html 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/web/dev/admin/release.html 2006-06-17 20:49:06 UTC (rev 7681) @@ -42,7 +42,7 @@ </ol> </li> </ol> - + <!--#include virtual="/00-rsrc/include/leftmenu-end.html" --> </body> </html> Modified: trunk/foray/doc/web/dev/font/planning.html =================================================================== --- trunk/foray/doc/web/dev/font/planning.html 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/web/dev/font/planning.html 2006-06-17 20:49:06 UTC (rev 7681) @@ -392,8 +392,8 @@ SystemFont. If the "embed" attribute is included, the underlying font-file will be used to embed the font in the output document.</p> - - + + <!--#include virtual="/00-rsrc/include/leftmenu-end.html" --> </body> </html> Modified: trunk/foray/doc/web/dev/fotree/index.html =================================================================== --- trunk/foray/doc/web/dev/fotree/index.html 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/web/dev/fotree/index.html 2006-06-17 20:49:06 UTC (rev 7681) @@ -437,8 +437,8 @@ border-collpase, it appears that when that model is used, one-half of the outer borders fall into the margin-area. Please clarify for XSL-FO.</li> </ol> - + <!--#include virtual="/00-rsrc/include/leftmenu-end.html" --> </body> </html> Modified: trunk/foray/doc/web/dev/layout/index.html =================================================================== --- trunk/foray/doc/web/dev/layout/index.html 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/web/dev/layout/index.html 2006-06-17 20:49:06 UTC (rev 7681) @@ -55,7 +55,7 @@ rightfully be considered part of the layout system. FOrayText is also designed to allow multiple line-breaking strategies (LBS) to be employed.</p> <p>The net result is that the layout system’s job is to find page breaks.</p> - + <h2><a name="model"/>Eager vs. Patient Processing</h2> <p>Layout systems can generally be divided into those that are “eager” and those that are “patient”. Eager systems try to finalize the layout of each Modified: trunk/foray/doc/web/module/app/index.html =================================================================== --- trunk/foray/doc/web/module/app/index.html 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/web/module/app/index.html 2006-06-17 20:49:06 UTC (rev 7681) @@ -147,7 +147,7 @@ * Start instructions for internal FOray control. Ignore this section * if you are controlling externally. * ****************************************************************************/ - /* + /* * Just push the button, and let FOray do the rest ... */ session.process(); @@ -279,7 +279,7 @@ and an Avalon logger.</li> <li>Run its <code>parseDocument() method.</code></li> </ol> - + <p>You can safely repeat this for multiple configuration files, if desired.</p> <!--#include virtual="/00-rsrc/include/leftmenu-end.html" --> Modified: trunk/foray/doc/web/module/font/index.html =================================================================== --- trunk/foray/doc/web/module/font/index.html 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/web/module/font/index.html 2006-06-17 20:49:06 UTC (rev 7681) @@ -66,7 +66,7 @@ FOrayFontServer server = new FOrayFontServer(logger); // Set the base URL for physical font files. -java.net.URL baseFontURL = someURL; +java.net.URL baseFontURL = someURL; server.setBaseFontURL(baseFontURL); // Set a resolver to be used when parsing the font-configuration Modified: trunk/foray/doc/web/module/fotree/index.html =================================================================== --- trunk/foray/doc/web/module/fotree/index.html 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/web/module/fotree/index.html 2006-06-17 20:49:06 UTC (rev 7681) @@ -65,7 +65,7 @@ To add a new namespace, write and instantiate a Namespace subclass, and register it with FOTreeBuilder, using the addNamespace method.</li> </ul> - + <h2><a name="eagerness" id="eagerness"/>Eager vs. Patient Processing</h2> <p>FOray FOTree uses a SAX-like event system to make the client application aware that data is ready. Currently, events are fired when a page-sequence is @@ -1667,7 +1667,7 @@ <li>We need to systematically remove all non-shadow layout-related fields from FObj subclasses.</li> </ul> - + <!--#include virtual="/00-rsrc/include/leftmenu-end.html" --> </body> </html> Modified: trunk/foray/doc/web/module/text/index.html =================================================================== --- trunk/foray/doc/web/module/text/index.html 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/web/module/text/index.html 2006-06-17 20:49:06 UTC (rev 7681) @@ -131,7 +131,7 @@ eager one, care must be taken. Eager line-breaking must keep track of its state within a given block. (To-do: Address whether a LineBreaker can be reset and reused.)</p> - + <h2><a name="faux-sc"/>Faux Small-Caps</h2> <p>For fonts that do not have small-cap glyphs, users sometimes want to imitate small-caps by converting lowercase text to uppercase, but Modified: trunk/foray/doc/web/project/team.html =================================================================== --- trunk/foray/doc/web/project/team.html 2006-06-17 19:34:13 UTC (rev 7680) +++ trunk/foray/doc/web/project/team.html 2006-06-17 20:49:06 UTC (rev 7681) @@ -78,7 +78,7 @@ <li>Art Welch</li> <li>Peter B. West</li> </ul> - + <!--#include virtual="/00-rsrc/include/leftmenu-end.html" --> </body> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 19:34:21
|
Revision: 7680 Author: victormote Date: 2006-06-17 12:34:13 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7680&view=rev Log Message: ----------- Fix copyright notice. Modified Paths: -------------- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java Modified: trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 18:57:37 UTC (rev 7679) +++ trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 19:34:13 UTC (rev 7680) @@ -1,18 +1,22 @@ /* - * Copyright 2006 The aXSL Project. - * http://www.axsl.org - * + * Copyright 2006 The FOray Project. + * http://www.foray.org + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation * */ Modified: trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java 2006-06-17 18:57:37 UTC (rev 7679) +++ trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java 2006-06-17 19:34:13 UTC (rev 7680) @@ -1,6 +1,6 @@ /* - * Copyright 2006 The aXSL Project. - * http://www.axsl.org + * Copyright 2006 The FOray Project. + * http://www.foray.org * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,6 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. * + * This work is in part derived from the following work(s), used with the + * permission of the licensor: + * Apache FOP, licensed by the Apache Software Foundation + * */ /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 18:57:42
|
Revision: 7679 Author: victormote Date: 2006-06-17 11:57:37 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7679&view=rev Log Message: ----------- Make the exception thrown a checked one so that at least someone knows it failed. Modified Paths: -------------- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java Modified: trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 18:27:04 UTC (rev 7678) +++ trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 18:57:37 UTC (rev 7679) @@ -41,6 +41,8 @@ */ public class ClasspathHandler extends URLStreamHandler { + private static final String PROTOCOL = "classpath"; + protected URLConnection openConnection(URL u) { return new URLConnection(u) { public void connect() {} @@ -68,8 +70,27 @@ public static void register() { FOrayURLStreamHandlerFactory factory = FOrayURLStreamHandlerFactory.getURLStreamHandlerFactory(); - ClasspathHandler handler = new ClasspathHandler(); - factory.registerProtocol("classpath", handler); + URLStreamHandler handler = factory.getHandler( + ClasspathHandler.PROTOCOL); + if (handler != null) { + /* If already registed, that one is the one being used, and there + * is no way to change it. */ + return; + } + handler = new ClasspathHandler(); + if (handler == null) { + return; + } + try { + factory.registerProtocol(ClasspathHandler.PROTOCOL, handler); + } catch (IOException e) { + /* This should never happen. We have already checked whether the + * protocol is previously registered, and we know that neither the + * protocol or handler are null. The only thing we could do is + * pass the exception upstream, but there is nothing they can do + * about it either. */ + return; + } } } Modified: trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java 2006-06-17 18:27:04 UTC (rev 7678) +++ trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java 2006-06-17 18:57:37 UTC (rev 7679) @@ -26,10 +26,10 @@ package org.foray.common; +import java.io.IOException; import java.net.URL; import java.net.URLStreamHandler; import java.net.URLStreamHandlerFactory; -import java.security.InvalidParameterException; import java.util.HashMap; /** @@ -73,31 +73,41 @@ * @param protocol The protocol to be registered. * @param handler The {@link URLStreamHandler} instance which should be * used for URLs whose protocol is <code>protocol</code>. - * @throws InvalidParameterException For any of the following reasons: + * @throws IOException For any of the following reasons: * <ul> * <li>If <code>protocol</code> or <code>handlerClass</code> are * null.</li> * <li>If <code>protocol</code> has already been registered</li> * </ul> */ - public void registerProtocol(String protocol, URLStreamHandler handler) - throws InvalidParameterException { + public void registerProtocol(String protocol, URLStreamHandler handler) + throws IOException { if (protocol == null) { - throw new InvalidParameterException("Cannot register a null " + throw new IOException("Cannot register a null " + "protocol."); } if (handler == null) { - throw new InvalidParameterException("Cannot register a null " + throw new IOException("Cannot register a null " + "URLStreamHandler."); } if (this.protocols.containsKey(protocol)) { - throw new InvalidParameterException("Protocol \n" + protocol + throw new IOException("Protocol \n" + protocol + "\" has already been registered."); } this.protocols.put(protocol, handler); } /** + * Provides the handler for a given protocol. + * @param protocol The protocol whose handler is desired. + * @return True iff <code>protocol</code> has previously been registered. + */ + public URLStreamHandler getHandler(String protocol) { + Object object = this.protocols.get(protocol); + return (URLStreamHandler) object; + } + + /** * Provides access to a custom URLStreamHandlerFactory instance, creating * it and registering it with Java if needed. * @return The custom URLStreamHandlerFactory instance for this session. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 18:27:11
|
Revision: 7678 Author: victormote Date: 2006-06-17 11:27:04 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7678&view=rev Log Message: ----------- 1. Change method name to a better choice. 2. Add some javadoc. Modified Paths: -------------- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java Modified: trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 18:12:50 UTC (rev 7677) +++ trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 18:27:04 UTC (rev 7678) @@ -60,11 +60,16 @@ }; } + /** + * Register an instance of this class with the custom + * URLStreamHandlerFactory so that this handler will be used for URLs of + * protocol "classpath". + */ public static void register() { FOrayURLStreamHandlerFactory factory = FOrayURLStreamHandlerFactory.getURLStreamHandlerFactory(); ClasspathHandler handler = new ClasspathHandler(); - factory.registerHandler("classpath", handler); + factory.registerProtocol("classpath", handler); } } Modified: trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java 2006-06-17 18:12:50 UTC (rev 7677) +++ trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java 2006-06-17 18:27:04 UTC (rev 7678) @@ -80,7 +80,7 @@ * <li>If <code>protocol</code> has already been registered</li> * </ul> */ - public void registerHandler(String protocol, URLStreamHandler handler) + public void registerProtocol(String protocol, URLStreamHandler handler) throws InvalidParameterException { if (protocol == null) { throw new InvalidParameterException("Cannot register a null " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 18:12:55
|
Revision: 7677 Author: victormote Date: 2006-06-17 11:12:50 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7677&view=rev Log Message: ----------- First pass at making it dynamic was much more complicated than it needs to be. Instead of passing the Class during registration, pass an instance of it. Modified Paths: -------------- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java Modified: trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 17:58:32 UTC (rev 7676) +++ trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 18:12:50 UTC (rev 7677) @@ -63,7 +63,8 @@ public static void register() { FOrayURLStreamHandlerFactory factory = FOrayURLStreamHandlerFactory.getURLStreamHandlerFactory(); - factory.registerHandler("classpath", ClasspathHandler.class); + ClasspathHandler handler = new ClasspathHandler(); + factory.registerHandler("classpath", handler); } } Modified: trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java 2006-06-17 17:58:32 UTC (rev 7676) +++ trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java 2006-06-17 18:12:50 UTC (rev 7677) @@ -29,6 +29,7 @@ import java.net.URL; import java.net.URLStreamHandler; import java.net.URLStreamHandlerFactory; +import java.security.InvalidParameterException; import java.util.HashMap; /** @@ -43,8 +44,8 @@ /** * Map of the protocols. * The key is a String containing the protocol name. - * The value is the Class which should be instantiated as the - * {@link URLStreamHandler} for that protocol. + * The value is the {@link URLStreamHandler} which should be used for that + * protocol. */ private HashMap protocols = new HashMap(); @@ -60,57 +61,40 @@ public URLStreamHandler createURLStreamHandler(String protocol) { Object object = this.protocols.get(protocol); if (object == null) { + /* If we don't know how to instantiate it, return null. Java will + * then look through the more normal places instead. */ return null; } - Class urlStreamHandler = (Class) object; - Object newInstance = null; - try { - newInstance = urlStreamHandler.newInstance(); - } catch (InstantiationException e) { - return null; - } catch (IllegalAccessException e) { - return null; - } - if (newInstance instanceof URLStreamHandler) { - return (URLStreamHandler) newInstance; - } - - /* If we don't know how to instantiate it, return null. Java will then - * look through the more normal places instead. */ - return null; + return (URLStreamHandler) object; } /** * Registers a new {@link URLStreamHandler} for use with a protocol. * @param protocol The protocol to be registered. - * @param handlerClass The {@link URLStreamHandler} subclass which should be - * instantiated as the {@link URLStreamHandler} for <code>protocol</code>. - * @return True if the registration was successful, false if not. + * @param handler The {@link URLStreamHandler} instance which should be + * used for URLs whose protocol is <code>protocol</code>. + * @throws InvalidParameterException For any of the following reasons: + * <ul> + * <li>If <code>protocol</code> or <code>handlerClass</code> are + * null.</li> + * <li>If <code>protocol</code> has already been registered</li> + * </ul> */ - public boolean registerHandler(String protocol, Class handlerClass) { - if (protocol == null - || handlerClass == null) { - return false; + public void registerHandler(String protocol, URLStreamHandler handler) + throws InvalidParameterException { + if (protocol == null) { + throw new InvalidParameterException("Cannot register a null " + + "protocol."); } + if (handler == null) { + throw new InvalidParameterException("Cannot register a null " + + "URLStreamHandler."); + } if (this.protocols.containsKey(protocol)) { - return false; + throw new InvalidParameterException("Protocol \n" + protocol + + "\" has already been registered."); } - /* Make sure handlerClass is a subclass of URLStreamHandler. */ - boolean validClass = false; - Class superclass = handlerClass.getSuperclass(); - while (superclass != null - && ! validClass) { - if (superclass == URLStreamHandler.class) { - validClass = true; - } else { - superclass = superclass.getSuperclass(); - } - } - if (! validClass) { - return false; - } - this.protocols.put(protocol, handlerClass); - return true; + this.protocols.put(protocol, handler); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 18:12:06
|
Revision: 7676 Author: victormote Date: 2006-06-17 10:58:32 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7676&view=rev Log Message: ----------- Make loading the URLStreamHandlers dynamic. Modified Paths: -------------- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java Modified: trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 17:07:54 UTC (rev 7675) +++ trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 17:58:32 UTC (rev 7676) @@ -61,7 +61,9 @@ } public static void register() { - FOrayURLStreamHandlerFactory.getURLStreamHandlerFactory(); + FOrayURLStreamHandlerFactory factory = + FOrayURLStreamHandlerFactory.getURLStreamHandlerFactory(); + factory.registerHandler("classpath", ClasspathHandler.class); } } Modified: trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java 2006-06-17 17:07:54 UTC (rev 7675) +++ trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java 2006-06-17 17:58:32 UTC (rev 7676) @@ -29,6 +29,7 @@ import java.net.URL; import java.net.URLStreamHandler; import java.net.URLStreamHandlerFactory; +import java.util.HashMap; /** * URLStreamHandlerFactory implementation that allows custom protocols to be @@ -40,6 +41,14 @@ private static FOrayURLStreamHandlerFactory urlSHFactory; /** + * Map of the protocols. + * The key is a String containing the protocol name. + * The value is the Class which should be instantiated as the + * {@link URLStreamHandler} for that protocol. + */ + private HashMap protocols = new HashMap(); + + /** * Private constructor. * This is a singleton, and there should only be one instance per session. * To get that instance, use @@ -49,13 +58,62 @@ } public URLStreamHandler createURLStreamHandler(String protocol) { - if (protocol.equals("classpath")) { - return new ClasspathHandler(); + Object object = this.protocols.get(protocol); + if (object == null) { + return null; } + Class urlStreamHandler = (Class) object; + Object newInstance = null; + try { + newInstance = urlStreamHandler.newInstance(); + } catch (InstantiationException e) { + return null; + } catch (IllegalAccessException e) { + return null; + } + if (newInstance instanceof URLStreamHandler) { + return (URLStreamHandler) newInstance; + } + + /* If we don't know how to instantiate it, return null. Java will then + * look through the more normal places instead. */ return null; } /** + * Registers a new {@link URLStreamHandler} for use with a protocol. + * @param protocol The protocol to be registered. + * @param handlerClass The {@link URLStreamHandler} subclass which should be + * instantiated as the {@link URLStreamHandler} for <code>protocol</code>. + * @return True if the registration was successful, false if not. + */ + public boolean registerHandler(String protocol, Class handlerClass) { + if (protocol == null + || handlerClass == null) { + return false; + } + if (this.protocols.containsKey(protocol)) { + return false; + } + /* Make sure handlerClass is a subclass of URLStreamHandler. */ + boolean validClass = false; + Class superclass = handlerClass.getSuperclass(); + while (superclass != null + && ! validClass) { + if (superclass == URLStreamHandler.class) { + validClass = true; + } else { + superclass = superclass.getSuperclass(); + } + } + if (! validClass) { + return false; + } + this.protocols.put(protocol, handlerClass); + return true; + } + + /** * Provides access to a custom URLStreamHandlerFactory instance, creating * it and registering it with Java if needed. * @return The custom URLStreamHandlerFactory instance for this session. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 17:08:01
|
Revision: 7675 Author: victormote Date: 2006-06-17 10:07:54 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7675&view=rev Log Message: ----------- Throw an exception if the InputStream cannot be created. Modified Paths: -------------- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java Modified: trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 16:53:45 UTC (rev 7674) +++ trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 17:07:54 UTC (rev 7675) @@ -24,6 +24,7 @@ package org.foray.common; +import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.net.URLConnection; @@ -44,12 +45,17 @@ return new URLConnection(u) { public void connect() {} - public InputStream getInputStream() { + public InputStream getInputStream() throws IOException { String path = url.getPath(); String resourcePath = (path.charAt(0) == '/')? path.substring(1): path; - return getClass().getClassLoader(). + InputStream inputStream = getClass().getClassLoader(). getResourceAsStream(resourcePath); + if (inputStream == null) { + throw new IOException("Unable to open input stream for: " + + url.toString()); + } + return inputStream; } }; } Modified: trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java 2006-06-17 16:53:45 UTC (rev 7674) +++ trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java 2006-06-17 17:07:54 UTC (rev 7675) @@ -16,7 +16,9 @@ * */ -/* $Id$ */ +/* +$Id$ + */ /* Known contributors: * Vincent Hennebert (original author) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 16:53:50
|
Revision: 7674 Author: victormote Date: 2006-06-17 09:53:45 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7674&view=rev Log Message: ----------- Create and use new singleton class FOrayURLStreamHandlerFactory to handle custom URLStreamHandler creation. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-06-17 16:53:33 UTC (rev 7673) +++ trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-06-17 16:53:45 UTC (rev 7674) @@ -24,6 +24,7 @@ package org.foray.font; +import org.foray.common.ClasspathHandler; import org.foray.common.Environment; import org.foray.common.RandomReader; import org.foray.common.URLBuilder; @@ -125,13 +126,7 @@ * only once, hence a static statement. */ static { - String property = System.getProperty("java.protocol.handler.pkgs"); - if (property == null) { - property = "org.axsl.common.urlhandler"; - } else { - property += "|org.axsl.common.urlhandler"; - } - System.setProperty("java.protocol.handler.pkgs", property); + ClasspathHandler.register(); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 16:53:44
|
Revision: 7673 Author: victormote Date: 2006-06-17 09:53:33 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7673&view=rev Log Message: ----------- Create and use new singleton class FOrayURLStreamHandlerFactory to handle custom URLStreamHandler creation. Modified Paths: -------------- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java Added Paths: ----------- trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java Modified: trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 15:38:21 UTC (rev 7672) +++ trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 16:53:33 UTC (rev 7673) @@ -53,4 +53,9 @@ } }; } + + public static void register() { + FOrayURLStreamHandlerFactory.getURLStreamHandlerFactory(); + } + } Added: trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java (rev 0) +++ trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java 2006-06-17 16:53:33 UTC (rev 7673) @@ -0,0 +1,71 @@ +/* + * Copyright 2006 The aXSL Project. + * http://www.axsl.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +/* $Id$ */ + +/* Known contributors: + * Vincent Hennebert (original author) + */ + +package org.foray.common; + +import java.net.URL; +import java.net.URLStreamHandler; +import java.net.URLStreamHandlerFactory; + +/** + * URLStreamHandlerFactory implementation that allows custom protocols to be + * registered and accessed. + */ +public class FOrayURLStreamHandlerFactory implements URLStreamHandlerFactory { + + /** The singleton instance of this class. */ + private static FOrayURLStreamHandlerFactory urlSHFactory; + + /** + * Private constructor. + * This is a singleton, and there should only be one instance per session. + * To get that instance, use + * {@link FOrayURLStreamHandlerFactory#getURLStreamHandlerFactory()}. + */ + private FOrayURLStreamHandlerFactory() { + } + + public URLStreamHandler createURLStreamHandler(String protocol) { + if (protocol.equals("classpath")) { + return new ClasspathHandler(); + } + return null; + } + + /** + * Provides access to a custom URLStreamHandlerFactory instance, creating + * it and registering it with Java if needed. + * @return The custom URLStreamHandlerFactory instance for this session. + */ + public static FOrayURLStreamHandlerFactory getURLStreamHandlerFactory() { + if (FOrayURLStreamHandlerFactory.urlSHFactory == null) { + FOrayURLStreamHandlerFactory.urlSHFactory + = new FOrayURLStreamHandlerFactory(); + URL.setURLStreamHandlerFactory( + FOrayURLStreamHandlerFactory.urlSHFactory); + } + return FOrayURLStreamHandlerFactory.urlSHFactory; + } + +} Property changes on: trunk/foray/foray-common/src/java/org/foray/common/FOrayURLStreamHandlerFactory.java ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 15:38:26
|
Revision: 7672 Author: victormote Date: 2006-06-17 08:38:21 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7672&view=rev Log Message: ----------- 1. Improve error logging. 2. Add to-do item regarding the severity of a bad URL. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-06-17 14:18:55 UTC (rev 7671) +++ trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-06-17 15:38:21 UTC (rev 7672) @@ -471,16 +471,29 @@ String refID = attributes.getValue("ref"); URL fontFileURL = null; - URL metricsFileURL = null; - try { - if (fontFile != null) { + if (fontFile != null) { + try { fontFileURL = new URL(this.currentXMLBase, fontFile); + } catch (MalformedURLException e) { + this.logError("Malformed URL in font configuration:\n" + + " " + fontFile); + /* TODO: Just invalidate this one font and warn the user instead + * of invalidating everything. */ + fontServer.setFatalConfigurationError(true); } - if (metricsFile != null) { + } + + URL metricsFileURL = null; + if (metricsFile != null) { + try { metricsFileURL = new URL(this.currentXMLBase, metricsFile); + } catch (MalformedURLException e) { + this.logError("Malformed URL in font configuration:\n" + + " " + metricsFile); + /* TODO: Just invalidate this one font and warn the user instead + * of invalidating everything. */ + fontServer.setFatalConfigurationError(true); } - } catch (Exception e) { - fontServer.setFatalConfigurationError(true); } /* TODO vh: check that if ref is declared, it is alone */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 14:19:00
|
Revision: 7671 Author: victormote Date: 2006-06-17 07:18:55 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7671&view=rev Log Message: ----------- Apply remainder of Vincent Hennebert's patch (#1506271), using new ClasspathHandler class in font configuration to access fonts in jar files. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-06-17 14:10:55 UTC (rev 7670) +++ trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-06-17 14:18:55 UTC (rev 7671) @@ -120,6 +120,20 @@ private Locator locator; + /* + * Register the URLStreamHandler for classpath: URLs. This has to be done + * only once, hence a static statement. + */ + static { + String property = System.getProperty("java.protocol.handler.pkgs"); + if (property == null) { + property = "org.axsl.common.urlhandler"; + } else { + property += "|org.axsl.common.urlhandler"; + } + System.setProperty("java.protocol.handler.pkgs", property); + } + /** * creates a configuration reader * @param filename the file which contains the configuration information This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 14:11:05
|
Revision: 7670 Author: victormote Date: 2006-06-17 07:10:55 -0700 (Sat, 17 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7670&view=rev Log Message: ----------- Add new class contributed by Vincent Hennebert (patch 1506271) for accessing the contents of a jar file with a URL. Added Paths: ----------- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java Added: trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java (rev 0) +++ trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java 2006-06-17 14:10:55 UTC (rev 7670) @@ -0,0 +1,56 @@ +/* + * Copyright 2006 The aXSL Project. + * http://www.axsl.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +/* $Id$ */ + +/* Known contributors: + * Vincent Hennebert (original author) + */ + +package org.foray.common; + +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; + +/** + * Stream handler for URLs with the <code>classpath</code> protocol. Such URLs + * are used to refer to resources in the CLASSPATH. The two following syntaxes + * are allowed, but the first one is preferred: + * <ul> + * <li><code>classpath:/path/to/the/resource</code></li> + * <li><code>classpath:path/to/the/resource</code></li> + * </ul> + */ +public class ClasspathHandler extends URLStreamHandler { + + protected URLConnection openConnection(URL u) { + return new URLConnection(u) { + public void connect() {} + + public InputStream getInputStream() { + String path = url.getPath(); + String resourcePath = + (path.charAt(0) == '/')? path.substring(1): path; + return getClass().getClassLoader(). + getResourceAsStream(resourcePath); + } + }; + } +} Property changes on: trunk/foray/foray-common/src/java/org/foray/common/ClasspathHandler.java ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 02:37:58
|
Revision: 7669 Author: victormote Date: 2006-06-16 19:37:52 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7669&view=rev Log Message: ----------- Fix interface hierarchy. Modified Paths: -------------- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-06-17 02:37:45 UTC (rev 7668) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemPL.java 2006-06-17 02:37:52 UTC (rev 7669) @@ -28,7 +28,6 @@ import org.axsl.areaW.AreaWException; import org.axsl.areaW.ListBlockArea; import org.axsl.areaW.ListItemArea; -import org.axsl.areaW.NormalBlockArea; import org.axsl.foR.fo.ListItem; import org.axsl.foR.fo.ListItemBody; import org.axsl.foR.fo.ListItemLabel; @@ -49,24 +48,21 @@ public int layout(Area area, RetrieveMarker retrieveMarker) throws AreaWException { - if (! (area instanceof NormalBlockArea)) { + if (! (area instanceof ListBlockArea)) { throw new AreaWException("Illegal parent area for fo:list-item"); } - NormalBlockArea blockArea = (NormalBlockArea) area; + ListBlockArea blockArea = (ListBlockArea) area; return layout(blockArea, retrieveMarker); } - public int layout(NormalBlockArea area, RetrieveMarker retrieveMarker) + public int layout(ListBlockArea area, RetrieveMarker retrieveMarker) throws AreaWException { ListItem node = getFO(); - ListBlockArea listBlockArea = (ListBlockArea) area; if (getProgress() == FONodePL.START) { setProgress(0); } - layout.completeCurrentLineInBlock(area); - - ListItemArea group = listBlockArea.makeListItemArea(node, + ListItemArea group = area.makeListItemArea(node, retrieveMarker); /* Now lay out the list-item-label inside the new block-area. */ @@ -82,19 +78,16 @@ return status; } } - layout.completeCurrentLineInBlock(group); /* Now create a BlockArea to contain the list-item-body. */ ListItemBody body = (ListItemBody)node.childrenFO().get(1); ListItemBodyPL bodyPL = (ListItemBodyPL) getLayoutProxy(body); status = bodyPL.layout(group, retrieveMarker); if (Status.isIncomplete(status)) { - layout.completeCurrentLineInBlock(group); setProgress(1); return status; } - layout.completeCurrentLineInBlock(group); return Status.OK; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 02:37:49
|
Revision: 7668 Author: victormote Date: 2006-06-16 19:37:45 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7668&view=rev Log Message: ----------- Fix interface hierarchy. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java 2006-06-17 02:14:31 UTC (rev 7667) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ListItemArea.java 2006-06-17 02:37:45 UTC (rev 7668) @@ -24,10 +24,11 @@ package org.foray.area; +import org.axsl.areaR.RenderVisitor; import org.axsl.foR.fo.ListItem; import org.axsl.foR.fo.RetrieveMarker; -public class ListItemArea extends NormalBlockArea +public class ListItemArea extends AbstractNormalBlockArea implements org.axsl.areaW.ListItemArea { public ListItemArea(ListItem parentFObj, Area parentArea, @@ -35,4 +36,16 @@ super(parentFObj, parentArea, retrieveMarker); } + public String getAreaName() { + return "list-item"; + } + + public void render(RenderVisitor visitor) { + visitor.render(this); + } + + public Area getOverflowArea(Area requester) { + return null; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 02:14:37
|
Revision: 7667 Author: victormote Date: 2006-06-16 19:14:31 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7667&view=rev Log Message: ----------- Conform to axsl change: Remove no-longer-needed method. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-06-17 02:11:41 UTC (rev 7666) +++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java 2006-06-17 02:14:31 UTC (rev 7667) @@ -219,10 +219,6 @@ return traitGeneratedBy().traitAbsolutePosition(this); } - public int getFontAscender() { - return getPrimaryFont().getFont().getAscender(traitFontSize()); - } - protected boolean isFirstChildOfParent() { if (getParent() == null) { return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-06-17 02:11:46
|
Revision: 7666 Author: victormote Date: 2006-06-16 19:11:41 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7666&view=rev Log Message: ----------- Use new axsl Font methods to let the Font do the computation of these metrics. Modified Paths: -------------- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java Modified: trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-06-17 02:10:44 UTC (rev 7665) +++ trunk/foray/foray-render/src/java/org/foray/render/PrintRenderer.java 2006-06-17 02:11:41 UTC (rev 7666) @@ -31,6 +31,7 @@ import org.axsl.areaR.LeaderArea; import org.axsl.areaR.TextArea; import org.axsl.common.Constants; +import org.axsl.fontR.Font; import org.axsl.fontR.FontConsumer; import org.apache.commons.logging.Log; @@ -119,7 +120,9 @@ * @return The Y position that should be used for the underline stroke. */ protected int getUnderlineYPosition(GeneralInlineArea area) { - return area.baselineY() - (area.traitFontSize() / 10); + Font font = area.getPrimaryFont().getFont(); + int underlinePosition = font.underlinePosition(area.traitFontSize()); + return area.baselineY() + underlinePosition; } /** @@ -128,8 +131,9 @@ * @return The Y position that should be used for the overline stroke. */ protected int getOverlineYPosition(GeneralInlineArea area) { - return area.baselineY() + area.getFontAscender() - + (area.traitFontSize() / 10); + Font font = area.getPrimaryFont().getFont(); + int overlinePosition = font.overlinePosition(area.traitFontSize()); + return area.baselineY() + overlinePosition; } /** @@ -138,7 +142,9 @@ * @return The Y position that should be used for the through stroke. */ protected int getThroughYPosition(GeneralInlineArea area) { - return area.baselineY() + (area.getFontAscender() * 3 / 8); + Font font = area.getPrimaryFont().getFont(); + int strikeoutPosition = font.strikeoutPosition(area.traitFontSize()); + return area.baselineY() + strikeoutPosition; } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
10 messages has been excluded from this view by a project administrator.
