From 8882a49ac0c6d975d7f7b7694ac7eb79a1f99b1a Mon Sep 17 00:00:00 2001
From: Glenn Adams <gadams@apache.org>
Date: Fri, 2 Mar 2012 19:56:33 +0000
Subject: default all RightCurly tokens, thus adding LITERAL_IF; fix violations

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1296418 13f79535-47bb-0310-9956-ffa450edef68
---
 checkstyle-5.5.xml                                                    | 4 +---
 .../unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java       | 3 +--
 src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java            | 4 +---
 src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java | 3 +--
 src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java | 2 +-
 src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLeader.java       | 4 +---
 6 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/checkstyle-5.5.xml b/checkstyle-5.5.xml
index 9330b9501..416aece25 100644
--- a/checkstyle-5.5.xml
+++ b/checkstyle-5.5.xml
@@ -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"/>
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
 
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
diff --git a/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java b/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
index 467df6b3a..ec04b90a2 100644
--- a/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
+++ b/src/codegen/unicode/java/org/apache/fop/hyphenation/UnicodeClasses.java
@@ -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;
             }
diff --git a/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java b/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
index aa88f2618..e6c4e6907 100644
--- a/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
+++ b/src/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
@@ -748,9 +748,7 @@ public abstract class CharacterSetBuilder {
                                     AFPConstants.EBCIDIC_ENCODING);
                             String charString = new String(charBytes, encoding);
                             codePages.put(gcgiString, charString);
-
-                        }
-                        else {
+                        } else {
                             position++;
                         }
                     }
diff --git a/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java b/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java
index f8c5a38d3..45499748c 100644
--- a/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java
+++ b/src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java
@@ -180,8 +180,7 @@ implements Streamable {
     protected boolean canWrite(AbstractAFPObject obj) {
         if (obj instanceof Completable) {
             return ((Completable)obj).isComplete();
-        }
-        else {
+        } else {
             return this.isComplete();
         }
     }
diff --git a/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java b/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
index 0f24cba9d..9f61ecab8 100644
--- a/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
+++ b/src/java/org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.java
@@ -536,7 +536,7 @@ public final class UnicodeBidiAlgorithm implements BidiConstants {
                     int pc = ica[k];
                     if ( isRetainedFormatting ( pc ) ) {
                         continue;
-                    } if ( pc == BidiConstants.WS ) {
+                    } else if ( pc == BidiConstants.WS ) {
                         la[k] = dl;
                     } else {
                         break;
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLeader.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLeader.java
index b3f11bc0a..f9835ef0a 100644
--- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLeader.java
+++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLeader.java
@@ -182,9 +182,7 @@ public class RtfLeader extends RtfContainer {
 
             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);
-- 
cgit v1.2.3