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 29d4f472c0746fe849488e71936657be7edad1b8..9330b95015c7fc9af48957733a750bf63e506b47 100644 (file)
--- 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 961160a55f0b55d777b7cb5464991839cc637efb..ebb35f9bf2ab14dda28ff310bd7f15dd1763fbb7 100644 (file)
--- 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 f005c8fbe0f1f5023554509ef774e96e42747b22..84b4c37695b507113dae5ec22118ce2f7d74d620 100644 (file)
--- 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 26d1b62ed091e66b66d7ae602c5c58d0db1a5b89..33e6931dedaf3d3f14c858eebc42287addf1cd6c 100644 (file)
--- 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();