Author: gadams
Date: Fri Mar 2 19:56:33 2012
New Revision: 1296418
URL: http://svn.apache.org/viewvc?rev=1296418&view=rev
Log:
default all RightCurly tokens, thus adding LITERAL_IF; fix violations
Modified:
xmlgraphics/fop/trunk/checkstyle-5.5.xml
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLeader.java
Modified: xmlgraphics/fop/trunk/checkstyle-5.5.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/checkstyle-5.5.xml?rev=1296418&r1=1296417&r2=1296418&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/checkstyle-5.5.xml (original)
+++ xmlgraphics/fop/trunk/checkstyle-5.5.xml Fri Mar 2 19:56:33 2012
@@ -216,9 +216,7 @@
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
... ... ... ... ... ... ... ... -->
- <module name="RightCurly">
- <property name="tokens"
value="LITERAL_CATCH,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_TRY"/>
<!-- adding LITERAL_IF produces 5 new errors -->
- </module>
+ <module name="RightCurly"/>
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
... ... ... ... ... ... ... ... -->
<!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ...
... ... ... ... ... ... ... ... -->
Modified:
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java?rev=1296418&r1=1296417&r2=1296418&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
(original)
+++
xmlgraphics/fop/trunk/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
Fri Mar 2 19:56:33 2012
@@ -322,8 +322,7 @@ public final class UnicodeClasses {
if (codes[0].equals("\\l") && codes.length != 2) {
ow.write("\"" + line + "\" should have one code");
continue;
- }
- else if (codes[0].equals("\\L") && codes.length != 4) {
+ } else if (codes[0].equals("\\L") && codes.length != 4) {
ow.write("\"" + line + "\" should have three codes");
continue;
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java?rev=1296418&r1=1296417&r2=1296418&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
Fri Mar 2 19:56:33 2012
@@ -748,9 +748,7 @@ public abstract class CharacterSetBuilde
AFPConstants.EBCIDIC_ENCODING);
String charString = new String(charBytes,
encoding);
codePages.put(gcgiString, charString);
-
- }
- else {
+ } else {
position++;
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java?rev=1296418&r1=1296417&r2=1296418&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java
Fri Mar 2 19:56:33 2012
@@ -180,8 +180,7 @@ implements Streamable {
protected boolean canWrite(AbstractAFPObject obj) {
if (obj instanceof Completable) {
return ((Completable)obj).isComplete();
- }
- else {
+ } else {
return this.isComplete();
}
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java?rev=1296418&r1=1296417&r2=1296418&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
Fri Mar 2 19:56:33 2012
@@ -536,7 +536,7 @@ public final class UnicodeBidiAlgorithm
int pc = ica[k];
if ( isRetainedFormatting ( pc ) ) {
continue;
- } if ( pc == BidiConstants.WS ) {
+ } else if ( pc == BidiConstants.WS ) {
la[k] = dl;
} else {
break;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLeader.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLeader.java?rev=1296418&r1=1296417&r2=1296418&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLeader.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLeader.java
Fri Mar 2 19:56:33 2012
@@ -182,9 +182,7 @@ public class RtfLeader extends RtfContai
writeGroupMark(false);
- }
- // Using white spaces with different underline formats
- else {
+ } else { // Using white spaces with different underline formats
writeControlWord(LEADER_IGNORE_STYLE);
writeControlWord(LEADER_ZERO_WIDTH);
writeGroupMark(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
