foray-commit Mailing List for FOray (Page 272)
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
|
Dec
|
|
From: <vic...@us...> - 2006-04-27 22:53:52
|
Revision: 7085 Author: victormote Date: 2006-04-27 15:50:20 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7085&view=rev Log Message: ----------- Style 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/ConfigurationParser.java trunk/foray/foray-app/src/java/org/foray/app/DocumentReader.java trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.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/DemoXML2FO.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.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/EasyGenerationContentHandlerProxy.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 trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.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/PageRA.java trunk/foray/foray-areatree/src/java/org/foray/area/RegionRABody.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-common/src/java/org/foray/common/ColorSpaceCMYK.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.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/FreeStandingFont.java trunk/foray/foray-font/src/java/org/foray/font/Subset.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFSubSetFile.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableCMAP.java trunk/foray/foray-font/src/java/org/foray/font/format/TTFTableHMTX.java trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontOutput.java trunk/foray/foray-font/src/java/org/foray/font/output/FOrayFontPDF.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FOText.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePageMasterAlternatives.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePageMasterReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AudioDial.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Azimuth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Background.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundImage.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BackgroundPosition.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Boolean.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Border.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderColor.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderPrecedence.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSeparation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderSpacing.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderStyle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/CaseTitle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Character.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Clip.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Color.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnNumber.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ContentType.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Country.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Cue.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DestinationPlacementOffset.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DisplayAlign.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/DominantBaseline.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Elevation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ExternalDestination.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Font.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontSizeAdjust.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStretch.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontStyle.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontVariant.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontWeight.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ForcePageCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Format.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GlyphOrientation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/GroupingSize.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphLadderCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphPushCharCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/HyphRemainCharCount.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Id.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InternalDestination.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Keep.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Language.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LastLineEndIndent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderLength.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderPatternWidth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LetterSpacing.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Margin.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/MaximumRepeats.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Name.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberColumnsRepeated.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberColumnsSpanned.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/NumberRowsSpanned.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Orphans.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Padding.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PageDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pause.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Pitch.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/PlayDuring.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RefId.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RegionName.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeDimension.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RelativeSpace.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Role.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/RuleThickness.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Script.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Size.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SourceDocument.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/SpeechRate.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Src.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TableLayout.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetPresentationContext.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetProcessingContext.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TargetStylesheet.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlign.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAlignLast.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextAltitude.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDecoration.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDepth.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextIndent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextShadow.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TreatAsWordSpace.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VerticalAlign.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Volume.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Widows.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WordSpacing.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ZIndex.java trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnAbs.java trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnMin.java trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java trunk/foray/foray-graphic/src/java/org/foray/graphic/BMPGraphic.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/JAIGraphic.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/TIFFGraphic.java trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFExplicitDestination.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFileSpec.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontFileStream.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFunction.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPage.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFToUnicodeCMap.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXObject.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFDocumentGraphics2D.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFImageElementBridge.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTranscoder.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FootnotePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/ListItemLabelPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/StaticContentPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java trunk/foray/foray-ps/src/java/org/foray/ps/PSOperator.java trunk/foray/foray-ps/src/java/org/foray/ps/PSSystemDict.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingVector.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialogAboutBox.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/ASCII85OutputStream.java trunk/foray/foray-render/src/java/org/foray/render/ps/FlateEncodeOutputStream.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/ps/RunLengthEncodeOutputStream.java trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/Hyphen.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/HyphenationServer.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/HyphenationTree.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/PatternParser.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/SerializeHyphPattern.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/TernaryTree.java trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java trunk/foray/scripts/checkstyle-config.xml Modified: trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -79,7 +79,8 @@ private void init() throws FOrayException { this.userMessage = new UserMessage(getLogger()); try { - UIManager.setLookAndFeel(new javax.swing.plaf.metal.MetalLookAndFeel()); + UIManager.setLookAndFeel( + new javax.swing.plaf.metal.MetalLookAndFeel()); } catch (Exception e) { e.printStackTrace(); } @@ -170,10 +171,12 @@ try { URL url = getClass().getResource(path); - /* The following code was added by Alex Alishevskikh [al...@op...] - to fix for crashes on machines with unsupported user languages */ + /* The following code was added by Alex Alishevskikh + * [al...@op...] to fix for crashes on machines with + * unsupported user languages */ if (url == null) { - // if the given resource file not found, the english resource uses as default + /* if the given resource file not found, the english resource + * uses as default */ path = path.substring(0, path.lastIndexOf(".")) + ".en"; url = getClass().getResource(path); } Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -354,7 +354,8 @@ } /** - * checks whether all necessary information has been given in a consistent way + * checks whether all necessary information has been given in a consistent + * way */ private void checkSettings() throws FOrayException, FileNotFoundException { if (inputmode == NOT_SET) { @@ -368,10 +369,12 @@ if (inputmode == XSLT_INPUT) { // check whether xml *and* xslt file have been set if (xmlfile == null) { - throw new FOrayException("XML file must be specified for the tranform mode"); + throw new FOrayException("XML file must be specified for the " + + "transform mode"); } if (xsltfile == null) { - throw new FOrayException("XSLT file must be specified for the tranform mode"); + throw new FOrayException("XSLT file must be specified for the " + + "transform mode"); } // warning if fofile has been set in xslt mode @@ -548,7 +551,8 @@ } /** - * shows the commandline syntax including a summary of all available options and some examples + * shows the commandline syntax including a summary of all available + * options and some examples */ public static void printUsage(Log logger) { logger.error("\nUSAGE\nFOray [options] [-fo|-xml] infile " @@ -560,26 +564,39 @@ + " configure a session-option key-value pair\n" + "\n" + " [INPUT]\n" - + " infile xsl:fo input file (the same as the next)\n" + + " infile xsl:fo input file (the same as the " + + "next)\n" + " -fo infile xsl:fo input file\n" - + " -xml infile xml input file, must be used together with -xsl\n" + + " -xml infile xml input file, must be used together " + + "with -xsl\n" + " -xsl stylesheet xslt stylesheet\n" + "\n" + " [OUTPUT]\n" - + " outfile input will be rendered as pdf file into outfile\n" - + " -pdf outfile input will be rendered as pdf file (outfile req'd)\n" + + " outfile input will be rendered as pdf file " + + "into outfile\n" + + " -pdf outfile input will be rendered as pdf file " + + "(outfile req'd)\n" + " -awt input will be displayed on screen\n" - + " -mif outfile input will be rendered as mif file (outfile req'd)\n" - + " -pcl outfile input will be rendered as pcl file (outfile req'd)\n" - + " -ps outfile input will be rendered as PostScript file (outfile req'd)\n" - + " -txt outfile input will be rendered as text file (outfile req'd)\n" - + " -svg outfile input will be rendered as an svg slides file (outfile req'd)\n" - + " -at outfile representation of area tree as XML (outfile req'd)\n" - + " -print input file will be rendered and sent to the printer\n" - + " see print specific options with \"-print help\"\n" + + " -mif outfile input will be rendered as mif file " + + "(outfile req'd)\n" + + " -pcl outfile input will be rendered as pcl file " + + "(outfile req'd)\n" + + " -ps outfile input will be rendered as PostScript " + + "file (outfile req'd)\n" + + " -txt outfile input will be rendered as text file " + + "(outfile req'd)\n" + + " -svg outfile input will be rendered as an svg slides " + + "file (outfile req'd)\n" + + " -at outfile representation of area tree as XML " + + "(outfile req'd)\n" + + " -print input file will be rendered and sent to " + + "the printer\n" + + " see print specific options with " + + "\"-print help\"\n" + "\n [Examples]\n" + " FOray foo.fo foo.pdf\n" - + " FOray -fo foo.fo -pdf foo.pdf (does the same as the previous line)\n" + + " FOray -fo foo.fo -pdf foo.pdf (does the same as the " + + "previous line)\n" + " FOray -xsl foo.xsl -xml foo.xml -pdf foo.pdf\n" + " FOray foo.fo -mif foo.mif\n" + " FOray foo.fo -print or FOray -print foo.fo\n" Modified: trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -130,7 +130,8 @@ */ private XMLReader createParser() throws FOrayException { try { - SAXParserFactory spf = javax.xml.parsers.SAXParserFactory.newInstance(); + SAXParserFactory spf = javax.xml.parsers.SAXParserFactory + .newInstance(); spf.setNamespaceAware(true); XMLReader xmlReader = spf.newSAXParser().getXMLReader(); logger.info("Config: Using " @@ -155,7 +156,8 @@ } /** - * extracts the element and attribute name and sets the fitting status and datatype values + * extracts the element and attribute name and sets the fitting status and + * datatype values */ public void startElement(String uri, String localName, String qName, Attributes attributes) { @@ -179,7 +181,8 @@ } // end startElement /** - * stores subentries or entries into their hashes (map for subentries, configuration for entry) + * stores subentries or entries into their hashes (map for subentries, + * configuration for entry) */ public void endElement(String uri, String localName, String qName) { if (localName.equals("entry")) { Modified: trunk/foray/foray-app/src/java/org/foray/app/DocumentReader.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/DocumentReader.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/DocumentReader.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -118,17 +118,16 @@ throws SAXNotRecognizedException, SAXNotSupportedException { if ("http://xml.org/sax/features/namespaces".equals(name)) { return _namespaces; - } else if ("http://xml.org/sax/features/namespace-prefixes".equals(name)) { + } else if ( + "http://xml.org/sax/features/namespace-prefixes".equals(name)) { return _namespace_prefixes; } else { throw new SAXNotRecognizedException("Feature '" + name - + "' not recognized or supported by Document2SAXAdapter"); + + "' not recognized or supported by Document2SAXAdapter"); } } - - /** * Set the state of a feature. * @@ -160,11 +159,12 @@ throws SAXNotRecognizedException, SAXNotSupportedException { if ("http://xml.org/sax/features/namespaces".equals(name)) { _namespaces = value; - } else if ("http://xml.org/sax/features/namespace-prefixes".equals(name)) { + } else if ( + "http://xml.org/sax/features/namespace-prefixes".equals(name)) { _namespace_prefixes = value; } else { throw new SAXNotRecognizedException("Feature '" + name - + "' not recognized or supported by Document2SAXAdapter"); + + "' not recognized or supported by Document2SAXAdapter"); } } @@ -201,11 +201,9 @@ public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException { throw new SAXNotRecognizedException("Property '" + name - + "' not recognized or supported by Document2SAXAdapter"); + + "' not recognized or supported by Document2SAXAdapter"); } - - /** * Set the value of a property. * @@ -236,7 +234,7 @@ public void setProperty(String name, Object value) throws SAXNotRecognizedException, SAXNotSupportedException { throw new SAXNotRecognizedException("Property '" + name - + "' not recognized or supported by Document2SAXAdapter"); + + "' not recognized or supported by Document2SAXAdapter"); } @@ -401,7 +399,8 @@ if (input instanceof DocumentInputSource) { Document document = ((DocumentInputSource)input).getDocument(); if (_contentHandler == null) { - throw new SAXException("ContentHandler is null. Please use setContentHandler()"); + throw new SAXException("ContentHandler is null. Please use " + + "setContentHandler()"); } /* most of this code is modified from John Cowan's */ @@ -436,8 +435,9 @@ _contentHandler.characters(array, 0, datalen); break; case Node.PROCESSING_INSTRUCTION_NODE: - _contentHandler.processingInstruction(currentNode.getNodeName(), - currentNode.getNodeValue()); + _contentHandler.processingInstruction( + currentNode.getNodeName(), + currentNode.getNodeValue()); break; case Node.ELEMENT_NODE: NamedNodeMap map = currentNode.getAttributes(); @@ -468,9 +468,10 @@ _contentHandler.endDocument(); break; case Node.ELEMENT_NODE: - _contentHandler.endElement(currentNode.getNamespaceURI(), - currentNode.getLocalName(), - currentNode.getNodeName()); + _contentHandler.endElement( + currentNode.getNamespaceURI(), + currentNode.getLocalName(), + currentNode.getNodeName()); break; } @@ -485,7 +486,8 @@ } } else { - throw new SAXException("DocumentReader only supports parsing of a DocumentInputSource"); + throw new SAXException("DocumentReader only supports parsing of a " + + "DocumentInputSource"); } } @@ -493,9 +495,9 @@ /** - * DocumentReader requires a DocumentInputSource, so this is not - * implements and simply throws a SAXException. Use parse(DocumentInputSource) - * instead + * DocumentReader requires a DocumentInputSource, so this is not implements + * and simply throws a SAXException. + * Use parse(DocumentInputSource) instead * * @param systemId The system identifier (URI). * @exception SAXException Any SAX exception, possibly Modified: trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/FOraySession.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -207,7 +207,8 @@ if (this.textServer != null) { return; } - URL hyphenationDir = this.configuration.optionHyphenationBaseDirectory(); + URL hyphenationDir = this.configuration + .optionHyphenationBaseDirectory(); this.textServer = new org.foray.text.TextServer(getLogger(), hyphenationDir); } Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -248,8 +248,10 @@ getLogger().debug("Total memory used: " + memoryUsed + "Kb"); if (!MEM_PROFILE_WITH_GC) { - getLogger().debug(" Memory use is indicative; no GC was performed"); - getLogger().debug(" These figures should not be used comparatively"); + getLogger().debug(" Memory use is indicative; no GC was " + + "performed"); + getLogger().debug(" These figures should not be used " + + "comparatively"); } long timeUsed = System.currentTimeMillis() - startTime; @@ -257,7 +259,8 @@ getLogger().debug("Total time used: " + timeUsed + "ms"); getLogger().debug("Pages rendered: " + pageCount); if (pageCount != 0) { - getLogger().debug("Avg render time: " + (timeUsed / pageCount) + "ms/page"); + getLogger().debug("Avg render time: " + (timeUsed / pageCount) + + "ms/page"); } } @@ -288,7 +291,8 @@ } catch (FOrayException e) { throw new SAXException(e); } - this.results.haveFormattedPageSequence(pageSequence, pageCollection); + this.results.haveFormattedPageSequence(pageSequence, + pageCollection); try { processQueue(false); } catch (FOrayException e1) { Modified: trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -80,7 +80,8 @@ private void initTransformer() throws FOrayException { try { - transformer = TransformerFactory.newInstance().newTransformer (xsltSource); + transformer = TransformerFactory.newInstance().newTransformer( + xsltSource); } catch(Exception ex) { throw new FOrayException(ex); @@ -162,7 +163,8 @@ * data is fed into FOray. This should help to avoid memory problems * @param xmlfile The xmlfile containing the text data * @param xsltfile An xslt stylesheet - * @return XMLFilter an XMLFilter which can be chained together with other XMLReaders or XMLFilters + * @return XMLFilter an XMLFilter which can be chained together with other + * XMLReaders or XMLFilters */ public XMLFilter getXMLFilter(File xmlfile, File xsltfile) throws 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-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTask.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -48,9 +48,12 @@ * <li>format -> MIME type of the format to generate ex. "application/pdf"</li> * <li>outfile -> output filename</li> * <li>baseDir -> directory to work from</li> - * <li>userconfig -> file with user configuration (same as the "-c" command line option)</li> - * <li>messagelevel -> (error | warn | info | verbose | debug) level to output non-error messages</li> - * <li>logFiles -> Controls whether the names of the files that are processed are logged or not</li> + * <li>userconfig -> file with user configuration (same as the "-c" command + * line option)</li> + * <li>messagelevel -> (error | warn | info | verbose | debug) level to output + * non-error messages</li> + * <li>logFiles -> Controls whether the names of the files that are processed + * are logged or not</li> * </ul> */ public class FOrayAntTask extends Task { @@ -170,7 +173,8 @@ messageType = Project.MSG_VERBOSE; } else if (messageLevel.equalsIgnoreCase("debug")) { messageType = Project.MSG_DEBUG; - } else if (messageLevel.equalsIgnoreCase("err") || messageLevel.equalsIgnoreCase("error")) { + } else if (messageLevel.equalsIgnoreCase("err") + || messageLevel.equalsIgnoreCase("error")) { messageType = Project.MSG_ERR; } else if (messageLevel.equalsIgnoreCase("warn")) { messageType = Project.MSG_WARN; @@ -182,7 +186,8 @@ } /** - * Returns the message type corresponding to Property.MSG_(INFO | VERBOSE | DEBUG) + * Returns the message type corresponding to Property.MSG_(INFO | VERBOSE | + * DEBUG) * representing the current message level. */ public int getMessageType() { 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-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/RunTest.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -97,7 +97,8 @@ logger.info("===================================="); logger.info("The following files differ:"); boolean broke = false; - for (Iterator keys = diff.keySet().iterator(); keys.hasNext(); ) { + for (Iterator keys = diff.keySet().iterator(); + keys.hasNext(); ) { Object fname = keys.next(); Boolean pass = (Boolean)diff.get(fname); logger.info("file: " + fname @@ -107,7 +108,8 @@ } } if (broke) { - throw new BuildException("Working tests have been changed."); + throw new BuildException( + "Working tests have been changed."); } } } catch (MalformedURLException mue) { @@ -142,8 +144,8 @@ loader); Method get = cla.getMethod("getVersion", new Class[]{}); if (!get.invoke(null, new Object[]{}).equals(refVersion)) { - throw new BuildException("Reference jar is not correct version it must be: " - + refVersion); + throw new BuildException("Reference jar is not correct " + + "version it must be: " + refVersion); } } catch (IllegalAccessException iae) { failed = true; 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-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -80,8 +80,10 @@ * This will take a specified testsuite xml and process all * tests in it. * The command line options are: - * -b to set the base directory for where the testsuite and associated files are - * -failOnly to process only the tests which are specified as fail in the test results + * -b to set the base directory for where the testsuite and associated + * files are + * -failOnly to process only the tests which are specified as fail in the + * test results * -pdf to output the result as pdf */ public static void main(String[] args) { @@ -170,8 +172,8 @@ testsuite = doc.getDocumentElement(); if (testsuite.hasAttributes()) { - String profile = - testsuite.getAttributes().getNamedItem("profile").getNodeValue(); + String profile = testsuite.getAttributes().getNamedItem( + "profile").getNodeValue(); log.debug("testing test suite:" + profile); } @@ -346,8 +348,9 @@ parser.setFeature("http://xml.org/sax/features/namespace-prefixes", true); } catch (SAXException e) { - throw new FOrayException("Error in setting up parser feature namespace-prefixes\n" - + "You need a parser which supports SAX version 2", e); + throw new FOrayException("Error in setting up parser feature " + + "namespace-prefixes\n" + + "You need a parser which supports SAX version 2", e); } } 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-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -90,7 +90,8 @@ throws IOException { URL url = getClass().getResource(path); if (url == null) { - // if the given resource file not found, the english resource uses as default + /* if the given resource file not found, the english resource uses + * as default */ path = path.substring(0, path.lastIndexOf(".")) + ".en"; url = getClass().getResource(path); } 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-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -58,8 +58,8 @@ inputHandler.getInputSource(), inputHandler.getParser()); //Setup Renderer - OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, - null); + OutputTarget renderer = document.makeOutputTarget( + FOrayTarget.RENDER_PDF, null); //Setup FOrayTarget OutputStream out = new FileOutputStream(pdf); 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-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -73,8 +73,8 @@ FOrayDocument document = new FOrayDocument(driver, transformer, source); //Setup Renderer - OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, - null); + OutputTarget renderer = document.makeOutputTarget( + FOrayTarget.RENDER_PDF, null); //Setup FOrayTarget OutputStream out = new FileOutputStream(pdf); 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-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2FO.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -52,7 +52,8 @@ try { //Setup XSLT TransformerFactory factory = TransformerFactory.newInstance(); - Transformer transformer = factory.newTransformer(new StreamSource(xslt)); + Transformer transformer = factory.newTransformer( + new StreamSource(xslt)); //Setup input for XSLT transformation Source src = new StreamSource(xml); 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-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -71,8 +71,8 @@ FOrayDocument document = new FOrayDocument(driver, transformer, source); //Setup Renderer - OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, - null); + OutputTarget renderer = document.makeOutputTarget( + FOrayTarget.RENDER_PDF, null); //Setup FOrayTarget OutputStream out = new FileOutputStream(pdf); 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-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/model/ProjectTeamXMLReader.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -45,7 +45,8 @@ if (input instanceof ProjectTeamInputSource) { parse(((ProjectTeamInputSource)input).getProjectTeam()); } else { - throw new SAXException("Unsupported InputSource specified. Must be a ProjectTeamInputSource"); + throw new SAXException("Unsupported InputSource specified. Must " + + "be a ProjectTeamInputSource"); } } @@ -57,7 +58,8 @@ */ public void parse(ProjectTeam projectTeam) throws SAXException { if (projectTeam == null) { - throw new NullPointerException("Parameter projectTeam must not be null"); + throw new NullPointerException("Parameter projectTeam must not be " + + "null"); } if (handler == null) { throw new IllegalStateException("ContentHandler not set"); @@ -81,7 +83,8 @@ */ protected void generateFor(ProjectTeam projectTeam) throws SAXException { if (projectTeam == null) { - throw new NullPointerException("Parameter projectTeam must not be null"); + throw new NullPointerException("Parameter projectTeam must not be " + + "null"); } if (handler == null) { throw new IllegalStateException("ContentHandler not set"); @@ -102,9 +105,11 @@ * @param projectMember ProjectMember object to use * @throws SAXException In case of a problem during SAX event generation */ - protected void generateFor(ProjectMember projectMember) throws SAXException { + protected void generateFor(ProjectMember projectMember) + throws SAXException { if (projectMember == null) { - throw new NullPointerException("Parameter projectMember must not be null"); + throw new NullPointerException("Parameter projectMember must not " + + "be null"); } if (handler == null) { throw new IllegalStateException("ContentHandler not set"); Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyGenerationContentHandlerProxy.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyGenerationContentHandlerProxy.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/tools/EasyGenerationContentHandlerProxy.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -20,7 +20,9 @@ * */ -/* $Id$ */ +/* +$Id$ +*/ package org.foray.demo.embed.tools; @@ -58,7 +60,8 @@ /** * Sends the notification of the beginning of an element. * @param name Name for the element. - * @throws SAXException Any SAX exception, possibly wrapping another exception. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. */ public void startElement(String name) throws SAXException { startElement(name, EMPTY_ATTS); @@ -70,7 +73,8 @@ * @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. - * @throws SAXException Any SAX exception, possibly wrapping another exception. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. */ public void startElement(String name, Attributes atts) throws SAXException { startElement(null, name, name, atts); @@ -80,7 +84,8 @@ /** * Send a String of character data. * @param s The content String - * @throws SAXException Any SAX exception, possibly wrapping another exception. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. */ public void characters(String s) throws SAXException { target.characters(s.toCharArray(), 0, s.length()); @@ -90,7 +95,8 @@ /** * Send the notification of the end of an element. * @param name Name for the element. - * @throws SAXException Any SAX exception, possibly wrapping another exception. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. */ public void endElement(String name) throws SAXException { endElement(null, name, name); @@ -101,7 +107,8 @@ * Sends notifications for a whole element with some String content. * @param name Name for the element. * @param value Content of the element. - * @throws SAXException Any SAX exception, possibly wrapping another exception. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. */ public void element(String name, String value) throws SAXException { element(name, value, EMPTY_ATTS); @@ -114,9 +121,11 @@ * @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. - * @throws SAXException Any SAX exception, possibly wrapping another exception. + * @throws SAXException Any SAX exception, possibly wrapping another + * exception. */ - public void element(String name, String value, Attributes atts) throws SAXException { + public void element(String name, String value, Attributes atts) + throws SAXException { startElement(name, atts); if (value != null) { characters(value.toCharArray(), 0, value.length()); @@ -153,7 +162,8 @@ /** * @see org.xml.sax.ContentHandler#startPrefixMapping(String, String) */ - public void startPrefixMapping(String prefix, String uri) throws SAXException { + public void startPrefixMapping(String prefix, String uri) + throws SAXException { target.startPrefixMapping(prefix, uri); } @@ -167,9 +177,11 @@ /** - * @see org.xml.sax.ContentHandler#startElement(String, String, String, Attributes) + * @see org.xml.sax.ContentHandler#startElement(String, String, String, + * Attributes) */ - public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException { + public void startElement(String namespaceURI, String localName, + String qName, Attributes atts) throws SAXException { target.startElement(namespaceURI, localName, qName, atts); } @@ -177,7 +189,8 @@ /** * @see org.xml.sax.ContentHandler#endElement(String, String, String) */ - public void endElement(String namespaceURI, String localName, String qName) throws SAXException { + public void endElement(String namespaceURI, String localName, String qName) + throws SAXException { target.endElement(namespaceURI, localName, qName); } @@ -185,7 +198,8 @@ /** * @see org.xml.sax.ContentHandler#characters(char[], int, int) */ - public void characters(char[] ch, int start, int length) throws SAXException { + public void characters(char[] ch, int start, int length) + throws SAXException { target.characters(ch, start, length); } @@ -193,7 +207,8 @@ /** * @see org.xml.sax.ContentHandler#ignorableWhitespace(char[], int, int) */ - public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException { + public void ignorableWhitespace(char[] ch, int start, int length) + throws SAXException { target.ignorableWhitespace(ch, start, length); } @@ -201,7 +216,8 @@ /** * @see org.xml.sax.ContentHandler#processingInstruction(String, String) */ - public void processingInstruction(String target, String data) throws SAXException { + public void processingInstruction(String target, String data) + throws SAXException { this.target.processingInstruction(target, data); } 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-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -166,8 +166,8 @@ FOrayDocument document = setupSAXDocument(session, inputHandler); // Setup the Renderer - OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, - null); + OutputTarget renderer = document.makeOutputTarget( + FOrayTarget.RENDER_PDF, null); // Setup FOrayTarget ByteArrayOutputStream output = new ByteArrayOutputStream(); @@ -209,8 +209,8 @@ source); // Setup the Renderer - OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, - null); + OutputTarget renderer = document.makeOutputTarget( + FOrayTarget.RENDER_PDF, null); // Setup FOrayTarget ByteArrayOutputStream output = new ByteArrayOutputStream(); 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-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoPrintServlet.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -48,7 +48,7 @@ * * Example URL: http://servername/foray/servlet/DemoPrintServlet?fo=readme.fo * Example URL: - * http://servername/foray/servlet/DemoPrintServlet?xml=data.xml&xsl=format.xsl + * http://servername/foray/servlet/DemoPrintServlet?xml=data.xml&xsl=format.xsl * Compiling: you will need * - servlet_2_2.jar * - foray.jar @@ -92,7 +92,8 @@ } /** - * Renders an FO generated using an XML and a stylesheet to the default printer. + * Renders an FO generated using an XML and a stylesheet to the default + * printer. */ public void renderXML(File xmlFile, File xslFile, HttpServletResponse response) throws ServletException { 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-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -118,8 +118,8 @@ private FOrayTarget setupTarget(FOrayDocument document) throws FOrayException { // Setup the Renderer - OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, - null); + OutputTarget renderer = document.makeOutputTarget( + FOrayTarget.RENDER_PDF, null); // Setup FOrayTarget ByteArrayOutputStream output = new ByteArrayOutputStream(); FOrayTarget target = new FOrayTarget(document, renderer, null, output); Modified: trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-areatree/src/java/org/foray/area/BlockContainerRA.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -33,8 +33,8 @@ public class BlockContainerRA extends ContainerRA implements BlockContainerArea { - private int xPosition; // should be able to take value 'left' and 'right' too - private int yPosition; // should be able to take value 'top' and 'bottom' too + private int xPosition; + private int yPosition; public BlockContainerRA(FObj generatedBy, Area parentArea, int xPosition, int yPosition) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -82,18 +82,21 @@ SpanRA spanArea = (SpanRA)spanAreas.get(spanAreas.size() - 1); - if ((span == Constants.FOVAL_ALL) && (spanArea.traitColumnCount() == 1)) { + if ((span == Constants.FOVAL_ALL) + && (spanArea.traitColumnCount() == 1)) { // return the single column area in the same span area return spanArea.getCurrentColumnArea(); } else if ((span == Constants.FOVAL_NONE) - && (spanArea.traitColumnCount() == this.traitColumnCount())) { + && (spanArea.traitColumnCount() + == this.traitColumnCount())) { // return the current column area in the same span area return spanArea.getCurrentColumnArea(); } else if (span == Constants.FOVAL_ALL) { // create new span area with one column; return column area return addSpanArea(1); } else if (span == Constants.FOVAL_NONE) { - // create new span area with multiple columns; return first column area + /* create new span area with multiple columns; return first column + * area */ return addSpanArea(this.traitColumnCount()); } else { throw new FOrayException("BodyAreaContainer::getNextArea(): Span " Modified: trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-areatree/src/java/org/foray/area/NormalFlowRA.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -45,7 +45,8 @@ Area overflowArea = getParentArea().getOverflowArea(this); // If parent SpanArea can create another column if (overflowArea instanceof NormalFlowRA) { - return new NormalBlockArea(childRequesting.traitGeneratedBy(), this); + return new NormalBlockArea(childRequesting.traitGeneratedBy(), + this); } // If a new page was created if (overflowArea instanceof MainRA) { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-04-27 20:49:09 UTC (rev 7084) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java 2006-04-27 22:50:20 UTC (rev 7085) @@ -182,7 +182,8 @@ } int lastPageNumber = previousPageCollection.getCurrentPageNumber() - 1; int computedPageNumber = pageSeq.traitInitialPageNumber(lastPageNumber); - if (pageSeq.getRawInitialPageNumber() == Constants.FOVAL_NOT_A_KEYWORD) { + if (pageSeq.getRawInitialPageNumber() + == Constants.FOVAL_NOT_A_KEYWORD) { /* * If the user set the page number explicitly, there is nothing * else to do but set it and go. @@ -229,7 +230,8 @@ */ PageSequence previousPageSequence = previousPageCollection.getPageSequence(); - if (previousPageSequence.traitForcePageCount() == Constants.FOVAL_AUT... [truncated message content] |
|
From: <vic...@us...> - 2006-04-27 20:49:56
|
Revision: 7084 Author: victormote Date: 2006-04-27 13:49:09 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7084&view=rev Log Message: ----------- Style changes only. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java trunk/foray/scripts/checkstyle-config.xml Modified: trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-app/src/java/org/foray/app/ConfigurationParser.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -139,7 +139,7 @@ } catch (javax.xml.parsers.ParserConfigurationException e) { throw new FOrayException(e); } catch (SAXException e) { - throw new FOrayException( e); + throw new FOrayException(e); } } Modified: trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -96,7 +96,7 @@ } catch (javax.xml.parsers.ParserConfigurationException e) { throw new FOrayException(e); } catch (SAXException e) { - throw new FOrayException( e); + throw new FOrayException(e); } } Modified: trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-app/src/java/org/foray/app/TraxInputHandler.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -82,7 +82,7 @@ try { transformer = TransformerFactory.newInstance().newTransformer (xsltSource); } - catch( Exception ex) { + catch(Exception ex) { throw new FOrayException(ex); } } 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-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOrayAntTaskStarter.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -138,10 +138,11 @@ // OR output file doesn't exist OR // output file is older than input file if (task.getForce() || !outf.exists() - || (task.getFofile().lastModified() > outf.lastModified() )) { + || (task.getFofile().lastModified() > outf.lastModified())) { render(task.getFofile(), outf); actioncount++; - } else if (outf.exists() && (task.getFofile().lastModified() <= outf.lastModified() )) { + } else if (outf.exists() + && (task.getFofile().lastModified() <= outf.lastModified())) { skippedcount++; } } @@ -201,10 +202,11 @@ // OR output file doesn't exist OR // output file is older than input file if (task.getForce() || !outf.exists() - || (f.lastModified() > outf.lastModified() )) { + || (f.lastModified() > outf.lastModified())) { render(f, outf); actioncount++; - } else if (outf.exists() && (f.lastModified() <= outf.lastModified() )) { + } else if (outf.exists() + && (f.lastModified() <= outf.lastModified())) { skippedcount++; } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -142,7 +142,7 @@ if (leaderSpaceAvailable == 0) { return; } - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof LeaderArea) { LeaderArea leader = (LeaderArea) object; @@ -167,7 +167,7 @@ private int computeLeaderCapacity(int unusedSpace) { // First, compute how much capacity the leaders have. int leaderSpaceAvailable = 0; - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof LeaderArea) { LeaderArea leader = (LeaderArea) object; @@ -223,7 +223,7 @@ if (wordSpacingCapacity == 0) { return; } - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof TextArea) { TextArea text = (TextArea) object; @@ -245,7 +245,7 @@ */ private int computeWordSpacingCapacity(int unusedSpace) { int wordSpacingCapacity = 0; - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof TextArea) { TextArea text = (TextArea) object; @@ -292,7 +292,7 @@ if (letterSpacingCapacity == 0) { return; } - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof TextArea) { TextArea text = (TextArea) object; @@ -314,7 +314,7 @@ */ private int computeLetterSpacingCapacity(int unusedSpace) { int letterSpacingCapacity = 0; - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof TextArea) { TextArea text = (TextArea) object; @@ -366,7 +366,7 @@ * absorb a relatively larger share of the change in word-space. */ int totalDenominator = 0; - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof TextArea) { TextArea text = (TextArea) object; @@ -377,7 +377,7 @@ if (totalDenominator == 0) { return; } - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object object = children.get(i); if (object instanceof TextArea) { TextArea text = (TextArea) object; @@ -399,7 +399,7 @@ */ public void verticalAlign() { int maxHeight = this.getProgressionDimension(); - for (int i = 0; i < children.size(); i++ ) { + for (int i = 0; i < children.size(); i++) { Object o = children.get(i); if (o instanceof AbstractInlineArea) { AbstractInlineArea ia = (AbstractInlineArea)o; Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -502,7 +502,7 @@ PageCollection areaTree = getPageCollection(); if (retrieve.traitRetrieveBoundary() == Constants.FOVAL_PAGE_SEQUENCE) { PageSequence pageSequence = areaTree.getCurrentPageSequence(); - if (pageSequence == getPageSequence() ) { + if (pageSequence == getPageSequence()) { additionalMarkers = areaTree.getCurrentPageSequenceMarkers(); } } else if (retrieve.traitRetrieveBoundary() == Constants.FOVAL_DOCUMENT) { Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontUse.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -231,7 +231,7 @@ */ public int smallCapsSize(int fontSize) { float percent = this.registeredFontDesc.getSimulateSmallCaps(); - if ( percent == Float.NaN) { + if (percent == Float.NaN) { return fontSize; } return Math.round(fontSize * percent / 100); Modified: trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-font/src/java/org/foray/font/FreeStandingFont.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -238,7 +238,7 @@ protected InputStream getFontInputStream() { FontFileReader fontFileReader = this.registeredFont.getFontFileReader(); - if ( fontFileReader == null) { + if (fontFileReader == null) { return null; } InputStream instream = null; Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -41,7 +41,7 @@ protected void addCharacters(char data[], int start, int length, String systemId, int line, int column) { - if (textBuffer == null ) { + if (textBuffer == null) { textBuffer = new StringBuffer(); } textBuffer.append(data,start,length); Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -68,7 +68,7 @@ boolean isEmptyPage) { // page-position int pagePosition = traitPagePosition(); - if (isFirstPage ) { + if (isFirstPage) { if (pagePosition == Constants.FOVAL_REST) { return false; } else if (pagePosition == Constants.FOVAL_LAST) { Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -89,7 +89,7 @@ public void reset() { currentSubSequenceNumber = -1; currentSubSequence = null; - for (int i = 0; i< subSequenceSpecifiers.size(); i++ ) { + for (int i = 0; i< subSequenceSpecifiers.size(); i++) { ((SubSequenceSpecifier)subSequenceSpecifiers.get(i)).reset(); } } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -100,13 +100,13 @@ return Math.round(percentage * ipdContainingRA / 100); } if (this.value instanceof FnLabelEnd - && direction == DtWritingMode.DIRECTION_END ) { + && direction == DtWritingMode.DIRECTION_END) { FnLabelEnd function = (FnLabelEnd) this.value; DtLength lengthDT = function.eval(fobj, ipdContainingRA); return lengthDT.getValue(fobj.traitFontSize(), 0); } if (this.value instanceof FnBodyStart - && direction == DtWritingMode.DIRECTION_START ) { + && direction == DtWritingMode.DIRECTION_START) { FnBodyStart function = (FnBodyStart) this.value; DtLength lengthDT = function.eval(fobj, ipdContainingRA); return lengthDT.getValue(fobj.traitFontSize(), 0); Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/xml/prop/Lang.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -70,7 +70,7 @@ StringTokenizer st = new StringTokenizer(value); ArrayList tokenList = new ArrayList(st.countTokens()); while (st.hasMoreTokens()) { - tokenList.add( st.nextToken()); + tokenList.add(st.nextToken()); } if (tokenList.size() < 1 || tokenList.size() > MAX_TOKENS) { throw new PropertyException(unexpectedValueMessage(value, propertyList)); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -77,7 +77,7 @@ } NormalBlockArea ba = la.ancestorNormalBlockArea(); start = addTextItemToLine(la, lineText, start, end); - while ( start != -1) { + while (start != -1) { la = layout.createNextLineArea(ba); if (la == null) { return start; Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/PioneerLS.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -170,7 +170,7 @@ public void setPendingFootnotes(PageRA pageArea, ArrayList footnotes) { pageArea.footnotes = footnotes; if (footnotes != null) { - for (int i = 0; i < footnotes.size(); i++ ) { + for (int i = 0; i < footnotes.size(); i++) { FootnoteBody fb = (FootnoteBody)footnotes.get(i); FootnoteBodyPL fbPL = ((FootnoteBodyPL) getFObjProxy(fb)); Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/Status.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -50,7 +50,7 @@ } public static boolean isPageBreak(int code) { - switch( code) { + switch(code) { case FORCE_PAGE_BREAK: case FORCE_PAGE_BREAK_EVEN: case FORCE_PAGE_BREAK_ODD: Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -279,7 +279,7 @@ for (int i = 0; i < table.getTableColumns().size(); i++) { TableColumn c = (TableColumn) table.getTableColumns().get(i); TableColumnPL tablecolumnPL = (TableColumnPL) getFObjProxy(c); - if ( c != null) { + if (c != null) { tablecolumnPL.setHeight(areaContainer.crBPD()); } } Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-ps/src/java/org/foray/ps/PSInterpreter.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -451,7 +451,7 @@ */ if (procedureStack.size() > 0) { procedureBeingBuilt = (ArrayList) - procedureStack.get(procedureStack.size() - 1); + procedureStack.get(procedureStack.size() - 1); procedureStack.remove(procedureStack.size() - 1); // Otherwise, make it null. } else { Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -225,7 +225,7 @@ } try { - Graphic graphic = new TempImage(null, width, height, result, mask); + Graphic graphic = new TempImage(null, width, height, result, mask); AffineTransform at = getTransform(); double[] matrix = new double[6]; at.getMatrix(matrix); Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -481,7 +481,7 @@ //log.debug("drawing SVG image: "+x+"/"+y+" "+w+"/"+h); SVGSVGElement svg = ((SVGDocument) doc).getRootElement(); AffineTransform at = ViewBox.getPreserveAspectRatioTransform(svg, - w/1000f , h/1000f ); + w/1000f , h/1000f); ctx = null; builder = null; Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -513,7 +513,7 @@ } public void render(PageArea page) { - if ( firstPage ) { + if (firstPage) { firstPage = false; } else { currentStream.add(pageEnding); Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java 2006-04-27 20:49:09 UTC (rev 7084) @@ -528,7 +528,7 @@ public void startOutput() throws IOException { getLogger().debug("rendering areas to XML"); this.writer = new PrintWriter(this.getOutputStream()); - this.writer.write( "<?xml version=\"1.0\"?>\n<!-- produced by " + this.writer.write("<?xml version=\"1.0\"?>\n<!-- produced by " + this.getOutputControl().getVersion() + " -->\n"); writeStartTag("<AreaTree>"); } Modified: trunk/foray/scripts/checkstyle-config.xml =================================================================== --- trunk/foray/scripts/checkstyle-config.xml 2006-04-27 20:28:07 UTC (rev 7083) +++ trunk/foray/scripts/checkstyle-config.xml 2006-04-27 20:49:09 UTC (rev 7084) @@ -30,16 +30,16 @@ </module> <module name="EmptyForInitializerPad"> <property name="option" value="nospace"/> - <property name="severity" value="ignore"/> + <property name="severity" value="warning"/> </module> <module name="ParenPad"> <property name="option" value="nospace"/> - <property name="severity" value="ignore"/> + <property name="severity" value="warning"/> <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, SUPER_CTOR_CALL"/> </module> <module name="TabCharacter"> - <property name="severity" value="ignore"/> + <property name="severity" value="error"/> </module> </module> </module> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-27 20:28:36
|
Revision: 7083 Author: victormote Date: 2006-04-27 13:28:07 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7083&view=rev Log Message: ----------- Style changes only. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java trunk/foray/foray-app/src/java/org/foray/app/Starter.java trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFTextString.java trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java trunk/foray/scripts/checkstyle-config.xml Modified: trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-04-27 20:28:07 UTC (rev 7083) @@ -39,14 +39,14 @@ import javax.xml.parsers.SAXParserFactory; -abstract public class InputHandler { +public abstract class InputHandler { Log logger; - abstract public InputSource getInputSource() throws IOException ; - abstract public XMLReader getParser() throws FOrayException; + public abstract InputSource getInputSource() throws IOException ; + public abstract XMLReader getParser() throws FOrayException; - abstract public void run(FOrayDocument driver) throws FOrayException; + public abstract void run(FOrayDocument driver) throws FOrayException; public InputHandler(Log logger) { this.logger = logger; Modified: trunk/foray/foray-app/src/java/org/foray/app/Starter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/Starter.java 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/foray-app/src/java/org/foray/app/Starter.java 2006-04-27 20:28:07 UTC (rev 7083) @@ -54,7 +54,7 @@ this.inputHandler = inputHandler; } - abstract public void run() throws FOrayException; + public abstract void run() throws FOrayException; public Log getLogger() { return this.logger; Modified: trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/foray-common/src/java/org/foray/common/OrderedTreeNode.java 2006-04-27 20:28:07 UTC (rev 7083) @@ -46,7 +46,7 @@ * of a leaf node's children is requested. * Note: This code was copied from javax.swing.tree.DefaultMutableTreeNode. */ - static public final Enumeration EMPTY_ENUMERATION = new Enumeration() { + public static final Enumeration EMPTY_ENUMERATION = new Enumeration() { public boolean hasMoreElements() { return false; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalDistanceBetweenStarts.java 2006-04-27 20:28:07 UTC (rev 7083) @@ -38,7 +38,7 @@ public class ProvisionalDistanceBetweenStarts extends Property { /** Initial value is 24 pts, per the spec. */ - private final static int initialValue = 24000; + private static final int initialValue = 24000; private static final short[] validKeywords = { Constants.FOVAL_INHERIT, Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ProvisionalLabelSeparation.java 2006-04-27 20:28:07 UTC (rev 7083) @@ -38,7 +38,7 @@ public class ProvisionalLabelSeparation extends Property { /** Initial value is 6 pts, per the spec. */ - private final static int initialValue = 6000; + private static final int initialValue = 6000; private static final short[] validKeywords = { Constants.FOVAL_INHERIT, Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFTextString.java =================================================================== --- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFTextString.java 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFTextString.java 2006-04-27 20:28:07 UTC (rev 7083) @@ -35,7 +35,7 @@ * This char is returned when a Unicode character cannot be encoded using * the PDFDocEncoding. */ - public final static char INVALID_PDF_DOC_ENCODING = 0xffff; + public static final char INVALID_PDF_DOC_ENCODING = 0xffff; public PDFTextString(PDFDocument doc, String string) { super(doc, string, null); Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java =================================================================== --- trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java 2006-04-27 20:28:07 UTC (rev 7083) @@ -31,11 +31,11 @@ */ public abstract class PSStack { - public final static byte STACK_UNKNOWN = 1; - public final static byte STACK_OPERAND = 2; - public final static byte STACK_DICTIONARY = 3; - public final static byte STACK_EXECUTION = 4; - public final static byte STACK_GRAPHICS_STATE = 5; + public static final byte STACK_UNKNOWN = 1; + public static final byte STACK_OPERAND = 2; + public static final byte STACK_DICTIONARY = 3; + public static final byte STACK_EXECUTION = 4; + public static final byte STACK_GRAPHICS_STATE = 5; private PSInterpreter interpreter; Modified: trunk/foray/scripts/checkstyle-config.xml =================================================================== --- trunk/foray/scripts/checkstyle-config.xml 2006-04-27 20:05:52 UTC (rev 7082) +++ trunk/foray/scripts/checkstyle-config.xml 2006-04-27 20:28:07 UTC (rev 7083) @@ -12,7 +12,7 @@ <module name="Checker"> <module name="TreeWalker"> <module name="ModifierOrder"> - <property name="severity" value="ignore"/> + <property name="severity" value="error"/> </module> <module name="NeedBraces"> <property name="severity" value="error"/> @@ -20,7 +20,7 @@ LITERAL_FOR, LITERAL_WHILE"/> </module> <module name="AvoidStarImport"> - <property name="severity" value="ignore"/> + <property name="severity" value="error"/> </module> <module name="LineLength"> <property name="ignorePattern" value="^$"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-27 20:06:24
|
Revision: 7082 Author: victormote Date: 2006-04-27 13:05:52 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7082&view=rev Log Message: ----------- Integrate checkstyle into the build scripts. Modified Paths: -------------- trunk/foray/foray-app/scripts/build.xml trunk/foray/foray-areatree/scripts/build.xml trunk/foray/foray-common/scripts/build.xml trunk/foray/foray-font/scripts/build.xml trunk/foray/foray-fotree/scripts/build.xml trunk/foray/foray-graphic/scripts/build.xml trunk/foray/foray-mif/scripts/build.xml trunk/foray/foray-output/scripts/build.xml trunk/foray/foray-pdf/scripts/build.xml trunk/foray/foray-pioneer/scripts/build.xml trunk/foray/foray-pretty/scripts/build.xml trunk/foray/foray-ps/scripts/build.xml trunk/foray/foray-render/scripts/build.xml trunk/foray/foray-text/scripts/build.xml trunk/foray/scripts/build.xml trunk/foray/scripts/foray-build.properties Modified: trunk/foray/foray-app/scripts/build.xml =================================================================== --- trunk/foray/foray-app/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-app/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -124,7 +124,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -173,6 +173,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-areatree/scripts/build.xml =================================================================== --- trunk/foray/foray-areatree/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-areatree/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -96,7 +96,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -150,6 +150,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-common/scripts/build.xml =================================================================== --- trunk/foray/foray-common/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-common/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -96,7 +96,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -150,6 +150,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-font/scripts/build.xml =================================================================== --- trunk/foray/foray-font/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-font/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -106,7 +106,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -160,6 +160,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-fotree/scripts/build.xml =================================================================== --- trunk/foray/foray-fotree/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-fotree/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -104,7 +104,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -158,6 +158,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-graphic/scripts/build.xml =================================================================== --- trunk/foray/foray-graphic/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-graphic/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -147,7 +147,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -201,6 +201,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-mif/scripts/build.xml =================================================================== --- trunk/foray/foray-mif/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-mif/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -92,7 +92,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -146,6 +146,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-output/scripts/build.xml =================================================================== --- trunk/foray/foray-output/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-output/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -105,7 +105,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -159,6 +159,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-pdf/scripts/build.xml =================================================================== --- trunk/foray/foray-pdf/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-pdf/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -96,7 +96,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -150,6 +150,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-pioneer/scripts/build.xml =================================================================== --- trunk/foray/foray-pioneer/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-pioneer/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -99,7 +99,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -153,6 +153,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-pretty/scripts/build.xml =================================================================== --- trunk/foray/foray-pretty/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-pretty/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -96,7 +96,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -150,6 +150,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-ps/scripts/build.xml =================================================================== --- trunk/foray/foray-ps/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-ps/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -99,7 +99,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -153,6 +153,28 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}"> + <include name="**/*.java"/> + <!-- The GlyphList classes cause checkstyle to exceed stack limits. --> + <exclude name="**/GlyphListAGL*.java"/> + </fileset> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-render/scripts/build.xml =================================================================== --- trunk/foray/foray-render/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-render/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -116,7 +116,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile" + <target name="package" depends="compile, style" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -170,6 +170,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/foray-text/scripts/build.xml =================================================================== --- trunk/foray/foray-text/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/foray-text/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -119,7 +119,7 @@ <!-- =================================================================== --> <!-- Creates the class package --> <!-- =================================================================== --> - <target name="package" depends="compile, hyphenation" + <target name="package" depends="compile, style, hyphenation" description="Generates the jar files (default target)"> <echo message="Creating the jar file ${build.dir}/${name}.jar"/> @@ -181,6 +181,24 @@ <delete dir="${build.dir}"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle" + if="checkstyle.home"> + <taskdef name="checkstyle" + classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> + <classpath> + <fileset dir="${checkstyle.home}"> + <include name="checkstyle-all-*.jar"/> + </fileset> + </classpath> + </taskdef> + <checkstyle config="../../scripts/checkstyle-config.xml"> + <fileset dir="${src.dir}" includes="**/*.java"/> + </checkstyle> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/scripts/build.xml =================================================================== --- trunk/foray/scripts/build.xml 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/scripts/build.xml 2006-04-27 20:05:52 UTC (rev 7082) @@ -25,7 +25,7 @@ <property name="foray.home" location=".."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> @@ -73,85 +73,85 @@ inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-pretty/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-ps/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-graphic/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-mif/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-font/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-text/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-pdf/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-fotree/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-areatree/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-pioneer/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-output/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-render/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> <ant antfile="${foray.home}/foray-app/scripts/build.xml" inheritall="false" target="package"> <property name="foray.config" value="${foray.config}"/> - </ant> + </ant> </target> @@ -333,9 +333,6 @@ <fileset dir="${jai.libs}"> <include name="jai*.jar"/> </fileset> - <fileset dir="${icu4j.libs}"> - <include name="icu*.jar"/> - </fileset> </path> <javadoc @@ -503,6 +500,54 @@ target="clean"/> </target> + <!-- =================================================================== --> + <!-- Checkstyle --> + <!-- =================================================================== --> + <target name="style" depends="init" description="Runs checkstyle"> + <ant antfile="${foray.home}/foray-common/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-pretty/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-ps/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-graphic/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-mif/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-font/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-text/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-pdf/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-fotree/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-areatree/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-pioneer/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-output/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-render/scripts/build.xml" + inheritall="false" + target="style"/> + <ant antfile="${foray.home}/foray-app/scripts/build.xml" + inheritall="false" + target="style"/> + </target> + </project> <!-- Last Line of $RCSfile$ --> Modified: trunk/foray/scripts/foray-build.properties =================================================================== --- trunk/foray/scripts/foray-build.properties 2006-04-27 17:49:59 UTC (rev 7081) +++ trunk/foray/scripts/foray-build.properties 2006-04-27 20:05:52 UTC (rev 7082) @@ -46,4 +46,9 @@ # Sample typical value: # jai.libs = D:/rsrc/java/jai/jai-1_1_1_01/lib +# checkstyle.home +# Directory containing Checkstyle. +# Sample typical value: +# checkstyle.home = D:/rsrc/checkstyle/checkstyle4.1 + # Last line of file. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-27 17:51:47
|
Revision: 7081 Author: victormote Date: 2006-04-27 10:49:59 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7081&view=rev Log Message: ----------- 1. Configure remaining packages to use checkstyle. 2. Fix current checkstyle errors. Modified Paths: -------------- trunk/foray/foray-app/.project trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java trunk/foray/foray-areatree/.project trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java trunk/foray/foray-common/src/java/org/foray/common/ClassService.java trunk/foray/foray-fotree/.project trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberGenerator.java trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java trunk/foray/foray-mif/.project trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java trunk/foray/foray-output/.project trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java trunk/foray/foray-pioneer/.project trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java trunk/foray/foray-pretty/.project trunk/foray/foray-render/.project trunk/foray/foray-render/src/java/org/foray/render/Renderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLStream.java trunk/foray/foray-render/src/java/org/foray/render/ps/ASCII85OutputStream.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java trunk/foray/foray-render/src/java/org/foray/render/txt/TXTStream.java trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java trunk/foray/foray-text/.project trunk/foray/foray-text/src/java/org/foray/text/hyphen/ByteVector.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/CharVector.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/Hyphen.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/HyphenationTree.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/PatternParser.java trunk/foray/foray-text/src/java/org/foray/text/hyphen/TernaryTree.java Added Paths: ----------- trunk/foray/foray-app/.checkstyle trunk/foray/foray-areatree/.checkstyle trunk/foray/foray-common/.checkstyle trunk/foray/foray-font/.checkstyle trunk/foray/foray-fotree/.checkstyle trunk/foray/foray-graphic/.checkstyle trunk/foray/foray-mif/.checkstyle trunk/foray/foray-output/.checkstyle trunk/foray/foray-pdf/.checkstyle trunk/foray/foray-pioneer/.checkstyle trunk/foray/foray-pretty/.checkstyle trunk/foray/foray-ps/.checkstyle trunk/foray/foray-render/.checkstyle trunk/foray/foray-text/.checkstyle Added: trunk/foray/foray-app/.checkstyle =================================================================== --- trunk/foray/foray-app/.checkstyle (rev 0) +++ trunk/foray/foray-app/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-app/.project =================================================================== --- trunk/foray/foray-app/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-app/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -16,8 +16,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-app/src/java/org/foray/app/AWTStarter.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -150,10 +150,12 @@ // center window Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); Dimension frameSize = frame.getSize(); - if (frameSize.height > screenSize.height) + if (frameSize.height > screenSize.height) { frameSize.height = screenSize.height; - if (frameSize.width > screenSize.width) + } + if (frameSize.width > screenSize.width) { frameSize.width = screenSize.width; + } frame.setLocation((screenSize.width - frameSize.width) / 2, (screenSize.height - frameSize.height) / 2); frame.setVisible(true); Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -208,8 +208,9 @@ public void startRenderer() throws FOrayException { pageCount = 0; - if (MEM_PROFILE_WITH_GC) + if (MEM_PROFILE_WITH_GC) { System.gc(); // This takes time but gives better results + } initialMemory = runtime.totalMemory() - runtime.freeMemory(); startTime = System.currentTimeMillis(); @@ -235,8 +236,9 @@ throw new SAXException(e); } - if (MEM_PROFILE_WITH_GC) + if (MEM_PROFILE_WITH_GC) { System.gc(); // This takes time but gives better results + } long memoryNow = runtime.totalMemory() - runtime.freeMemory(); long memoryUsed = (memoryNow - initialMemory) / 1024L; Modified: trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-app/src/java/org/foray/app/InputHandler.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -66,10 +66,12 @@ /* this code adapted from James Clark's in XT */ String path = file.getAbsolutePath(); String fSep = System.getProperty("file.separator"); - if (fSep != null && fSep.length() == 1) + if (fSep != null && fSep.length() == 1) { path = path.replace(fSep.charAt(0), '/'); - if (path.length() > 0 && path.charAt(0) != '/') + } + if (path.length() > 0 && path.charAt(0) != '/') { path = '/' + path; + } try { return new InputSource(new URL("file", null, path).toString()); } catch (MalformedURLException e) { 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-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoAWTViewer.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -74,10 +74,12 @@ // center window Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); Dimension frameSize = frame.getSize(); - if (frameSize.height > screenSize.height) + if (frameSize.height > screenSize.height) { frameSize.height = screenSize.height; - if (frameSize.width > screenSize.width) + } + if (frameSize.width > screenSize.width) { frameSize.width = screenSize.width; + } frame.setLocation((screenSize.width - frameSize.width) / 2, (screenSize.height - frameSize.height) / 2); frame.setVisible(true); Added: trunk/foray/foray-areatree/.checkstyle =================================================================== --- trunk/foray/foray-areatree/.checkstyle (rev 0) +++ trunk/foray/foray-areatree/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-areatree/.project =================================================================== --- trunk/foray/foray-areatree/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-areatree/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-areatree/src/java/org/foray/area/MainRA.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -65,10 +65,11 @@ isNewSpanArea = false; int span = Constants.FOVAL_NONE; - if (fo instanceof Block) + if (fo instanceof Block) { span = ((Block)fo).traitSpan(); - else if (fo instanceof BlockContainer) + } else if (fo instanceof BlockContainer) { span = ((BlockContainer)fo).traitSpan(); + } if (this.getChildren().isEmpty()) { if (span == Constants.FOVAL_ALL) { @@ -118,33 +119,38 @@ * @return boolean True if we need to balance. */ public boolean isBalancingRequired(FObj fo) { - if (this.getChildren().isEmpty()) + if (this.getChildren().isEmpty()) { return false; + } List spanAreas = this.getChildren(); SpanRA spanArea = (SpanRA)spanAreas.get(spanAreas.size() - 1); - if (spanArea.isBalanced()) + if (spanArea.isBalanced()) { return false; + } int span = Constants.FOVAL_NONE; - if (fo instanceof Block) + if (fo instanceof Block) { span = ((Block)fo).traitSpan(); - else if (fo instanceof BlockContainer) + } else if (fo instanceof BlockContainer) { span = ((BlockContainer)fo).traitSpan(); + } - if ((span == Constants.FOVAL_ALL) && (spanArea.traitColumnCount() == 1)) + if ((span == Constants.FOVAL_ALL) + && (spanArea.traitColumnCount() == 1)) { return false; - else if ((span == Constants.FOVAL_NONE) - && (spanArea.traitColumnCount() == traitColumnCount())) + } else if ((span == Constants.FOVAL_NONE) + && (spanArea.traitColumnCount() == traitColumnCount())) { return false; - else if (span == Constants.FOVAL_ALL) + } else if (span == Constants.FOVAL_ALL) { return true; - else if (span == Constants.FOVAL_NONE) + } else if (span == Constants.FOVAL_NONE) { return false; - else + } else { return false; + } } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-areatree/src/java/org/foray/area/SpanRA.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -75,10 +75,11 @@ } public void setCurrentColumn(int currentColumn) { - if (currentColumn <= traitColumnCount()) + if (currentColumn <= traitColumnCount()) { this.currentColumn = currentColumn; - else + } else { this.currentColumn = traitColumnCount(); + } } public NormalFlowRA getCurrentColumnArea() { @@ -106,8 +107,9 @@ int maxContentHeight = 0; for (Iterator e = getChildren().iterator(); e.hasNext(); ) { NormalFlowRA nextElm = (NormalFlowRA)e.next(); - if (nextElm.crBPD() > maxContentHeight) + if (nextElm.crBPD() > maxContentHeight) { maxContentHeight = nextElm.crBPD(); + } } return maxContentHeight; } Added: trunk/foray/foray-common/.checkstyle =================================================================== --- trunk/foray/foray-common/.checkstyle (rev 0) +++ trunk/foray/foray-common/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-common/src/java/org/foray/common/ClassService.java =================================================================== --- trunk/foray/foray-common/src/java/org/foray/common/ClassService.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-common/src/java/org/foray/common/ClassService.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -80,8 +80,9 @@ try { // First strip any comment... int idx = line.indexOf('#'); - if (idx != -1) + if (idx != -1) { line = line.substring(0, idx); + } // Trim whitespace. line = line.trim(); Added: trunk/foray/foray-font/.checkstyle =================================================================== --- trunk/foray/foray-font/.checkstyle (rev 0) +++ trunk/foray/foray-font/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Added: trunk/foray/foray-fotree/.checkstyle =================================================================== --- trunk/foray/foray-fotree/.checkstyle (rev 0) +++ trunk/foray/foray-fotree/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-fotree/.project =================================================================== --- trunk/foray/foray-fotree/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-fotree/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -68,11 +68,12 @@ protected void addSimplePageMaster(SimplePageMaster simplePageMaster) throws FOTreeException { // check against duplication of master-name - if (existsName(simplePageMaster.traitMasterName())) + if (existsName(simplePageMaster.traitMasterName())) { throwException("'master-name' (" + simplePageMaster.traitMasterName() + ") must be unique across page-masters and " + "page-sequence-masters"); + } this.simplePageMasters.put(simplePageMaster.traitMasterName(), simplePageMaster); } @@ -84,10 +85,11 @@ protected void addPageSequenceMaster(String masterName, PageSequenceMaster pageSequenceMaster) throws FOTreeException { // check against duplication of master-name - if (existsName(masterName)) + if (existsName(masterName)) { throwException("'master-name' (" + masterName + ") must be unique across page-masters and " + "page-sequence-masters"); + } this.pageSequenceMasters.put(masterName, pageSequenceMaster); } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberGenerator.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberGenerator.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberGenerator.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -97,13 +97,15 @@ } } else if ((formatType == LOWERROMAN) || (formatType == UPPERROMAN)) { pn = makeRoman(number); - if (formatType == UPPERROMAN) + if (formatType == UPPERROMAN) { pn = pn.toUpperCase(); + } } else { // alphabetic pn = makeAlpha(number); - if (formatType == UPPERALPHA) + if (formatType == UPPERALPHA) { pn = pn.toUpperCase(); + } } return pn; } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -178,8 +178,9 @@ * and throws an exception if this isn't the case. */ private final void expectRpar() throws PropertyException { - if (currentToken != TOK_RPAR) + if (currentToken != TOK_RPAR) { throw new PropertyException("expected )"); + } next(); } @@ -291,8 +292,9 @@ while (true) { prop = parseAdditiveExpr(); args.add(prop); - if (currentToken != TOK_COMMA) + if (currentToken != TOK_COMMA) { break; + } next(); } expectRpar(); @@ -416,8 +418,9 @@ } public void popFunction() { - if (stkFunction != null) + if (stkFunction != null) { stkFunction.pop(); + } } } Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java =================================================================== --- trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -155,8 +155,9 @@ exprIndex++; scanDigits(); } - } else + } else { bSawDecimal = false; + } if (exprIndex < exprLength && expr.charAt(exprIndex) == '%') { exprIndex++; currentToken = TOK_PERCENT; @@ -212,8 +213,9 @@ default: --exprIndex; scanName(); - if (exprIndex == currentTokenStartIndex) + if (exprIndex == currentTokenStartIndex) { throw new PropertyException("illegal character"); + } currentTokenValue = expr.substring(currentTokenStartIndex, exprIndex); // if (currentMaybeOperator) { @@ -245,9 +247,11 @@ * Attempt to recognize a valid NAME token in the input expression. */ private void scanName() { - if (exprIndex < exprLength && isNameStartChar(expr.charAt(exprIndex))) + if (exprIndex < exprLength && isNameStartChar(expr.charAt(exprIndex))) { while (++exprIndex < exprLength - && isNameChar(expr.charAt(exprIndex))); + && isNameChar(expr.charAt(exprIndex))) { + } + } } /** @@ -255,8 +259,9 @@ * input expression. */ private void scanDigits() { - while (exprIndex < exprLength && isDigit(expr.charAt(exprIndex))) + while (exprIndex < exprLength && isDigit(expr.charAt(exprIndex))) { exprIndex++; + } } /** @@ -264,8 +269,9 @@ * input expression. */ private void scanHexDigits() { - while (exprIndex < exprLength && isHexDigit(expr.charAt(exprIndex))) + while (exprIndex < exprLength && isHexDigit(expr.charAt(exprIndex))) { exprIndex++; + } } /** Added: trunk/foray/foray-graphic/.checkstyle =================================================================== --- trunk/foray/foray-graphic/.checkstyle (rev 0) +++ trunk/foray/foray-graphic/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Added: trunk/foray/foray-mif/.checkstyle =================================================================== --- trunk/foray/foray-mif/.checkstyle (rev 0) +++ trunk/foray/foray-mif/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-mif/.project =================================================================== --- trunk/foray/foray-mif/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-mif/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java =================================================================== --- trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -942,111 +942,79 @@ } public void addToStream(String s) { - // Add this string to the curent flow - Para para = curFlow.curPara(); ParaLine paraLine = para.curParaLine(); paraLine.addContent(s); - } public void output(OutputStream stream) throws IOException { // Output the contents of bookComponent - this.bookComponent.output(stream); - } public void setDocumentHeightWidth(int height, int width) { - if (bookComponent.document == null) { - bookComponent.document = new Document(); bookComponent.document.height = height; bookComponent.document.width = width; } else if (bookComponent.document.height != height || bookComponent.document.width != width) { - logger.info("Warning: FrameMaker doesn't support different " + "page-sizes in a document."); } - } public void createTextRect(int numCols) { - // Create a textrect on the bodypage with these dimensions // This default behaviour will later be changed to reflect on // the master-page - - (bookComponent.curPage()).addTextRect(numCols); - // Then create a textflow corresponding to this textrect - curFlow = new TextFlow(); bookComponent.textFlows.add(curFlow); } public void setTextRectProp(int left, int top, int width, int height) { - (bookComponent.curPage()).curTextRect().setTextRectProp(left, top, width, height); - - } public void startLine() { - if (curFlow.curPara().curParaLine() != null) { this.addToStream("\n"); curFlow.curPara().startParaLine(); - } else + } else { curFlow.curPara().startParaLine(); - - + } } public void setBlockProp(int startIndent, int endIndent) { - - curFlow.startPara(); // Start a para curFlow.curPara().setBlockProp(startIndent, endIndent); - } public void createFrame(int x, int y, int w, int h) { - // Create a new anchored frame - bookComponent.createFrame(x, y, w, h); - } public void addImage(String url, int x, int y, int w, int h) { - Frame frame = bookComponent.createFrame(x, y, w, h); ImportObject imageObject = new ImportObject(url, 0, 0, w, h); frame.addContent(imageObject); if (curFlow.curPara().curParaLine() == null) { curFlow.curPara().startParaLine(); - } curFlow.curPara().curParaLine().addContent(frame); - - } public void createTable() { - // First create a table with an ID, then add it to the textflow - Tbl table = bookComponent.createTable(); if (curFlow.curPara().curParaLine() == null) { curFlow.curPara().startParaLine(); - } curFlow.curPara().curParaLine().addContent(table); @@ -1054,51 +1022,34 @@ * The above would have added the table to the textflow * But now the flow goes into the table, so ... */ - curFlow = table; - } public void setColumnProp(int colWidth) { - - // Get the current table - Tbl table = bookComponent.curTable(); table.addColumn(colWidth); - - } public void setCurrent(String current) { - // Start the table body or header or footer Tbl table = bookComponent.curTable(); table.setCurrent(current); - } public void startRow() { - Tbl table = bookComponent.curTable(); table.startRow(); - - } public void startCell(int rowSpan, int colSpan) { - Tbl table = bookComponent.curTable(); table.startCell(rowSpan, colSpan); - } public void endTable() { - // Switch the ref back to the current textflow - curFlow = bookComponent.curTextFlow(); - } } Added: trunk/foray/foray-output/.checkstyle =================================================================== --- trunk/foray/foray-output/.checkstyle (rev 0) +++ trunk/foray/foray-output/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-output/.project =================================================================== --- trunk/foray/foray-output/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-output/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Added: trunk/foray/foray-pdf/.checkstyle =================================================================== --- trunk/foray/foray-pdf/.checkstyle (rev 0) +++ trunk/foray/foray-pdf/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java =================================================================== --- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -1023,15 +1023,17 @@ protected void doDrawing(boolean fill, boolean stroke, boolean nonzero) { if (fill) { if (stroke) { - if (nonzero) + if (nonzero) { currentStream.write("B*\n"); - else + } else { currentStream.write("B\n"); + } } else { - if (nonzero) + if (nonzero) { currentStream.write("f*\n"); - else + } else { currentStream.write("f\n"); + } } } else { // if(stroke) Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java =================================================================== --- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTextPainter.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -158,12 +158,19 @@ .TextAttribute.DX); Float dypos = (Float)aci.getAttribute(GVTAttributedCharacterIterator .TextAttribute.DY); - if (xpos != null) loc.setLocation(xpos.doubleValue(), loc.getY()); - if (ypos != null) loc.setLocation(loc.getX(), ypos.doubleValue()); - if (dxpos != null) loc.setLocation(loc.getX()+dxpos.doubleValue(), - loc.getY()); - if (dypos != null) loc.setLocation(loc.getX(), - loc.getY()+dypos.doubleValue()); + if (xpos != null) { + loc.setLocation(xpos.doubleValue(), loc.getY()); + } + if (ypos != null) { + loc.setLocation(loc.getX(), ypos.doubleValue()); + } + if (dxpos != null) { + loc.setLocation(loc.getX()+dxpos.doubleValue(), loc.getY()); + } + if (dypos != null) { + loc.setLocation(loc.getX(), loc.getY()+dypos.doubleValue()); + } + //Set up font Float taFontSize = (Float)aci.getAttribute(TextAttribute.SIZE); Added: trunk/foray/foray-pioneer/.checkstyle =================================================================== --- trunk/foray/foray-pioneer/.checkstyle (rev 0) +++ trunk/foray/foray-pioneer/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-pioneer/.project =================================================================== --- trunk/foray/foray-pioneer/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pioneer/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowCellArray.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -47,8 +47,9 @@ if (rsi.isSpanned(i + 1)) { cells[i] = rsi.getSpanningCell(i + 1); states[i] = CELLSPAN; - } else + } else { states[i] = EMPTY; + } } } @@ -59,8 +60,9 @@ */ public int getNextFreeCell(int colNum) { for (int i = colNum - 1; i < states.length; i++) { - if (states[i] == EMPTY) + if (states[i] == EMPTY) { return i + 1; + } } return -1; } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/RowSpanMgr.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -108,8 +108,9 @@ */ public boolean hasUnfinishedSpans() { for (int i = 0; i < spanInfo.length; i++) { - if (spanInfo[i] != null) + if (spanInfo[i] != null) { return true; + } } return false; } @@ -125,8 +126,9 @@ */ public void finishRow(int rowHeight) { for (int i = 0; i < spanInfo.length; i++) { - if (spanInfo[i] != null && spanInfo[i].finishRow(rowHeight)) + if (spanInfo[i] != null && spanInfo[i].finishRow(rowHeight)) { spanInfo[i] = null; + } } } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -172,10 +172,12 @@ setProgress(i); if (this.bodyCount == 0 && status == Status.AREA_FULL_NONE) { - if (node.getTableHeader() != null) + if (node.getTableHeader() != null) { tableHeaderPL.removeLayout(areaContainer); - if (node.getTableFooter() != null) + } + if (node.getTableFooter() != null) { tableFooterPL.removeLayout(areaContainer); + } resetProgress(); // status = new Status(Status.AREA_FULL_SOME); } Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java =================================================================== --- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -147,8 +147,9 @@ } setProgress(0); int breakStatus = layout.checkBreakBefore(node, area); - if (breakStatus != Status.OK) + if (breakStatus != Status.OK) { return breakStatus; + } } TableRowContainer areaContainer = new TableRowContainer(node, area); @@ -190,8 +191,9 @@ */ if (rowSpanMgr.isInLastRow(iColIndex)) { int h = rowSpanMgr.getRemainingHeight(iColIndex); - if (h > largestCellHeight) + if (h > largestCellHeight) { largestCellHeight = h; + } } offset += colWidth; continue; Added: trunk/foray/foray-pretty/.checkstyle =================================================================== --- trunk/foray/foray-pretty/.checkstyle (rev 0) +++ trunk/foray/foray-pretty/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-pretty/.project =================================================================== --- trunk/foray/foray-pretty/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-pretty/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Added: trunk/foray/foray-ps/.checkstyle =================================================================== --- trunk/foray/foray-ps/.checkstyle (rev 0) +++ trunk/foray/foray-ps/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Added: trunk/foray/foray-render/.checkstyle =================================================================== --- trunk/foray/foray-render/.checkstyle (rev 0) +++ trunk/foray/foray-render/.checkstyle 2006-04-27 17:49:59 UTC (rev 7081) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<fileset-config file-format-version="1.2.0" simple-config="true"> + <fileset name="all" enabled="true" check-config-name="FOray Checkstyle" local="false"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config> Modified: trunk/foray/foray-render/.project =================================================================== --- trunk/foray/foray-render/.project 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/.project 2006-04-27 17:49:59 UTC (rev 7081) @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> </natures> </projectDescription> Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -306,14 +306,18 @@ */ protected void renderRegions(PageArea page) { render(page.getRegionBody()); - if (page.getRegionBefore() != null) + if (page.getRegionBefore() != null) { render(page.getRegionBefore()); - if (page.getRegionAfter() != null) + } + if (page.getRegionAfter() != null) { render(page.getRegionAfter()); - if (page.getRegionStart() != null) + } + if (page.getRegionStart() != null) { render(page.getRegionStart()); - if (page.getRegionEnd() != null) + } + if (page.getRegionEnd() != null) { render(page.getRegionEnd()); + } } /** Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTPrintRenderer.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -68,12 +68,14 @@ throws IOException { super.stopOutput(); - if(endNumber == -1) + if(endNumber == -1) { endNumber = getPageCount(); + } ArrayList numbers = getInvalidPageNumbers(); - for (int i = numbers.size() - 1; i > -1; i--) + for (int i = numbers.size() - 1; i > -1; i--) { removePage(Integer.parseInt((String)numbers.get(i))); + } try { printerJob.print(); @@ -100,14 +102,16 @@ if (i < startNumber || i > endNumber) { isValid = false; } else if (mode != EVEN_AND_ALL) { - if (mode == EVEN && ((i + 1) % 2 != 0)) + if (mode == EVEN && ((i + 1) % 2 != 0)) { isValid = false; - else if (mode == ODD && ((i + 1) % 2 != 1)) + } else if (mode == ODD && ((i + 1) % 2 != 1)) { isValid = false; + } } - if (!isValid) + if (!isValid) { vec.add(i + ""); + } } return vec; Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -318,8 +318,12 @@ graphics.drawRect(startx, starty, endx - startx, endy - starty); } else { //don't round down to zero - if (w != 0 && endx == startx) endx++; - if (h != 0 && endy == starty) endy++; + if (w != 0 && endx == startx) { + endx++; + } + if (h != 0 && endy == starty) { + endy++; + } graphics.fillRect(startx, starty, endx - startx, endy - starty); } } @@ -376,8 +380,9 @@ } public void render(int aPageNumber) { - if(aPageNumber >= pageList.size()) + if(aPageNumber >= pageList.size()) { return; + } try { render((PageArea) pageList.get(aPageNumber)); @@ -624,7 +629,9 @@ boolean underline, boolean overline, boolean linethrough) { - if (!(underline || overline || linethrough)) return; + if (!(underline || overline || linethrough)) { + return; + } int newx = (x + 500) / 1000; int newy = pageHeight - (bl + 500) / 1000; @@ -633,8 +640,9 @@ LineMetrics lm = fm.getLineMetrics(text, graphics); int ulthick = (int)lm.getUnderlineThickness(); - if (ulthick < 1) + if (ulthick < 1) { ulthick = 1; // don't allow it to disappear + } if (underline) { // nothing in awt specifies underline location, // descent/2 seems to match my word processor @@ -648,8 +656,9 @@ } if (linethrough) { int ltthick = (int)lm.getStrikethroughThickness(); - if (ltthick < 1) + if (ltthick < 1) { ltthick = 1; // don't allow it to disappear + } int deltay = (int)lm.getStrikethroughOffset(); graphics.fillRect(newx, newy + deltay, width, ltthick); } @@ -751,8 +760,9 @@ public int print(Graphics g, PageFormat pageFormat, int pageIndex) throws PrinterException { - if (pageIndex >= pageList.size()) + if (pageIndex >= pageList.size()) { return NO_SUCH_PAGE; + } Graphics2D oldGraphics = graphics; @@ -776,8 +786,9 @@ public PageFormat getPageFormat(int pageIndex) throws IndexOutOfBoundsException { - if (pageIndex >= pageList.size()) + if (pageIndex >= pageList.size()) { return null; + } PageArea page = (PageArea)pageList.get(pageIndex); PageFormat pageFormat = new PageFormat(); Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -70,8 +70,9 @@ URL url = getClass().getResource(path); if (url == null) { getLogger().error("Icon not found: " + path); - } else + } else { putValue(SMALL_ICON, new ImageIcon(url)); + } } public void actionPerformed(ActionEvent e) { Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/LoadableProperties.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -76,8 +76,9 @@ private boolean isValid(String str) { - if (str == null) + if (str == null) { return false; + } if (str.length() > 0) { if (str.startsWith("#") || str.startsWith("!")) { return false; Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -154,17 +154,22 @@ Object selectedValue = pane.getValue(); - if (selectedValue == null) + if (selectedValue == null) { return CLOSED_OPTION; + } - if (selectedValue.equals(OK_STRING)) + if (selectedValue.equals(OK_STRING)) { return JOptionPane.OK_OPTION; - if (selectedValue.equals(CANCEL_STRING)) + } + if (selectedValue.equals(CANCEL_STRING)) { return JOptionPane.CANCEL_OPTION; - if (selectedValue.equals(YES_STRING)) + } + if (selectedValue.equals(YES_STRING)) { return JOptionPane.YES_OPTION; - if (selectedValue.equals(NO_STRING)) + } + if (selectedValue.equals(NO_STRING)) { return JOptionPane.NO_OPTION; + } return CLOSED_OPTION; } @@ -211,20 +216,26 @@ Object selectedValue = pane.getValue(); - if (selectedValue == null) + if (selectedValue == null) { return CLOSED_OPTION; + } - if (((String)selectedValue).equals(DETAIL_OPTION)) + if (((String)selectedValue).equals(DETAIL_OPTION)) { return CLOSED_OPTION; + } - if (selectedValue.equals(OK_STRING)) + if (selectedValue.equals(OK_STRING)) { return JOptionPane.OK_OPTION; - if (selectedValue.equals(CANCEL_STRING)) + } + if (selectedValue.equals(CANCEL_STRING)) { return JOptionPane.CANCEL_OPTION; - if (selectedValue.equals(YES_STRING)) + } + if (selectedValue.equals(YES_STRING)) { return JOptionPane.YES_OPTION; - if (selectedValue.equals(NO_STRING)) + } + if (selectedValue.equals(NO_STRING)) { return JOptionPane.NO_OPTION; + } return CLOSED_OPTION; } @@ -255,10 +266,11 @@ // Zugriff public void setValue(Object aValue) { - if (aValue != null && DETAIL_OPTION.equals(aValue)) + if (aValue != null && DETAIL_OPTION.equals(aValue)) { displayDetails(getDialog()); - else + } else { super.setValue(aValue); + } } public String getDetailInformation() { Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/PreviewDialog.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -420,8 +420,9 @@ * Shows the previous page. */ private void goToPreviousPage(ActionEvent e) { - if (currentPage <= 0) + if (currentPage <= 0) { return; + } currentPage--; goToPage(currentPage); } @@ -430,8 +431,9 @@ * Shows the next page. */ private void goToNextPage(ActionEvent e) { - if (currentPage >= pageCount - 1) + if (currentPage >= pageCount - 1) { return; + } currentPage++; goToPage(currentPage); } @@ -440,8 +442,9 @@ * Shows the last page. */ private void goToLastPage(ActionEvent e) { - if (currentPage == pageCount - 1) + if (currentPage == pageCount - 1) { return; + } currentPage = pageCount - 1; goToPage(currentPage); } @@ -469,8 +472,9 @@ previewImageLabel.setIcon(null); statisticsStatus.setText(""); //Cleans up renderer - while (renderer.getPageCount() != 0) + while (renderer.getPageCount() != 0) { renderer.removePage(0); + } /* The following logic is almost certainly circular stack-inflating * logic, and is commented out until we have time to fix it. * TODO: This logic needs to be rewritten, probably as a loop that @@ -499,8 +503,9 @@ d.setVisible(true); currentPage = d.getPageNumber(); - if (currentPage < 1 || currentPage > pageCount) + if (currentPage < 1 || currentPage > pageCount) { return; + } currentPage--; @@ -511,8 +516,9 @@ * Shows the first page. */ private void goToFirstPage(ActionEvent e) { - if (currentPage == 0) + if (currentPage == 0) { return; + } currentPage = 0; goToPage(currentPage); } @@ -533,18 +539,19 @@ } public void setScale(double scaleFactor) { - if (scaleFactor == 25.0) + if (scaleFactor == 25.0) { scale.setSelectedIndex(0); - else if (scaleFactor == 50.0) + } else if (scaleFactor == 50.0) { scale.setSelectedIndex(1); - else if (scaleFactor == 75.0) + } else if (scaleFactor == 75.0) { scale.setSelectedIndex(2); - else if (scaleFactor == 100.0) + } else if (scaleFactor == 100.0) { scale.setSelectedIndex(3); - else if (scaleFactor == 150.0) + } else if (scaleFactor == 150.0) { scale.setSelectedIndex(4); - else if (scaleFactor == 200.0) + } else if (scaleFactor == 200.0) { scale.setSelectedIndex(5); + } renderer.setScaleFactor(scaleFactor); showPage(); @@ -601,8 +608,9 @@ if (isErrorMessage) { JOptionPane.showMessageDialog(null, message, "Error", JOptionPane.ERROR_MESSAGE); - } else + } else { processStatus.setText(message.toString()); + } } } @@ -611,8 +619,9 @@ if (SwingUtilities.isEventDispatchThread()) { viewer.run(); - } else + } else { SwingUtilities.invokeLater(viewer); + } } /** @@ -631,8 +640,9 @@ renderer.render(currentPage); pageImage = renderer.getLastRenderedPage(); - if (pageImage == null) + if (pageImage == null) { return; + } graphics = pageImage.getGraphics(); graphics.setColor(Color.black); graphics.drawRect(0, 0, pageImage.getWidth() - 1, Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -90,10 +90,9 @@ * */ public Object handleGetObject(String key) { - - if (key == null) + if (key == null) { return "Key is null"; - + } Object obj = lookup.get(key); if (obj != null) { return obj; Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java =================================================================== --- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java 2006-04-27 16:10:38 UTC (rev 7080) +++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java 2006-04-27 17:49:59 UTC (rev 7081) @@ -154,8 +154,9 @@ + par); int index = rawText.indexOf(PARAMETER_TAG); String composedMess = ""; - if ((index == -1) && (par == null)) + if ((index == -1) && (par == null)) { return rawText; + } if ((index != -1) && (par == null)) { logger.info("Message " + actMessId + " erwartet Parameter. Aufgerufen ohne Parameter"); @@ -164,8 +165,9 @@ if ((index == -1) && (par != null)) { logger.info("Message " + actMessId + " erwartet keine Parameter. Aufgerufen mit folgenden Parametern:"); - for (int i = 0; i < par.length; ++i) + for (int i = 0; i < par.length; ++i) { logger.info(par[i].toString()); + } return rawText; } int tagCount = 0; @@ -184,9 +186,11 @@ tagCount++; } composedMess += rawText; - if (tagCount != par.length) + if (tagCount != par.length) { logger.info("Die zu der Meldung " + actMessId - + " übergebenen Parameter sind mehr als die Meldung vorsieht."); + + " übergebenen Parameter sind mehr als die Meldung " + + "vorsieht."); + } return composedMess; } @@ -224,24 +228,33 @@ int getValue(String fieldName) { int val = -1; - if (fieldName.equals("INFO")) + if (fieldName.equals("INFO")) { return INFO; - else if (fieldName.equals("WARNING")) + } + if (fieldName.equals("WARNING")) { return WARNING; - else if (fieldName.equals("ERROR")) + } + if (fieldName.equals("ERROR")) { return ERROR; - else if (fieldName.equals("SYS_ERROR")) + } + if (fieldName.equals("SYS_ERROR")) { return SYS_ERROR; - else if (fieldName.equals("QUESTION")) + } + if (fieldName.equals("QUESTION")) { return QUESTION; - else if (fieldName.equals("STYLE_NOBUTTON")) + } + if (fieldName.equals("STYLE_NOBUTTON")) { return STYLE_NOBUTTON; - else if (fieldName.equals("STYLE_Y")) + } + if (fieldName.equals("STYLE_Y")) { return STYLE_Y; - else if (fieldName.equals("STYLE_Y_N")) + } + if (fieldName.equals("STYLE_Y_N")) { return STYLE_Y_N; - else if (fieldName.equals("STYLE_Y_N_C")) + } + if (fieldName.equals("STYLE_Y_N_C")) { return STYLE_Y_N_C; + } return val; } Modified: trunk/foray/foray-render/src/java/org/foray/render... [truncated message content] |
|
From: <vic...@us...> - 2006-04-27 16:10:45
|
Revision: 7080 Author: victormote Date: 2006-04-27 09:10:38 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7080&view=rev Log Message: ----------- Turn most checks off for now. Modified Paths: -------------- trunk/foray/scripts/checkstyle-config.xml Modified: trunk/foray/scripts/checkstyle-config.xml =================================================================== --- trunk/foray/scripts/checkstyle-config.xml 2006-04-27 15:58:06 UTC (rev 7079) +++ trunk/foray/scripts/checkstyle-config.xml 2006-04-27 16:10:38 UTC (rev 7080) @@ -2,10 +2,17 @@ <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_1.dtd"> + +<!-- + This is the checkstyle configuration for FOray. + Any items marked with severity="ignore" document an unimplemented but + desired setting. +--> + <module name="Checker"> <module name="TreeWalker"> <module name="ModifierOrder"> - <property name="severity" value="warning"/> + <property name="severity" value="ignore"/> </module> <module name="NeedBraces"> <property name="severity" value="error"/> @@ -13,26 +20,26 @@ LITERAL_FOR, LITERAL_WHILE"/> </module> <module name="AvoidStarImport"> - <property name="severity" value="warning"/> + <property name="severity" value="ignore"/> </module> <module name="LineLength"> <property name="ignorePattern" value="^$"/> <property name="max" value="80"/> - <property name="severity" value="warning"/> + <property name="severity" value="ignore"/> <property name="tabWidth" value="4"/> </module> <module name="EmptyForInitializerPad"> <property name="option" value="nospace"/> - <property name="severity" value="warning"/> + <property name="severity" value="ignore"/> </module> <module name="ParenPad"> <property name="option" value="nospace"/> - <property name="severity" value="warning"/> + <property name="severity" value="ignore"/> <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, SUPER_CTOR_CALL"/> </module> <module name="TabCharacter"> - <property name="severity" value="warning"/> + <property name="severity" value="ignore"/> </module> </module> </module> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-27 15:58:16
|
Revision: 7079 Author: victormote Date: 2006-04-27 08:58:06 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7079&view=rev Log Message: ----------- Conform to latest checkstyle config standards (AFAICT). Modified Paths: -------------- trunk/foray/scripts/checkstyle-config.xml Modified: trunk/foray/scripts/checkstyle-config.xml =================================================================== --- trunk/foray/scripts/checkstyle-config.xml 2006-04-27 15:25:59 UTC (rev 7078) +++ trunk/foray/scripts/checkstyle-config.xml 2006-04-27 15:58:06 UTC (rev 7079) @@ -4,34 +4,34 @@ "http://www.puppycrawl.com/dtds/configuration_1_1.dtd"> <module name="Checker"> <module name="TreeWalker"> - <module name="ModifierOrderCheck"> + <module name="ModifierOrder"> <property name="severity" value="warning"/> </module> - <module name="NeedBracesCheck"> + <module name="NeedBraces"> <property name="severity" value="error"/> <property name="tokens" value="LITERAL_DO, LITERAL_ELSE, LITERAL_IF, LITERAL_FOR, LITERAL_WHILE"/> </module> - <module name="AvoidStarImportCheck"> + <module name="AvoidStarImport"> <property name="severity" value="warning"/> </module> - <module name="LineLengthCheck"> + <module name="LineLength"> <property name="ignorePattern" value="^$"/> <property name="max" value="80"/> <property name="severity" value="warning"/> <property name="tabWidth" value="4"/> </module> - <module name="EmptyForInitializerPadCheck"> + <module name="EmptyForInitializerPad"> <property name="option" value="nospace"/> <property name="severity" value="warning"/> </module> - <module name="ParenPadCheck"> + <module name="ParenPad"> <property name="option" value="nospace"/> <property name="severity" value="warning"/> <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, SUPER_CTOR_CALL"/> </module> - <module name="TabCharacterCheck"> + <module name="TabCharacter"> <property name="severity" value="warning"/> </module> </module> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-27 15:26:09
|
Revision: 7078 Author: victormote Date: 2006-04-27 08:25:59 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7078&view=rev Log Message: ----------- Rename checkstyle config file for consistency. Added Paths: ----------- trunk/foray/scripts/checkstyle-config.xml Removed Paths: ------------- trunk/foray/scripts/checkstyle_config.xml Copied: trunk/foray/scripts/checkstyle-config.xml (from rev 7077, trunk/foray/scripts/checkstyle_config.xml) =================================================================== --- trunk/foray/scripts/checkstyle-config.xml (rev 0) +++ trunk/foray/scripts/checkstyle-config.xml 2006-04-27 15:25:59 UTC (rev 7078) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module + PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" + "http://www.puppycrawl.com/dtds/configuration_1_1.dtd"> +<module name="Checker"> + <module name="TreeWalker"> + <module name="ModifierOrderCheck"> + <property name="severity" value="warning"/> + </module> + <module name="NeedBracesCheck"> + <property name="severity" value="error"/> + <property name="tokens" value="LITERAL_DO, LITERAL_ELSE, LITERAL_IF, + LITERAL_FOR, LITERAL_WHILE"/> + </module> + <module name="AvoidStarImportCheck"> + <property name="severity" value="warning"/> + </module> + <module name="LineLengthCheck"> + <property name="ignorePattern" value="^$"/> + <property name="max" value="80"/> + <property name="severity" value="warning"/> + <property name="tabWidth" value="4"/> + </module> + <module name="EmptyForInitializerPadCheck"> + <property name="option" value="nospace"/> + <property name="severity" value="warning"/> + </module> + <module name="ParenPadCheck"> + <property name="option" value="nospace"/> + <property name="severity" value="warning"/> + <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, + SUPER_CTOR_CALL"/> + </module> + <module name="TabCharacterCheck"> + <property name="severity" value="warning"/> + </module> + </module> +</module> Deleted: trunk/foray/scripts/checkstyle_config.xml =================================================================== --- trunk/foray/scripts/checkstyle_config.xml 2006-04-27 15:12:53 UTC (rev 7077) +++ trunk/foray/scripts/checkstyle_config.xml 2006-04-27 15:25:59 UTC (rev 7078) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE module - PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" - "http://www.puppycrawl.com/dtds/configuration_1_1.dtd"> -<module name="Checker"> - <module name="TreeWalker"> - <module name="ModifierOrderCheck"> - <property name="severity" value="warning"/> - </module> - <module name="NeedBracesCheck"> - <property name="severity" value="error"/> - <property name="tokens" value="LITERAL_DO, LITERAL_ELSE, LITERAL_IF, - LITERAL_FOR, LITERAL_WHILE"/> - </module> - <module name="AvoidStarImportCheck"> - <property name="severity" value="warning"/> - </module> - <module name="LineLengthCheck"> - <property name="ignorePattern" value="^$"/> - <property name="max" value="80"/> - <property name="severity" value="warning"/> - <property name="tabWidth" value="4"/> - </module> - <module name="EmptyForInitializerPadCheck"> - <property name="option" value="nospace"/> - <property name="severity" value="warning"/> - </module> - <module name="ParenPadCheck"> - <property name="option" value="nospace"/> - <property name="severity" value="warning"/> - <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, - SUPER_CTOR_CALL"/> - </module> - <module name="TabCharacterCheck"> - <property name="severity" value="warning"/> - </module> - </module> -</module> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-27 15:13:01
|
Revision: 7077 Author: victormote Date: 2006-04-27 08:12:53 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7077&view=rev Log Message: ----------- Conform to latest checkstyle config standards (AFAICT). Modified Paths: -------------- trunk/foray/scripts/checkstyle_config.xml Modified: trunk/foray/scripts/checkstyle_config.xml =================================================================== --- trunk/foray/scripts/checkstyle_config.xml 2006-04-27 13:16:19 UTC (rev 7076) +++ trunk/foray/scripts/checkstyle_config.xml 2006-04-27 15:12:53 UTC (rev 7077) @@ -1,34 +1,38 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_1.dtd"> +<!DOCTYPE module + PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" + "http://www.puppycrawl.com/dtds/configuration_1_1.dtd"> <module name="Checker"> - <module name="TreeWalker"> - <module name="com.puppycrawl.tools.checkstyle.checks.ModifierOrderCheck"> - <property name="severity" value="warning"/> - </module> - <module name="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck"> - <property name="severity" value="error"/> - <property name="tokens" value="LITERAL_DO, LITERAL_ELSE, LITERAL_IF, LITERAL_FOR, LITERAL_WHILE"/> - </module> - <module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck"> - <property name="severity" value="warning"/> - </module> - <module name="com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck"> - <property name="ignorePattern" value="^$"/> - <property name="max" value="80"/> - <property name="severity" value="warning"/> - <property name="tabWidth" value="4"/> - </module> - <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForInitializerPadCheck"> - <property name="option" value="nospace"/> - <property name="severity" value="warning"/> - </module> - <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck"> - <property name="option" value="nospace"/> - <property name="severity" value="warning"/> - <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, SUPER_CTOR_CALL"/> - </module> - <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TabCharacterCheck"> - <property name="severity" value="warning"/> - </module> + <module name="TreeWalker"> + <module name="ModifierOrderCheck"> + <property name="severity" value="warning"/> </module> + <module name="NeedBracesCheck"> + <property name="severity" value="error"/> + <property name="tokens" value="LITERAL_DO, LITERAL_ELSE, LITERAL_IF, + LITERAL_FOR, LITERAL_WHILE"/> + </module> + <module name="AvoidStarImportCheck"> + <property name="severity" value="warning"/> + </module> + <module name="LineLengthCheck"> + <property name="ignorePattern" value="^$"/> + <property name="max" value="80"/> + <property name="severity" value="warning"/> + <property name="tabWidth" value="4"/> + </module> + <module name="EmptyForInitializerPadCheck"> + <property name="option" value="nospace"/> + <property name="severity" value="warning"/> + </module> + <module name="ParenPadCheck"> + <property name="option" value="nospace"/> + <property name="severity" value="warning"/> + <property name="tokens" value="CTOR_CALL, LPAREN, METHOD_CALL, RPAREN, + SUPER_CTOR_CALL"/> + </module> + <module name="TabCharacterCheck"> + <property name="severity" value="warning"/> + </module> + </module> </module> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-27 13:16:37
|
Revision: 7076 Author: victormote Date: 2006-04-27 06:16:19 -0700 (Thu, 27 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7076&view=rev Log Message: ----------- Remove no-longer-needed class. Removed Paths: ------------- trunk/foray/foray-font/src/java/org/foray/font/RegisteredAlias.java Deleted: trunk/foray/foray-font/src/java/org/foray/font/RegisteredAlias.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/RegisteredAlias.java 2006-04-26 20:50:21 UTC (rev 7075) +++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredAlias.java 2006-04-27 13:16:19 UTC (rev 7076) @@ -1,82 +0,0 @@ -/* - * 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 - * - */ - -/* $Id$ */ - -package org.foray.font; - -import java.util.HashMap; - -/** - * Class representing a font family alias. - * Aliases allow a font-family to be found through more than one name, either - * through its own name, or through a "pointer" name called an alias. - * RegisteredAlias allows further flexibility by allowing an alias to be - * configured multiple ways. - * These configurations can be set at run time to allow a font-family alias to - * point to different font-family items depending on context. - */ -class RegisteredAlias { - - /** The name of this alias. */ - String name; - - /** The default font family that should be returned when the requested - * one cannot be found. */ - RegisteredFontFamily defaultFamily; - - /** Map whose key is the configuration name (a String), and whose value - * is the RegisteredFontFamily which should be returned when that - * configuration is requested. */ - HashMap configurationMap = new HashMap(); - - /** - * Constructor. - * @param name The name of the alias. - */ - public RegisteredAlias(String name, RegisteredFontFamily defaultFamily) { - this.name = name; - this.defaultFamily = defaultFamily; - } - - /** - * Register a new configuration for this alias. - * @param configuration The name of the configuration to which fontFamily - * belongs. - * @param fontFamily The font family that should be returned when - * an alias is requested for configuration. - */ - public void registerConfiguredAlias(String configuration, - RegisteredFontFamily fontFamily) { - this.configurationMap.put(configuration, fontFamily); - } - - public RegisteredFontFamily getFontFamily(String configuration) { - RegisteredFontFamily rff = (RegisteredFontFamily) - this.configurationMap.get(configuration); - if (rff == null) { - return this.defaultFamily; - } - return rff; - } - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-26 20:50:30
|
Revision: 7075 Author: victormote Date: 2006-04-26 13:50:21 -0700 (Wed, 26 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7075&view=rev Log Message: ----------- Look for rff in font-family-aliases as well as font-families. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-04-26 19:52:59 UTC (rev 7074) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-04-26 20:50:21 UTC (rev 7075) @@ -147,9 +147,14 @@ this.registerFontOutputFactory(new FOrayFontPDFFactory()); } - protected RegisteredFontFamily getRegisteredFontFamily(String fontFamilyName) { + protected RegisteredFontFamily getRegisteredFontFamily( + String fontFamilyName) { RegisteredFontFamily rff = (RegisteredFontFamily) this.fontFamilies.get(fontFamilyName); + if (rff != null) { + return rff; + } + rff = (RegisteredFontFamily) this.fontFamilyAliases.get(fontFamilyName); return rff; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-26 19:53:11
|
Revision: 7074 Author: victormote Date: 2006-04-26 12:52:59 -0700 (Wed, 26 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7074&view=rev Log Message: ----------- Save state for later restoration. 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-04-26 19:37:34 UTC (rev 7073) +++ trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-04-26 19:52:59 UTC (rev 7074) @@ -127,6 +127,13 @@ public FontConfigParser(FOrayFontServer server, InputSource filename) { this.fontServer = server; this.filename = filename; + try { + this.currentXMLBase = new URL("file", null, "."); + } catch (MalformedURLException e) { + /* This shouldn't fail, but if it does, there isn't much that can + * be done. */ + e.printStackTrace(); + } } /** @@ -320,6 +327,10 @@ * @param attributes */ private void parseElementFontFamily(Attributes attributes) { + /* Save the current state for later restoration. */ + this.previousXMLBase = this.currentXMLBase; + this.previousEmbed = this.currentEmbed; + String name = attributes.getValue("name"); if (name == null || name.equals("")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-26 19:37:38
|
Revision: 7073 Author: victormote Date: 2006-04-26 12:37:34 -0700 (Wed, 26 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7073&view=rev Log Message: ----------- Fix NPE. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java Modified: trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-04-26 19:34:13 UTC (rev 7072) +++ trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-04-26 19:37:34 UTC (rev 7073) @@ -398,6 +398,10 @@ * the font file has failed */ org.axsl.font.Font fsf = this.registeredFont.getFreeStandingFont(); + if (fsf == null) { + throw new FontException("Unable to bootstrap a System Font from a " + + "FreeStanding Font."); + } returnedFont = new Font(fsf.getFontName(), Font.PLAIN, SystemFont.INITIAL_FONT_SIZE); /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-26 19:34:20
|
Revision: 7072 Author: victormote Date: 2006-04-26 12:34:13 -0700 (Wed, 26 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7072&view=rev Log Message: ----------- Clean up compiler warning related to hidden instance variables. 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-04-26 19:33:22 UTC (rev 7071) +++ trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-04-26 19:34:13 UTC (rev 7072) @@ -781,24 +781,24 @@ /** Remembers the state of currentEmbed before this group was reached, * so that it can be restored when this group is exited. */ - String previousEmbed; + String saveEmbed; /** Remembers the state of currentXMLBase before this group was reached, * so that it can be restored when this group is exited. */ - URL previousXMLBase; + URL saveXMLBase; FontGroup(String label, String previousEmbed, URL previousXMLBase) { /* Ignore the label. */ - this.previousEmbed = previousEmbed; - this.previousXMLBase = previousXMLBase; + this.saveEmbed = previousEmbed; + this.saveXMLBase = previousXMLBase; } String getPreviousEmbed() { - return this.previousEmbed; + return this.saveEmbed; } URL getPreviousXMLBase() { - return this.previousXMLBase; + return this.saveXMLBase; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-26 19:33:28
|
Revision: 7071 Author: victormote Date: 2006-04-26 12:33:22 -0700 (Wed, 26 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7071&view=rev Log Message: ----------- Clean up style-related compiler warnings. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-04-26 19:03:57 UTC (rev 7070) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-04-26 19:33:22 UTC (rev 7071) @@ -685,9 +685,8 @@ (RegisteredFontFamily)fontFamilyAliases.get(alias); if (family == null) { return null; - } else { - return family.getName(); } + return family.getName(); } /** Modified: trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-04-26 19:03:57 UTC (rev 7070) +++ trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-04-26 19:33:22 UTC (rev 7071) @@ -385,32 +385,31 @@ * name, the font-style should be PLAIN. */ return new Font(systemName, Font.PLAIN, SystemFont.INITIAL_FONT_SIZE); - } else { - Font returnedFont; - if (this.registeredFont.getFontFileReader() != null) { - returnedFont = createFontFromInput(); - if (returnedFont != null) { - return returnedFont; - } + } + Font returnedFont; + if (this.registeredFont.getFontFileReader() != null) { + returnedFont = createFontFromInput(); + if (returnedFont != null) { + return returnedFont; } - /* - * Either no font file is available, or creating an awt font from - * the font file has failed - */ - org.axsl.font.Font fsf = this.registeredFont.getFreeStandingFont(); - returnedFont = new Font(fsf.getFontName(), Font.PLAIN, - SystemFont.INITIAL_FONT_SIZE); - /* - * Check that the returned awt font really corresponds to this font, - * and not to a fallback - */ - if (!returnedFont.getPSName().equals(fsf.getPostscriptName())) { - throw new FontException("Cannot find a system font for " - + fsf.getFontName()); - } - return returnedFont; } - } + /* + * Either no font file is available, or creating an awt font from + * the font file has failed + */ + org.axsl.font.Font fsf = this.registeredFont.getFreeStandingFont(); + returnedFont = new Font(fsf.getFontName(), Font.PLAIN, + SystemFont.INITIAL_FONT_SIZE); + /* + * Check that the returned awt font really corresponds to this font, + * and not to a fallback + */ + if (!returnedFont.getPSName().equals(fsf.getPostscriptName())) { + throw new FontException("Cannot find a system font for " + + fsf.getFontName()); + } + return returnedFont; + } /** * Creates a java.awt.Font instance from a URL. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-26 19:04:10
|
Revision: 7070 Author: victormote Date: 2006-04-26 12:03:57 -0700 (Wed, 26 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7070&view=rev Log Message: ----------- Patch #1471223 from Vincent Hennebert. 1. Conform to new aXSL font-config DTD. 2. SystemFont.java: * new algorithm to create system fonts * bugfix: Java 1.4 throws an IllegalArgumentException and not a FontFormatException when given a Type1 font file 3. RegisteredFont.java: * Change of the semantics of hasSystemFont() 4. FOrayFontServer.java: * modify the handling of font family aliases according to the new policy Modified Paths: -------------- 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/FontConfigParser.java trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2006-04-26 17:27:48 UTC (rev 7069) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontConsumer.java 2006-04-26 19:03:57 UTC (rev 7070) @@ -339,16 +339,6 @@ RegisteredFontFamily rff = null; rff = this.server.getRegisteredFontFamily(familyToTry); if (rff == null) { - String aliasConfiguration = null; - if (preferFreeStandingFonts()) { - aliasConfiguration = "print"; - } else { - aliasConfiguration = "screen"; - } - rff = this.server.getAliasedFontFamily(familyToTry, - aliasConfiguration); - } - if (rff == null) { return null; } return rff.findRegisteredFontDesc(style, weight, variant, stretch, Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-04-26 17:27:48 UTC (rev 7069) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFontServer.java 2006-04-26 19:03:57 UTC (rev 7070) @@ -153,16 +153,6 @@ return rff; } - protected RegisteredFontFamily getAliasedFontFamily(String aliasName, - String configuration) { - RegisteredAlias regAlias = (RegisteredAlias) - this.fontFamilyAliases.get(aliasName); - if (regAlias == null) { - return null; - } - return regAlias.getFontFamily(configuration); - } - protected RegisteredFontDesc getDefaultFreeStandingFont() { if (this.defaultFreeStandingFont != null) { return this.defaultFreeStandingFont; @@ -355,7 +345,7 @@ awtFont.getFamily()); if (rff == null) { try { - registerFontFamily(awtFont.getFamily()); + rff = registerFontFamily2(awtFont.getFamily()); } catch (FontException e) { /* This should never happen. We just made sure it doesn't * already exist. */ @@ -382,6 +372,13 @@ byte fontStretch = org.axsl.font.Font.FONT_STRETCH_NORMAL; new RegisteredFontDesc(rf, rff, null, fontStyle, fontWeight, fontVariant, fontStretch); + try { + rff.registerFontDesc(rf, + null, fontStyle, fontWeight, fontVariant, fontStretch, + Float.NaN, Float.NaN, Float.NaN, null); + } catch (FontException e) { + this.logger.error(e.getMessage()); + } } } @@ -467,24 +464,21 @@ * @param realFamily The name of the real font family to which this alias * should be associated (e.g. "Helvetica"). */ - protected void registerFontFamilyAlias(String alias, String configuration, - String realFamily) throws FontException { + public void registerFontFamilyAlias(String alias, String realFamily) + throws FontException { RegisteredFontFamily rff = (RegisteredFontFamily)fontFamilies.get(realFamily); if (rff == null) { throw new FontException("Font family " + realFamily + " not found. Can't register alias: " + alias); } - /* Get or create the RegisteredAlias instance. */ - RegisteredAlias registeredAlias = (RegisteredAlias) - this.fontFamilyAliases.get(alias); - if (registeredAlias == null) { - /* The first one to register is the default. */ - registeredAlias = new RegisteredAlias(alias, rff); - fontFamilyAliases.put(alias, registeredAlias); - } else { - registeredAlias.registerConfiguredAlias(configuration, rff); + if (fontFamilyAliases.containsKey(alias)) { + RegisteredFontFamily family = + ((RegisteredFontFamily)fontFamilyAliases.get(alias)); + throw new FontException("Alias " + alias + + " already registered to family " + family.getName()); } + fontFamilyAliases.put(alias, rff); } /** @@ -686,21 +680,14 @@ /** * {@inheritDoc} */ - public void registerFontFamilyAlias(String alias, String realFamily) - throws FontException { - registerFontFamilyAlias(alias, null, realFamily); - } - - /** - * {@inheritDoc} - */ public String getFontFamilyForAlias(String alias) { - RegisteredAlias registeredAlias = (RegisteredAlias) - this.fontFamilyAliases.get(alias); - if (registeredAlias == null) { + RegisteredFontFamily family = + (RegisteredFontFamily)fontFamilyAliases.get(alias); + if (family == null) { return null; + } else { + return family.getName(); } - return registeredAlias.getFontFamily(null).getName(); } /** @@ -791,7 +778,7 @@ throws FontException { Object object = this.registeredFonts.get(fontID); if (object != null) { - throw new FontException("Font ID alread registered: " + fontID); + throw new FontException("Font ID already registered: " + fontID); } this.registeredFonts.put(fontID, rf); } Modified: trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-04-26 17:27:48 UTC (rev 7069) +++ trunk/foray/foray-font/src/java/org/foray/font/FontConfigParser.java 2006-04-26 19:03:57 UTC (rev 7070) @@ -65,14 +65,22 @@ * being parsed. */ private RegisteredFontFamily currentFontFamily = null; + /** + * Counter for registering fonts which haven't been given an id. It will + * be reset at the beginning of each font-family. The font name will be the + * name of the font family + "Member" + counter. Starting at 1 because it + * is more natural for humans (the name may appear in error messages). + */ + private int fontIdCounter = 1; + + /** Stateful variable tracking which FontFamilyMember is currently + * being parsed. */ + private FontFamilyMember currentFontFamilyMember = null; + private String currentSimulateSmallCaps = null; private String currentEncoding = null; - /** Stateful variable tracking the "alias" of the current font-family-alias - * element. */ - private String currentFontFamilyAlias = null; - /** Stateful stack of the font-group elements. * If the contents are empty, we are not inside any font-group element. * Otherwise, the bottom of the stack contains grand-ancestor of any @@ -85,6 +93,14 @@ /** Stateful variable tracking the current embed directive. */ private String currentEmbed = "none"; + /** Stateful variable tracking the previous base directory. currentXMLBase + * will be overriden when parsing a font-family element. */ + private URL previousXMLBase = null; + + /** Stateful variable tracking the previous embed directive. currentEmbed + * will be overriden when parsing a font-family element. */ + private String previousEmbed = "none"; + /** The "xml:base" attribute, if any, that was parsed from the root * axsl-font-config element. */ private String parsedRootXMLBase; @@ -196,8 +212,8 @@ parseElementFont(attributes); return; } - if (localName.equals("font-description")) { - parseElementFontDescription(attributes); + if (localName.equals("family-member")) { + parseElementFamilyMember(attributes); return; } if (localName.equals("server")) { @@ -212,10 +228,6 @@ parseElementFontFamilyAlias(attributes); return; } - if (localName.equals("alias-configuration")) { - parseElementAliasConfiguration(attributes); - return; - } if (localName.equals("parameter")) { parseElementParameter(attributes); return; @@ -237,7 +249,7 @@ */ private void parseElementFontFamilyAlias(Attributes attributes) { String alias = attributes.getValue("alias"); - String family = attributes.getValue("default-family"); + String family = attributes.getValue("family"); if (alias == null || alias.equals("") || family == null @@ -245,38 +257,16 @@ logError("font-family-alias entry invalid. " + "Ignored."); } else { try { - fontServer.registerFontFamilyAlias(alias, "default", family); + fontServer.registerFontFamilyAlias(alias, family); } catch (FontException e) { logError(e.getMessage()); } - this.currentFontFamilyAlias = alias; } } /** * @param attributes */ - private void parseElementAliasConfiguration(Attributes attributes) { - String name = attributes.getValue("name"); - String family = attributes.getValue("font-family"); - if (name == null - || name.equals("") - || family == null - || family.equals("")) { - logError("alias-configuration entry invalid. " + "Ignored."); - } else { - try { - fontServer.registerFontFamilyAlias(this.currentFontFamilyAlias, - name, family); - } catch (FontException e) { - logError(e.getMessage()); - } - } - } - - /** - * @param attributes - */ private void parseElementParameter(Attributes attributes) { String key = attributes.getValue("key"); String value = attributes.getValue("value"); @@ -346,8 +336,27 @@ this.currentFontFamily = fontServer.getRegisteredFontFamily(name); return; } - currentSimulateSmallCaps = attributes.getValue("simulate-small-caps"); - currentEncoding = attributes.getValue("encoding"); + this.currentSimulateSmallCaps = attributes.getValue("simulate-small-caps"); + this.currentEncoding = attributes.getValue("encoding"); + String embed = attributes.getValue("embed"); + if (embed != null && !embed.equals("")) { + this.previousEmbed = this.currentEmbed; + this.currentEmbed = embed; + } + String xmlBase = replaceParameters(attributes.getValue("xml:base")); + if (xmlBase != null && !xmlBase.equals("")) { + try { + /* Update the current xml base. */ + this.previousXMLBase = this.currentXMLBase; + this.currentXMLBase = URLBuilder.buildURL(this.previousXMLBase, + xmlBase); + } catch (MalformedURLException e) { + logError("Unable to create URL from " + + this.previousXMLBase.getPath() + + " AND " + xmlBase); + } + } + fontIdCounter = 0; } /** @@ -371,7 +380,7 @@ /** * @param attributes */ - private void parseElementFontDescription(Attributes attributes) { + private void parseElementFamilyMember(Attributes attributes) { if (this.currentFontFamily == null) { return; } @@ -379,7 +388,6 @@ String weight = attributes.getValue("weight"); String variant = attributes.getValue("variant"); String stretch = attributes.getValue("stretch"); - String fontID = attributes.getValue("font"); String simulateSmallCaps = attributes.getValue("simulate-small-caps"); if (simulateSmallCaps == null) { /* Inherit the value from font-family. */ @@ -387,12 +395,6 @@ } String simulateOblique = attributes.getValue("simulate-oblique"); String simulateBackslant = attributes.getValue("simulate-backslant"); - RegisteredFont registeredFont = this.fontServer.getRegisteredFont( - fontID); - if (registeredFont == null) { - this.logWarning("Font is not registered: " + fontID); - return; - } String encodingName = attributes.getValue("encoding"); if (encodingName == null) { /* Inherit the value from font-family. */ @@ -411,14 +413,17 @@ simulateStretch[5] = attributes.getValue("simulate-expanded"); simulateStretch[6] = attributes.getValue("simulate-extra-expanded"); simulateStretch[7] = attributes.getValue("simulate-ultra-expanded"); - try { - this.currentFontFamily.registerFontDesc(registeredFont, - encoding, style, weight, variant, stretch, - simulateSmallCaps, simulateOblique, simulateBackslant, - simulateStretch); - } catch (FontException e) { - logWarning(e.getMessage()); - } + this.currentFontFamilyMember = new FontFamilyMember( + encoding, + style, + weight, + variant, + stretch, + simulateSmallCaps, + simulateOblique, + simulateBackslant, + simulateStretch); + fontIdCounter++; } /** @@ -436,11 +441,10 @@ /* If not set, inherit it. */ embed = this.currentEmbed; } else { - embed.toLowerCase(); - embed = replaceParameters(embed); + embed = replaceParameters(embed.toLowerCase()); } - String systemName = replaceParameters(attributes.getValue( - "system-name")); + String systemName = attributes.getValue("system-name"); + String refID = attributes.getValue("ref"); URL fontFileURL = null; URL metricsFileURL = null; @@ -455,11 +459,50 @@ fontServer.setFatalConfigurationError(true); } + /* TODO vh: check that if ref is declared, it is alone */ + if (this.currentFontFamilyMember == null) { + return; // Font declared outside a family-member element + } + if (refID == null || refID.equals("")) { + if (fontID == null || fontID.equals("")) { + StringBuffer name = new StringBuffer( + this.currentFontFamily.getName()); + if (this.currentFontFamilyMember.weight != null) { + name.append(this.currentFontFamilyMember.weight); + } + if (this.currentFontFamilyMember.style != null) { + name.append(this.currentFontFamilyMember.style); + } + name.append(fontIdCounter); + fontID = name.toString(); + } + try { + fontServer.registerFont(fontID, fontFileURL, metricsFileURL, + collectionID, embed, systemName); + } catch (FontException e) { + this.logError(e.getMessage()); + return; + } + refID = fontID; + } + RegisteredFont registeredFont = this.fontServer.getRegisteredFont(refID); + if (registeredFont == null) { + logWarning("Font is not registered: " + refID); + return; + } try { - fontServer.registerFont(fontID, fontFileURL, metricsFileURL, - collectionID, embed, systemName); + this.currentFontFamily.registerFontDesc(registeredFont, + this.currentFontFamilyMember.encoding, + this.currentFontFamilyMember.style, + this.currentFontFamilyMember.weight, + this.currentFontFamilyMember.variant, + this.currentFontFamilyMember.stretch, + this.currentFontFamilyMember.simulateSmallCaps, + this.currentFontFamilyMember.simulateOblique, + this.currentFontFamilyMember.simulateBackslant, + this.currentFontFamilyMember.simulateStretch); } catch (FontException e) { - this.logError(e.getMessage()); + logWarning(e.getMessage()); } } @@ -511,11 +554,17 @@ if (localName.equals("font-family")) { currentSimulateSmallCaps = null; currentEncoding = null; + currentXMLBase = previousXMLBase; + currentEmbed = previousEmbed; return; } if (localName.equals("font-description")) { return; } + if (localName.equals("family-member")) { + this.currentFontFamilyMember = null; + return; + } if (localName.equals("font-family-alias")) { return; } @@ -754,4 +803,40 @@ } + /** + * Inner class for storing font family members. + */ + private static class FontFamilyMember { + + final EncodingVector encoding; + final String style; + final String weight; + final String variant; + final String stretch; + final String simulateSmallCaps; + final String simulateOblique; + final String simulateBackslant; + final String[] simulateStretch; + + FontFamilyMember( + EncodingVector encoding, + String style, + String weight, + String variant, + String stretch, + String simulateSmallCaps, + String simulateOblique, + String simulateBackslant, + String[] simulateStretch) { + this.encoding = encoding; + this.style = style; + this.weight = weight; + this.variant = variant; + this.stretch = stretch; + this.simulateSmallCaps = simulateSmallCaps; + this.simulateOblique = simulateOblique; + this.simulateBackslant = simulateBackslant; + this.simulateStretch = simulateStretch; + } + } } Modified: trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java 2006-04-26 17:27:48 UTC (rev 7069) +++ trunk/foray/foray-font/src/java/org/foray/font/RegisteredFont.java 2006-04-26 19:03:57 UTC (rev 7070) @@ -202,11 +202,6 @@ } this.systemFontCreationCompleted = true; - if (! this.hasSystemFont()) { - /* We do not have what is needed to create a SystemFont. */ - return; - } - try { this.systemFont = new SystemFont(this); } catch (FontException e) { @@ -322,13 +317,12 @@ } public boolean hasSystemFont() { - if (this.systemName == null) { - return false; + if (this.systemName != null && !this.systemName.equals("")) { + return true; } - if (this.systemName.equals("")) { - return false; - } - return true; + /* Try to create a system font and return true if it has succeeded */ + createSystemFont(); + return this.systemFont != null; } } Modified: trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java =================================================================== --- trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-04-26 17:27:48 UTC (rev 7069) +++ trunk/foray/foray-font/src/java/org/foray/font/SystemFont.java 2006-04-26 19:03:57 UTC (rev 7070) @@ -378,13 +378,38 @@ * create Font to draw. */ public java.awt.Font createFont() throws FontException { - if (this.registeredFont.getFontFileReader() != null) { - return createFontFromInput(); + String systemName = this.registeredFont.getSystemName(); + /* If present, system-name has the priority */ + if (systemName != null && !systemName.equals("")) { + /* Since we are using the font name instead of the font-family + * name, the font-style should be PLAIN. */ + return new Font(systemName, Font.PLAIN, + SystemFont.INITIAL_FONT_SIZE); + } else { + Font returnedFont; + if (this.registeredFont.getFontFileReader() != null) { + returnedFont = createFontFromInput(); + if (returnedFont != null) { + return returnedFont; + } + } + /* + * Either no font file is available, or creating an awt font from + * the font file has failed + */ + org.axsl.font.Font fsf = this.registeredFont.getFreeStandingFont(); + returnedFont = new Font(fsf.getFontName(), Font.PLAIN, + SystemFont.INITIAL_FONT_SIZE); + /* + * Check that the returned awt font really corresponds to this font, + * and not to a fallback + */ + if (!returnedFont.getPSName().equals(fsf.getPostscriptName())) { + throw new FontException("Cannot find a system font for " + + fsf.getFontName()); + } + return returnedFont; } - /* Since we are using the font name instead of the font-family name, - * the font-style should be PLAIN. */ - return new Font(this.registeredFont.getSystemName(), Font.PLAIN, - SystemFont.INITIAL_FONT_SIZE); } /** @@ -415,10 +440,12 @@ } catch (IOException e) { throw new FontException("Error reading input stream for: \n " + fontFileReader.getDescription(), e); - } catch(FontFormatException ffe) { + } catch(IllegalArgumentException iae) { /* Ignore this. This just means that the fontFormat is not one that * java recognizes, probably because the runtime is lower than * java 1.5. The proper things to do is just return null.*/ + } catch(FontFormatException ffe) { + throw new FontException(ffe); } finally { if (fontStream != null) { try { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-26 17:27:53
|
Revision: 7069 Author: victormote Date: 2006-04-26 10:27:48 -0700 (Wed, 26 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7069&view=rev Log Message: ----------- For SystemFonts, check codePoint availability without regard to encoding. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.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-04-26 17:10:28 UTC (rev 7068) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java 2006-04-26 17:27:48 UTC (rev 7069) @@ -79,6 +79,13 @@ return null; } + public SystemFont getSystemFont() { + if (this.font instanceof SystemFont) { + return (SystemFont) this.font; + } + return null; + } + public FOrayFontConsumer getFontConsumer() { return this.consumer; } @@ -114,15 +121,22 @@ return null; } FOrayFontUse fontUse = null; + SystemFont sf = getSystemFont(); /* Check existing FontUse instances. */ for (int i = 0; i < this.fontUses.size() && fontUse == null; i++) { FOrayFontUse trialFontUse = (FOrayFontUse) this.fontUses.get(i); if (trialFontUse.getRegisteredFontDesc() != rfd) { continue; } - org.axsl.ps.Encoding encoding = trialFontUse.getEncoding(); - if (encoding.encodeCharacter(codePoint) == 0) { - continue; + if (sf != null) { + if (! sf.glyphAvailable(codePoint)) { + continue; + } + } else { + org.axsl.ps.Encoding encoding = trialFontUse.getEncoding(); + if (! encoding.canEncode(codePoint)) { + continue; + } } fontUse = trialFontUse; } @@ -130,14 +144,19 @@ return fontUse; } /* If none already exists, create one. */ - Encoding encoding = findEncoding(rfd, codePoint); - if (encoding == null) { - /* We can't encode this character. We need to return null so that - * the upstream font selection routines can try another font - * family. */ - return null; + if (sf != null) { + /* We don't care about encodings for SystemFonts. */ + fontUse = new FOrayFontUse(this, rfd, null); + } else { + Encoding encoding = findEncoding(rfd, codePoint); + if (encoding == null) { + /* We can't encode this character. + * Return null so that the upstream font selection routines can + * try another font family. */ + return null; + } + fontUse = new FOrayFontUse(this, rfd, encoding); } - fontUse = new FOrayFontUse(this, rfd, encoding); this.fontUses.add(fontUse); return fontUse; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-26 17:10:36
|
Revision: 7068 Author: victormote Date: 2006-04-26 10:10:28 -0700 (Wed, 26 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7068&view=rev Log Message: ----------- Test for null rfd first. Modified Paths: -------------- trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.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-04-26 15:34:29 UTC (rev 7067) +++ trunk/foray/foray-font/src/java/org/foray/font/FOrayConsumerFont.java 2006-04-26 17:10:28 UTC (rev 7068) @@ -110,6 +110,9 @@ } public FOrayFontUse selectFontUse(RegisteredFontDesc rfd, int codePoint) { + if (rfd == null) { + return null; + } FOrayFontUse fontUse = null; /* Check existing FontUse instances. */ for (int i = 0; i < this.fontUses.size() && fontUse == null; i++) { @@ -127,9 +130,6 @@ return fontUse; } /* If none already exists, create one. */ - if (rfd == null) { - return null; - } Encoding encoding = findEncoding(rfd, codePoint); if (encoding == null) { /* We can't encode this character. We need to return null so that This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-26 15:35:09
|
Revision: 7067 Author: victormote Date: 2006-04-26 08:34:29 -0700 (Wed, 26 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7067&view=rev Log Message: ----------- Fix icu4j jar file to include missing resource needed at runtime. Modified Paths: -------------- trunk/foray/lib/icu4j.README.txt trunk/foray/lib/icu4j_3_4_3.jar Modified: trunk/foray/lib/icu4j.README.txt =================================================================== --- trunk/foray/lib/icu4j.README.txt 2006-04-26 14:58:54 UTC (rev 7066) +++ trunk/foray/lib/icu4j.README.txt 2006-04-26 15:34:29 UTC (rev 7067) @@ -5,6 +5,14 @@ The subset distributed with FOray includes the following ant build targets: normalizer +Using the normal build built and tested without error, but failed at runtime +because of a missing resource: +data/icudt34b/ucase.icu +To correct this, I added the following line to the build.xml file at line 704: + <include name="**/ucase.icu"/> +I then rebuilt and retested. The resulting jar file was approx. twice as large +as the original, but does not fail at runtime. + Victor Mote April 26, 2006 Modified: trunk/foray/lib/icu4j_3_4_3.jar =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-26 14:59:30
|
Revision: 7066 Author: victormote Date: 2006-04-26 07:58:54 -0700 (Wed, 26 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7066&view=rev Log Message: ----------- Place a subset of the icu4j stuff in the lib directory and use it instead of the external pointer. Modified Paths: -------------- trunk/foray/foray-common/.classpath trunk/foray/foray-common/scripts/build.xml trunk/foray/scripts/foray-build.properties Added Paths: ----------- trunk/foray/lib/icu4j.LICENSE.html trunk/foray/lib/icu4j.README.txt trunk/foray/lib/icu4j_3_4_3.jar Modified: trunk/foray/foray-common/.classpath =================================================================== --- trunk/foray/foray-common/.classpath 2006-04-26 01:19:37 UTC (rev 7065) +++ trunk/foray/foray-common/.classpath 2006-04-26 14:58:54 UTC (rev 7066) @@ -7,6 +7,6 @@ <classpathentry kind="var" path="FORAY_LIB_ROOT/batik.jar"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/commons-logging.jar"/> <classpathentry kind="var" path="FORAY_LIB_ROOT/avalon-framework-cvs-20020806.jar"/> - <classpathentry sourcepath="/ICU4J_HOME/source/src" kind="var" path="ICU4J_HOME/icu4j_3_4_3.jar"/> + <classpathentry kind="var" path="FORAY_LIB_ROOT/icu4j_3_4_3.jar"/> <classpathentry kind="output" path="build/eclipse"/> </classpath> Modified: trunk/foray/foray-common/scripts/build.xml =================================================================== --- trunk/foray/foray-common/scripts/build.xml 2006-04-26 01:19:37 UTC (rev 7065) +++ trunk/foray/foray-common/scripts/build.xml 2006-04-26 14:58:54 UTC (rev 7066) @@ -25,25 +25,21 @@ <property name="foray.home" location="../.."/> <echo>foray.home: ${foray.home}</echo> - <!-- Set up dependent properties. --> + <!-- Set up dependent properties. --> <property name="lib.dir" location="${foray.home}/lib"/> <property name="axsl.build" location="${lib.dir}"/> - <property name="icu4j.libs" location="${lib.dir}"/> - <echo>icu4j.libs: ${icu4j.libs}</echo> <path id="libs-build-classpath"> <fileset dir="${axsl.build}"> <include name="**/axsl*.jar"/> </fileset> - <fileset dir="${icu4j.libs}"> - <include name="icu*.jar"/> - </fileset> <fileset dir="${lib.dir}"> <include name="batik*.jar"/> <include name="xml-apis.jar"/> <include name="axsl*.jar"/> <include name="commons-logging.jar"/> <include name="avalon-framework*.jar"/> + <include name="icu*.jar"/> </fileset> </path> </target> Added: trunk/foray/lib/icu4j.LICENSE.html =================================================================== --- trunk/foray/lib/icu4j.LICENSE.html (rev 0) +++ trunk/foray/lib/icu4j.LICENSE.html 2006-04-26 14:58:54 UTC (rev 7066) @@ -0,0 +1,34 @@ +<html> + +<head> +<title>ICU4J license - ICU4J 1.3.1 and later</title> +</head> + +<body BGCOLOR="#ffffff"> +<h2>ICU4J license - ICU4J 1.3.1 and later</h2> + +<p>COPYRIGHT AND PERMISSION NOTICE</p> + +<p> +Copyright (c) 1995-2005 International Business Machines Corporation and others +</p> +<p> +All rights reserved. +</p> +<p> +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons +to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation. +</p> +<p> +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +</p> +<p> +Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder. +</p> + +<hr> +<small> +All trademarks and registered trademarks mentioned herein are the property of their respective owners. +</small> +</body> +</html> Property changes on: trunk/foray/lib/icu4j.LICENSE.html ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/lib/icu4j.README.txt =================================================================== --- trunk/foray/lib/icu4j.README.txt (rev 0) +++ trunk/foray/lib/icu4j.README.txt 2006-04-26 14:58:54 UTC (rev 7066) @@ -0,0 +1,11 @@ +The icu4j jar file distributed with FOray is a subset of icu4j. +Instructions for building a subset were found here: +http://dev.icu-project.org/cgi-bin/viewcvs.cgi/*checkout*/icu4j/readme.html#HowToModularize + +The subset distributed with FOray includes the following ant build targets: +normalizer + +Victor Mote +April 26, 2006 + +# Last Line of memo # Property changes on: trunk/foray/lib/icu4j.README.txt ___________________________________________________________________ Name: svn:keywords + "Author Id Rev Date URL" Name: svn:eol-style + native Added: trunk/foray/lib/icu4j_3_4_3.jar =================================================================== (Binary files differ) Property changes on: trunk/foray/lib/icu4j_3_4_3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/foray/scripts/foray-build.properties =================================================================== --- trunk/foray/scripts/foray-build.properties 2006-04-26 01:19:37 UTC (rev 7065) +++ trunk/foray/scripts/foray-build.properties 2006-04-26 14:58:54 UTC (rev 7066) @@ -46,9 +46,4 @@ # Sample typical value: # jai.libs = D:/rsrc/java/jai/jai-1_1_1_01/lib -# icu4j.libs -# Directory containing the IBM ICU4J jar file. -# Sample typical value: -# icu4j.libs = D:/rsrc/icu4j/3_4_3 - # Last line of file. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-26 01:19:42
|
Revision: 7065 Author: victormote Date: 2006-04-25 18:19:37 -0700 (Tue, 25 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7065&view=rev Log Message: ----------- Fix color problem in outline display Modified Paths: -------------- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java =================================================================== --- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java 2006-04-26 01:02:45 UTC (rev 7064) +++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java 2006-04-26 01:19:37 UTC (rev 7065) @@ -45,9 +45,9 @@ String toPDF() { StringBuffer buffer = new StringBuffer(); buffer.append("["); - buffer.append(this.color.getRed() + " "); - buffer.append(this.color.getGreen() + " "); - buffer.append(this.color.getBlue()); + buffer.append(getRed() + " "); + buffer.append(getGreen() + " "); + buffer.append(getBlue()); buffer.append("]"); return buffer.toString(); } @@ -90,4 +90,16 @@ return this.color; } + public float getRed() { + return this.color.getRed()/255f; + } + + public float getGreen() { + return this.color.getGreen()/255f; + } + + public float getBlue() { + return this.color.getBlue()/255f; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-26 01:02:49
|
Revision: 7064 Author: victormote Date: 2006-04-25 18:02:45 -0700 (Tue, 25 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7064&view=rev Log Message: ----------- Fix bug in outline creation. Modified Paths: -------------- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutline.java Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutline.java =================================================================== --- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutline.java 2006-04-26 00:27:11 UTC (rev 7063) +++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFOutline.java 2006-04-26 01:02:45 UTC (rev 7064) @@ -49,7 +49,7 @@ StringBuffer result = new StringBuffer(); result.append(this.pdfID() + EOL); result.append("<<" + EOL); - result.append(" /Type Outlines" + EOL); + result.append(" /Type /Outlines" + EOL); if (getFirst() != null && getLast() != null) { result.append(" /First " + getFirst().pdfReference() + EOL); result.append(" /Last " + getLast().pdfReference() + EOL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-26 00:27:22
|
Revision: 7063 Author: victormote Date: 2006-04-25 17:27:11 -0700 (Tue, 25 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7063&view=rev Log Message: ----------- Change padding character to avoid problems with text editors. Modified Paths: -------------- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFObject.java Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFObject.java =================================================================== --- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFObject.java 2006-04-26 00:16:45 UTC (rev 7062) +++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFObject.java 2006-04-26 00:27:11 UTC (rev 7063) @@ -42,14 +42,18 @@ /** The String that should be used to end a line in the PDF document. */ public static final String EOL = "\n"; - /** The String that should be used to end a cross-reference line in the - * PDF document. The carriage-return is counter-intuitive but required. + /** + * The String that should be used to end a cross-reference line in the + * PDF document. * According to the PDF Reference, 3rd Edition, Section 3.4.3, each * cross-reference entry must be exactly 20 bytes long, including the - * end-of-line character(s). If newline is used for end-of-line, then an - * extra character must be padded. According to the Reference, that - * character must be either a space or a carriage-return. */ - public static final String XREF_EOL = "\r\n"; + * end-of-line character(s). + * If a 1-character eol is used (such as a newline), then an extra character + * must be padded. + * According to the Reference, that character must be a space. + * However, a space at the end of a line is often removed by editors, so we + * use a hyphen instead. */ + public static final String XREF_EOL = "-\n"; /** The String that should be used to end a line in log messages. */ public static final String MSG_EOL = "\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-26 00:16:53
|
Revision: 7062 Author: victormote Date: 2006-04-25 17:16:45 -0700 (Tue, 25 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7062&view=rev Log Message: ----------- 1. Fix structural problems. 2. Use CRLF line-ends. Modified Paths: -------------- trunk/foray/foray-pdf/resource/example/001.pdf Property Changed: ---------------- trunk/foray/foray-pdf/resource/example/001.pdf Modified: trunk/foray/foray-pdf/resource/example/001.pdf =================================================================== --- trunk/foray/foray-pdf/resource/example/001.pdf 2006-04-25 22:41:12 UTC (rev 7061) +++ trunk/foray/foray-pdf/resource/example/001.pdf 2006-04-26 00:16:45 UTC (rev 7062) @@ -1,63 +1,74 @@ -%PDF-1.4 -%\xAA\xAB\xAC\xAD -4 0 obj -<< -/Type /Info ->> -endobj -6 0 obj -<< /Length 24 >> -stream -BT -/F1 12 Tf -72 540 Td -(Hello World!) Tj -ET -endstream -endobj -7 0 obj -<< /Type /Page -/Parent 2 0 R -/MediaBox [ 0 0 396 612 ] -/Resources 3 0 R -/Contents 6 0 R ->> -endobj -2 0 obj -<< -/Type /Pages -/Count 1 -/Kids [ -7 0 R -] ->> -endobj -1 0 obj -<< -/Type /Catalog -/Pages 2 0 R ->> -endobj -3 0 obj -<< -/Font -<< -/F1 5 0 R ->> ->> -endobj -5 0 obj -<< -/Type /Font -/Subtype /Type1 -/BaseFont /Helvetica ->> -endobj -xref -trailer -<< -/Size 106 -/Root 1 0 R -/Info 4 0 R ->> -startxref +%PDF-1.4 +%\xAA\xAB\xAC\xAD +4 0 obj +<< +/Type /Info +>> +endobj +6 0 obj +<< /Length 49 >> +stream +BT +/F1 12 Tf +72 540 Td +(Hello World!) Tj +ET +endstream +endobj +7 0 obj +<< /Type /Page +/Parent 2 0 R +/MediaBox [ 0 0 396 612 ] +/Resources 3 0 R +/Contents 6 0 R +>> +endobj +2 0 obj +<< +/Type /Pages +/Count 1 +/Kids [ +7 0 R +] +>> +endobj +1 0 obj +<< +/Type /Catalog +/Pages 2 0 R +>> +endobj +3 0 obj +<< +/Font +<< +/F1 5 0 R +>> +>> +endobj +5 0 obj +<< +/Type /Font +/Subtype /Type1 +/BaseFont /Helvetica +>> +endobj +xref +0 8 +0000000000 65535 f +0000000340 00000 n +0000000272 00000 n +0000000395 00000 n +0000000017 00000 n +0000000446 00000 n +0000000055 00000 n +0000000158 00000 n +trailer +<< +/Size 2 +/Root 1 0 R +/Info 4 0 R +>> +startxref +523 +%%EOF Property changes on: trunk/foray/foray-pdf/resource/example/001.pdf ___________________________________________________________________ Name: svn:eol-style - native + CRLF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <vic...@us...> - 2006-04-25 22:41:18
|
Revision: 7061 Author: victormote Date: 2006-04-25 15:41:12 -0700 (Tue, 25 Apr 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7061&view=rev Log Message: ----------- First pass at batch file to run foray. Added Paths: ----------- trunk/foray/scripts/foray.bat Added: trunk/foray/scripts/foray.bat =================================================================== --- trunk/foray/scripts/foray.bat (rev 0) +++ trunk/foray/scripts/foray.bat 2006-04-25 22:41:12 UTC (rev 7061) @@ -0,0 +1,23 @@ +echo off + +set FORAY_CP=%FORAY_HOME%\build\foray-0.2b1.jar + +rem Add separate AXSL build in if it exists +set FORAY_CP=%FORAY_CP%;%AXSL_HOME%\build\ant\axsl-0.1a.jar + +rem Add ICU4J in (not in lib yet) +set FORAY_CP=%FORAY_CP%;D:\rsrc\icu4j\3_4_3\icu4j_3_4_3.jar + +rem Now add regular lib jar files +set FORAY_CP=%FORAY_CP%;%FORAY_HOME%\lib\avalon-framework-cvs-20020806.jar +set FORAY_CP=%FORAY_CP%;%FORAY_HOME%\lib\axsl-0.1a.jar +set FORAY_CP=%FORAY_CP%;%FORAY_HOME%\lib\batik.jar +set FORAY_CP=%FORAY_CP%;%FORAY_HOME%\lib\commons-logging.jar +set FORAY_CP=%FORAY_CP%;%FORAY_HOME%\lib\resolver.jar +set FORAY_CP=%FORAY_CP%;%FORAY_HOME%\lib\xercesImpl-2.7.1.jar + +java -Xmx256m -classpath "%FORAY_CP%" org.foray.app.FOray %1 %2 %3 %4 %5 %6 %7 %8 %9 + +set FORAY_CP= + +rem Last line of file 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.
