You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2013/04/09 19:31:45 UTC
svn commit: r1466146 [1/20] - in /xmlgraphics/fop/trunk: ./
src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/
src/codegen/unicode/java/org/apache/fop/text/linebreak/
src/java/org/apache/fop/afp/ src/java/org/apache/fop/afp/modca/
src/java/or...
Author: vhennebert
Date: Tue Apr 9 17:31:41 2013
New Revision: 1466146
URL: http://svn.apache.org/r1466146
Log:
Cosmetics only: enabled Checkstyle ParenPad rule and fixed corresponding violations
Modified:
xmlgraphics/fop/trunk/checkstyle-5.5.xml
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiTestData.java
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/text/linebreak/GenerateLineBreakUtils.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPBorderPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/AFPRectanglePainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/Factory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/GraphicsObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/triplets/EncodingTriplet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/util/DTDEntityResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/AreaTreeParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/CTM.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LineArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/LinkResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/PageViewport.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Span.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/BasicLinkArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineParent.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/SpaceArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/TextArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/WordArea.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/BidiClass.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/BidiResolver.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/DelimitedTextRange.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/InlineRun.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/TextInterval.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnflattenProcessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphClassMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphClassTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphCoverageTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinition.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionSubtable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphDefinitionTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphMappingTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioning.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningState.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningSubtable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphPositioningTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphProcessingState.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitution.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionSubtable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphSubtable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/GlyphTable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/OTFAdvancedTypographicTableReader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/Positionable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/fonts/Substitutable.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ArabicScriptProcessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DefaultScriptProcessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/DevanagariScriptProcessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GujaratiScriptProcessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/GurmukhiScriptProcessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/scripts/ScriptProcessor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharMirror.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/CharScript.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphContextTester.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/GlyphTester.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/NumberConverter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/ScriptContextTester.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/util/UTF32.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/Event.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/events/EventFormatter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FONode.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/PropertyList.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromNearestSpecifiedValueFunction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromParentFunction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/FunctionBase.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractGraphics.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BidiOverride.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/BlockContainer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Character.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineContainer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/InlineLevel.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Leader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/ListItem.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/PageNumber.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/Wrapper.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ConditionalBorder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PendingSpan.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/Table.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCell.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionAfter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBA.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBefore.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionBody.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionEnd.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionSE.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/RegionStart.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/FontWeightPropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PropertyCache.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CMapSegment.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/Font.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/LazyFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/MultiByteFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/type1/AFMParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CellPart.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFCIDFont.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFontDescriptor.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFFunction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFPattern.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFShading.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFTextUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFGraphicContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFParser.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFSerializer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFUtil.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentNavigationHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFPainter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/extensions/PSSetPageDeviceElement.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/RTFHandler.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphBreak.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/tools/PercentContext.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFGraphics2D.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/anttasks/Fop.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/Direction.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/WritingMode.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/WritingModeTraits.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/traits/WritingModeTraitsSetter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/CharUtilities.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorExt.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/util/XMLUtil.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/mif/MIFHandler.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiAlgorithmTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiClassTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/bidi/BidiTestData.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFile.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/fonts/ttx/TTXFileTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/scripts/arabic/ArabicTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/scripts/arabic/GenerateArabicTestData.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/complexscripts/util/NumberConverterTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
Modified: xmlgraphics/fop/trunk/checkstyle-5.5.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/checkstyle-5.5.xml?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/checkstyle-5.5.xml (original)
+++ xmlgraphics/fop/trunk/checkstyle-5.5.xml Tue Apr 9 17:31:41 2013
@@ -155,7 +155,7 @@
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
- <!-- <module name="MethodParamPad"/> produces 4316 new errors -->
+ <module name="MethodParamPad"/>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
@@ -206,7 +206,7 @@
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
- <!-- <module name="ParenPad"/> produces 16666 new errors -->
+ <module name="ParenPad"/>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
Modified: xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java?rev=1466146&r1=1466145&r2=1466146&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java (original)
+++ xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/GenerateBidiClass.java Tue Apr 9 17:31:41 2013
@@ -140,72 +140,72 @@ public final class GenerateBidiClass {
String line;
int lineNumber = 0;
TreeSet intervals = new TreeSet();
- while ( ( line = b.readLine() ) != null ) {
+ while ((line = b.readLine()) != null) {
lineNumber++;
- if ( line.startsWith("#") ) {
+ if (line.startsWith("#")) {
continue;
- } else if ( line.length() == 0 ) {
+ } else if (line.length() == 0) {
continue;
} else {
- if ( line.indexOf ( "#" ) != -1 ) {
- line = ( line.split ( "#" ) ) [ 0 ];
+ if (line.indexOf ("#") != -1) {
+ line = (line.split ("#")) [ 0 ];
}
- String[] fa = line.split ( ";" );
- if ( fa.length == 2 ) {
- int[] interval = parseInterval ( fa[0].trim() );
- byte bidiClass = (byte) parseBidiClass ( fa[1].trim() );
- if ( interval[1] == interval[0] ) { // singleton
+ String[] fa = line.split (";");
+ if (fa.length == 2) {
+ int[] interval = parseInterval (fa[0].trim());
+ byte bidiClass = (byte) parseBidiClass (fa[1].trim());
+ if (interval[1] == interval[0]) { // singleton
int c = interval[0];
- if ( c <= 0x00FF ) {
- if ( bcL1 [ c - 0x0000 ] == 0 ) {
+ if (c <= 0x00FF) {
+ if (bcL1 [ c - 0x0000 ] == 0) {
bcL1 [ c - 0x0000 ] = bidiClass;
} else {
- throw new Exception ( "duplicate singleton entry: " + c );
+ throw new Exception ("duplicate singleton entry: " + c);
}
- } else if ( ( c >= 0x0590 ) && ( c <= 0x06FF ) ) {
- if ( bcR1 [ c - 0x0590 ] == 0 ) {
+ } else if ((c >= 0x0590) && (c <= 0x06FF)) {
+ if (bcR1 [ c - 0x0590 ] == 0) {
bcR1 [ c - 0x0590 ] = bidiClass;
} else {
- throw new Exception ( "duplicate singleton entry: " + c );
+ throw new Exception ("duplicate singleton entry: " + c);
}
} else {
- addInterval ( intervals, c, c, bidiClass );
+ addInterval (intervals, c, c, bidiClass);
}
} else { // non-singleton
int s = interval[0];
int e = interval[1]; // inclusive
- if ( s <= 0x00FF ) {
- for ( int i = s; i <= e; i++ ) {
- if ( i <= 0x00FF ) {
- if ( bcL1 [ i - 0x0000 ] == 0 ) {
+ if (s <= 0x00FF) {
+ for (int i = s; i <= e; i++) {
+ if (i <= 0x00FF) {
+ if (bcL1 [ i - 0x0000 ] == 0) {
bcL1 [ i - 0x0000 ] = bidiClass;
} else {
- throw new Exception ( "duplicate singleton entry: " + i );
+ throw new Exception ("duplicate singleton entry: " + i);
}
} else {
- addInterval ( intervals, i, e, bidiClass );
+ addInterval (intervals, i, e, bidiClass);
break;
}
}
- } else if ( ( s >= 0x0590 ) && ( s <= 0x06FF ) ) {
- for ( int i = s; i <= e; i++ ) {
- if ( i <= 0x06FF ) {
- if ( bcR1 [ i - 0x0590 ] == 0 ) {
+ } else if ((s >= 0x0590) && (s <= 0x06FF)) {
+ for (int i = s; i <= e; i++) {
+ if (i <= 0x06FF) {
+ if (bcR1 [ i - 0x0590 ] == 0) {
bcR1 [ i - 0x0590 ] = bidiClass;
} else {
- throw new Exception ( "duplicate singleton entry: " + i );
+ throw new Exception ("duplicate singleton entry: " + i);
}
} else {
- addInterval ( intervals, i, e, bidiClass );
+ addInterval (intervals, i, e, bidiClass);
break;
}
}
} else {
- addInterval ( intervals, s, e, bidiClass );
+ addInterval (intervals, s, e, bidiClass);
}
}
} else {
- throw new Exception ( "bad syntax, line(" + lineNumber + "): " + line );
+ throw new Exception ("bad syntax, line(" + lineNumber + "): " + line);
}
}
}
@@ -215,7 +215,7 @@ public final class GenerateBidiClass {
bcS1 = new int [ niv ];
bcE1 = new int [ niv ];
bcC1 = new byte [ niv ];
- for ( Iterator it = intervals.iterator(); it.hasNext(); ivIndex++ ) {
+ for (Iterator it = intervals.iterator(); it.hasNext(); ivIndex++) {
Interval iv = (Interval) it.next();
bcS1[ivIndex] = iv.start;
bcE1[ivIndex] = iv.end;
@@ -225,219 +225,219 @@ public final class GenerateBidiClass {
test();
}
- private static int[] parseInterval ( String interval ) throws Exception {
+ private static int[] parseInterval (String interval) throws Exception {
int s;
int e;
String[] fa = interval.split("\\.\\.");
- if ( fa.length == 1 ) {
- s = Integer.parseInt ( fa[0], 16 );
+ if (fa.length == 1) {
+ s = Integer.parseInt (fa[0], 16);
e = s;
- } else if ( fa.length == 2 ) {
- s = Integer.parseInt ( fa[0], 16 );
- e = Integer.parseInt ( fa[1], 16 );
+ } else if (fa.length == 2) {
+ s = Integer.parseInt (fa[0], 16);
+ e = Integer.parseInt (fa[1], 16);
} else {
- throw new Exception ( "bad interval syntax: " + interval );
+ throw new Exception ("bad interval syntax: " + interval);
}
- if ( e < s ) {
- throw new Exception ( "bad interval, start must be less than or equal to end: " + interval );
+ if (e < s) {
+ throw new Exception ("bad interval, start must be less than or equal to end: " + interval);
}
return new int[] {s, e};
}
- private static int parseBidiClass ( String bidiClass ) {
+ private static int parseBidiClass (String bidiClass) {
int bc = 0;
- if ( "L".equals ( bidiClass ) ) {
+ if ("L".equals (bidiClass)) {
bc = BidiConstants.L;
- } else if ( "LRE".equals ( bidiClass ) ) {
+ } else if ("LRE".equals (bidiClass)) {
bc = BidiConstants.LRE;
- } else if ( "LRO".equals ( bidiClass ) ) {
+ } else if ("LRO".equals (bidiClass)) {
bc = BidiConstants.LRO;
- } else if ( "R".equals ( bidiClass ) ) {
+ } else if ("R".equals (bidiClass)) {
bc = BidiConstants.R;
- } else if ( "AL".equals ( bidiClass ) ) {
+ } else if ("AL".equals (bidiClass)) {
bc = BidiConstants.AL;
- } else if ( "RLE".equals ( bidiClass ) ) {
+ } else if ("RLE".equals (bidiClass)) {
bc = BidiConstants.RLE;
- } else if ( "RLO".equals ( bidiClass ) ) {
+ } else if ("RLO".equals (bidiClass)) {
bc = BidiConstants.RLO;
- } else if ( "PDF".equals ( bidiClass ) ) {
+ } else if ("PDF".equals (bidiClass)) {
bc = BidiConstants.PDF;
- } else if ( "EN".equals ( bidiClass ) ) {
+ } else if ("EN".equals (bidiClass)) {
bc = BidiConstants.EN;
- } else if ( "ES".equals ( bidiClass ) ) {
+ } else if ("ES".equals (bidiClass)) {
bc = BidiConstants.ES;
- } else if ( "ET".equals ( bidiClass ) ) {
+ } else if ("ET".equals (bidiClass)) {
bc = BidiConstants.ET;
- } else if ( "AN".equals ( bidiClass ) ) {
+ } else if ("AN".equals (bidiClass)) {
bc = BidiConstants.AN;
- } else if ( "CS".equals ( bidiClass ) ) {
+ } else if ("CS".equals (bidiClass)) {
bc = BidiConstants.CS;
- } else if ( "NSM".equals ( bidiClass ) ) {
+ } else if ("NSM".equals (bidiClass)) {
bc = BidiConstants.NSM;
- } else if ( "BN".equals ( bidiClass ) ) {
+ } else if ("BN".equals (bidiClass)) {
bc = BidiConstants.BN;
- } else if ( "B".equals ( bidiClass ) ) {
+ } else if ("B".equals (bidiClass)) {
bc = BidiConstants.B;
- } else if ( "S".equals ( bidiClass ) ) {
+ } else if ("S".equals (bidiClass)) {
bc = BidiConstants.S;
- } else if ( "WS".equals ( bidiClass ) ) {
+ } else if ("WS".equals (bidiClass)) {
bc = BidiConstants.WS;
- } else if ( "ON".equals ( bidiClass ) ) {
+ } else if ("ON".equals (bidiClass)) {
bc = BidiConstants.ON;
} else {
- throw new IllegalArgumentException ( "unknown bidi class: " + bidiClass );
+ throw new IllegalArgumentException ("unknown bidi class: " + bidiClass);
}
return bc;
}
- private static void addInterval ( SortedSet intervals, int start, int end, int bidiClass ) {
- intervals.add ( new Interval ( start, end, bidiClass ) );
+ private static void addInterval (SortedSet intervals, int start, int end, int bidiClass) {
+ intervals.add (new Interval (start, end, bidiClass));
}
- private static void dumpData ( PrintWriter out ) {
+ private static void dumpData (PrintWriter out) {
boolean first;
StringBuffer sb = new StringBuffer();
// bcL1
first = true;
sb.setLength(0);
- out.println ( "private static byte[] bcL1 = {" );
- for ( int i = 0; i < bcL1.length; i++ ) {
- if ( ! first ) {
- sb.append ( "," );
+ out.println ("private static byte[] bcL1 = {");
+ for (int i = 0; i < bcL1.length; i++) {
+ if (! first) {
+ sb.append (",");
} else {
first = false;
}
- sb.append ( bcL1[i] );
- if ( sb.length() > 120 ) {
+ sb.append (bcL1[i]);
+ if (sb.length() > 120) {
sb.append(',');
out.println(sb);
first = true;
sb.setLength(0);
}
}
- if ( sb.length() > 0 ) {
+ if (sb.length() > 0) {
out.println(sb);
}
- out.println ( "};" );
+ out.println ("};");
out.println();
// bcR1
first = true;
sb.setLength(0);
- out.println ( "private static byte[] bcR1 = {" );
- for ( int i = 0; i < bcR1.length; i++ ) {
- if ( ! first ) {
- sb.append ( "," );
+ out.println ("private static byte[] bcR1 = {");
+ for (int i = 0; i < bcR1.length; i++) {
+ if (! first) {
+ sb.append (",");
} else {
first = false;
}
- sb.append ( bcR1[i] );
- if ( sb.length() > 120 ) {
+ sb.append (bcR1[i]);
+ if (sb.length() > 120) {
sb.append(',');
out.println(sb);
first = true;
sb.setLength(0);
}
}
- if ( sb.length() > 0 ) {
+ if (sb.length() > 0) {
out.println(sb);
}
- out.println ( "};" );
+ out.println ("};");
out.println();
// bcS1
first = true;
sb.setLength(0);
- out.println ( "private static int[] bcS1 = {" );
- for ( int i = 0; i < bcS1.length; i++ ) {
- if ( ! first ) {
- sb.append ( "," );
+ out.println ("private static int[] bcS1 = {");
+ for (int i = 0; i < bcS1.length; i++) {
+ if (! first) {
+ sb.append (",");
} else {
first = false;
}
- sb.append ( bcS1[i] );
- if ( sb.length() > 120 ) {
+ sb.append (bcS1[i]);
+ if (sb.length() > 120) {
sb.append(',');
out.println(sb);
first = true;
sb.setLength(0);
}
}
- if ( sb.length() > 0 ) {
+ if (sb.length() > 0) {
out.println(sb);
}
- out.println ( "};" );
+ out.println ("};");
out.println();
// bcE1
first = true;
sb.setLength(0);
- out.println ( "private static int[] bcE1 = {" );
- for ( int i = 0; i < bcE1.length; i++ ) {
- if ( ! first ) {
- sb.append ( "," );
+ out.println ("private static int[] bcE1 = {");
+ for (int i = 0; i < bcE1.length; i++) {
+ if (! first) {
+ sb.append (",");
} else {
first = false;
}
- sb.append ( bcE1[i] );
- if ( sb.length() > 120 ) {
+ sb.append (bcE1[i]);
+ if (sb.length() > 120) {
sb.append(',');
out.println(sb);
first = true;
sb.setLength(0);
}
}
- if ( sb.length() > 0 ) {
+ if (sb.length() > 0) {
out.println(sb);
}
- out.println ( "};" );
+ out.println ("};");
out.println();
// bcC1
first = true;
sb.setLength(0);
- out.println ( "private static byte[] bcC1 = {" );
- for ( int i = 0; i < bcC1.length; i++ ) {
- if ( ! first ) {
- sb.append ( "," );
+ out.println ("private static byte[] bcC1 = {");
+ for (int i = 0; i < bcC1.length; i++) {
+ if (! first) {
+ sb.append (",");
} else {
first = false;
}
- sb.append ( bcC1[i] );
- if ( sb.length() > 120 ) {
+ sb.append (bcC1[i]);
+ if (sb.length() > 120) {
sb.append(',');
out.println(sb);
first = true;
sb.setLength(0);
}
}
- if ( sb.length() > 0 ) {
+ if (sb.length() > 0) {
out.println(sb);
}
- out.println ( "};" );
+ out.println ("};");
out.println();
}
- private static int getBidiClass ( int ch ) {
- if ( ch <= 0x00FF ) {
+ private static int getBidiClass (int ch) {
+ if (ch <= 0x00FF) {
return bcL1 [ ch - 0x0000 ];
- } else if ( ( ch >= 0x0590 ) && ( ch <= 0x06FF ) ) {
+ } else if ((ch >= 0x0590) && (ch <= 0x06FF)) {
return bcR1 [ ch - 0x0590 ];
} else {
- return getBidiClass ( ch, bcS1, bcE1, bcC1 );
+ return getBidiClass (ch, bcS1, bcE1, bcC1);
}
}
- private static int getBidiClass ( int ch, int[] sa, int[] ea, byte[] ca ) {
- int k = Arrays.binarySearch ( sa, ch );
- if ( k >= 0 ) {
+ private static int getBidiClass (int ch, int[] sa, int[] ea, byte[] ca) {
+ int k = Arrays.binarySearch (sa, ch);
+ if (k >= 0) {
return ca [ k ];
} else {
- k = - ( k + 1 );
- if ( k == 0 ) {
+ k = - (k + 1);
+ if (k == 0) {
return BidiConstants.L;
- } else if ( ch <= ea [ k - 1 ] ) {
+ } else if (ch <= ea [ k - 1 ]) {
return ca [ k - 1 ];
} else {
return BidiConstants.L;
@@ -495,12 +495,12 @@ public final class GenerateBidiClass {
};
private static void test() throws Exception {
- for ( int i = 0, n = testData.length / 2; i < n; i++ ) {
+ for (int i = 0, n = testData.length / 2; i < n; i++) {
int ch = testData [ i * 2 + 0 ];
int tc = testData [ i * 2 + 1 ];
- int bc = getBidiClass ( ch );
- if ( bc != tc ) {
- throw new Exception ( "test mapping failed for character (0x" + Integer.toHexString(ch) + "): expected " + tc + ", got " + bc );
+ int bc = getBidiClass (ch);
+ if (bc != tc) {
+ throw new Exception ("test mapping failed for character (0x" + Integer.toHexString(ch) + "): expected " + tc + ", got " + bc);
}
}
}
@@ -548,20 +548,20 @@ public final class GenerateBidiClass {
int start; // CSOK: VisibilityModifier
int end; // CSOK: VisibilityModifier
int bidiClass; // CSOK: VisibilityModifier
- Interval ( int start, int end, int bidiClass ) {
+ Interval (int start, int end, int bidiClass) {
this.start = start;
this.end = end;
this.bidiClass = bidiClass;
}
- public int compareTo ( Object o ) {
+ public int compareTo (Object o) {
Interval iv = (Interval) o;
- if ( start < iv.start ) {
+ if (start < iv.start) {
return -1;
- } else if ( start > iv.start ) {
+ } else if (start > iv.start) {
return 1;
- } else if ( end < iv.end ) {
+ } else if (end < iv.end) {
return -1;
- } else if ( end > iv.end ) {
+ } else if (end > iv.end) {
return 1;
} else {
return 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org