From: Glenn Adams <gadams@apache.org>
Date: Fri, 2 Mar 2012 19:36:45 +0000 (+0000)
Subject: default all RedunduntModifier tokens, thus adding INTERFACE_DEF; fix violations
X-Git-Tag: fop-1_1rc1old~115
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=db70376fd51979b6b04784d039fa8f21cdb8a2a8;p=xmlgraphics-fop.git

default all RedunduntModifier tokens, thus adding INTERFACE_DEF; fix violations

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1296405 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/checkstyle-5.5.xml b/checkstyle-5.5.xml
index 29d4f472c..9330b9501 100644
--- a/checkstyle-5.5.xml
+++ b/checkstyle-5.5.xml
@@ -212,9 +212,7 @@
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
 
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
-    <module name="RedundantModifier">
-      <property name="tokens" value="ANNOTATION_FIELD_DEF,METHOD_DEF,VARIABLE_DEF"/>                            <!-- adding INTERFACE_DEF produces 3 new errors -->
-    </module>
+    <module name="RedundantModifier"/>
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
 
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
diff --git a/src/java/org/apache/fop/area/AreaTreeParser.java b/src/java/org/apache/fop/area/AreaTreeParser.java
index 961160a55..ebb35f9bf 100644
--- a/src/java/org/apache/fop/area/AreaTreeParser.java
+++ b/src/java/org/apache/fop/area/AreaTreeParser.java
@@ -361,7 +361,7 @@ public class AreaTreeParser {
 
         // ============== Maker classes for the area tree objects =============
 
-        private static interface Maker {
+        private interface Maker {
             void startElement(Attributes attributes) throws SAXException;
             void endElement();
             boolean ignoreCharacters();
diff --git a/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java b/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java
index f005c8fbe..84b4c3769 100644
--- a/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java
+++ b/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java
@@ -40,7 +40,7 @@ class VariableColRowGroupBuilder extends RowGroupBuilder {
      * Each event is recorded and will be played once the table is finished, and the final
      * number of columns known.
      */
-    private static interface Event {
+    private interface Event {
         /**
          * Plays this event
          *
diff --git a/src/java/org/apache/fop/render/intermediate/IFParser.java b/src/java/org/apache/fop/render/intermediate/IFParser.java
index 26d1b62ed..33e6931de 100644
--- a/src/java/org/apache/fop/render/intermediate/IFParser.java
+++ b/src/java/org/apache/fop/render/intermediate/IFParser.java
@@ -403,7 +403,7 @@ public class IFParser implements IFConstants {
 
         // ============== Element handlers for the intermediate format =============
 
-        private static interface ElementHandler {
+        private interface ElementHandler {
             void startElement(Attributes attributes) throws IFException, SAXException;
             void endElement() throws IFException;
             boolean ignoreCharacters();