You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by ss...@apache.org on 2017/09/11 12:43:23 UTC

svn commit: r1808023 - in /xmlgraphics/batik/trunk: ./ batik-awt-util/src/main/java/org/apache/batik/ext/swing/ batik-bridge/src/main/java/org/apache/batik/bridge/ batik-bridge/src/main/java/org/apache/batik/bridge/svg12/ batik-css/src/main/java/org/ap...

Author: ssteiner
Date: Mon Sep 11 12:43:22 2017
New Revision: 1808023

URL: http://svn.apache.org/viewvc?rev=1808023&view=rev
Log:
Fix few checkstyle errors

Modified:
    xmlgraphics/batik/trunk/batik-awt-util/src/main/java/org/apache/batik/ext/swing/JGridBagPanel.java
    xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/UserAgent.java
    xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/AbstractContentSelector.java
    xmlgraphics/batik/trunk/batik-css/src/main/java/org/apache/batik/css/engine/sac/CSSDirectAdjacentSelector.java
    xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/CustomEvent.java
    xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/DocumentEvent.java
    xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/Event.java
    xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/EventListener.java
    xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/EventTarget.java
    xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/KeyboardEvent.java
    xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MouseEvent.java
    xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MutationEvent.java
    xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MutationNameEvent.java
    xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/TextEvent.java
    xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/UIEvent.java
    xmlgraphics/batik/trunk/batik-gui-util/src/main/java/org/apache/batik/util/gui/DropDownComponent.java
    xmlgraphics/batik/trunk/batik-gvt/src/main/java/org/apache/batik/gvt/CompositeGraphicsNode.java
    xmlgraphics/batik/trunk/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/ImageRenderer.java
    xmlgraphics/batik/trunk/batik-script/src/main/java/org/apache/batik/script/ImportInfo.java
    xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMDocumentTree.java
    xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMViewer.java
    xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/HistoryBrowser.java
    xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodePickerPanel.java
    xmlgraphics/batik/trunk/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/Main.java
    xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/xml/XMLTestReportProcessor.java
    xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/CleanerThread.java
    xmlgraphics/batik/trunk/batik-xml/src/main/java/org/apache/batik/xml/XMLUtilities.java
    xmlgraphics/batik/trunk/checkstyle.xml

Modified: xmlgraphics/batik/trunk/batik-awt-util/src/main/java/org/apache/batik/ext/swing/JGridBagPanel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-awt-util/src/main/java/org/apache/batik/ext/swing/JGridBagPanel.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-awt-util/src/main/java/org/apache/batik/ext/swing/JGridBagPanel.java (original)
+++ xmlgraphics/batik/trunk/batik-awt-util/src/main/java/org/apache/batik/ext/swing/JGridBagPanel.java Mon Sep 11 12:43:22 2017
@@ -36,7 +36,7 @@ public class JGridBagPanel extends JPane
     /**
      * Provides insets desired for a given grid cell
      */
-    public static interface InsetsManager{
+    public interface InsetsManager{
         /**
          * Returns the insets for cell (gridx, gridy);
          */

Modified: xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/UserAgent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/UserAgent.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/UserAgent.java (original)
+++ xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/UserAgent.java Mon Sep 11 12:43:22 2017
@@ -308,5 +308,5 @@ public interface UserAgent {
     void loadDocument(String url);
 
     /** Returns the Font Family Resolver */
-    public FontFamilyResolver getFontFamilyResolver();
+    FontFamilyResolver getFontFamilyResolver();
 }

Modified: xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/AbstractContentSelector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/AbstractContentSelector.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/AbstractContentSelector.java (original)
+++ xmlgraphics/batik/trunk/batik-bridge/src/main/java/org/apache/batik/bridge/svg12/AbstractContentSelector.java Mon Sep 11 12:43:22 2017
@@ -122,7 +122,7 @@ public abstract class AbstractContentSel
     /**
      * An interface for content selector factories.
      */
-    protected static interface ContentSelectorFactory {
+    protected interface ContentSelectorFactory {
 
         /**
          * Creates a new selector object.

Modified: xmlgraphics/batik/trunk/batik-css/src/main/java/org/apache/batik/css/engine/sac/CSSDirectAdjacentSelector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-css/src/main/java/org/apache/batik/css/engine/sac/CSSDirectAdjacentSelector.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-css/src/main/java/org/apache/batik/css/engine/sac/CSSDirectAdjacentSelector.java (original)
+++ xmlgraphics/batik/trunk/batik-css/src/main/java/org/apache/batik/css/engine/sac/CSSDirectAdjacentSelector.java Mon Sep 11 12:43:22 2017
@@ -60,8 +60,9 @@ public class CSSDirectAdjacentSelector e
         if (!((ExtendedSelector)getSiblingSelector()).match(e, pseudoE))
             return false;
         while ((n = n.getPreviousSibling()) != null &&
-               n.getNodeType() != Node.ELEMENT_NODE);
-
+               n.getNodeType() != Node.ELEMENT_NODE) {
+            //empty
+        }
         if (n == null) 
             return false;
 

Modified: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/CustomEvent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/CustomEvent.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/CustomEvent.java (original)
+++ xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/CustomEvent.java Mon Sep 11 12:43:22 2017
@@ -30,7 +30,7 @@ public interface CustomEvent extends Eve
     /**
      *  Specifies some detail information about the <code>Event</code>. 
      */
-    public Object getDetail();
+    Object getDetail();
 
     /**
      *  The <code>initCustomEventNS</code> method is used to initialize the 
@@ -47,10 +47,10 @@ public interface CustomEvent extends Eve
      * @param detailArg  Specifies <code>CustomEvent.detail</code>. This 
      *   value may be <code>null</code>.   
      */
-    public void initCustomEventNS(String namespaceURI, 
-                                  String typeArg, 
-                                  boolean canBubbleArg, 
-                                  boolean cancelableArg, 
-                                  Object detailArg);
+    void initCustomEventNS(String namespaceURI,
+                           String typeArg,
+                           boolean canBubbleArg,
+                           boolean cancelableArg,
+                           Object detailArg);
 
 }

Modified: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/DocumentEvent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/DocumentEvent.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/DocumentEvent.java (original)
+++ xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/DocumentEvent.java Mon Sep 11 12:43:22 2017
@@ -57,7 +57,7 @@ public interface DocumentEvent {
      *    NOT_SUPPORTED_ERR: Raised if the implementation does not support the 
      *   <code>Event</code> interface requested. 
      */
-    public Event createEvent(String eventType)
+    Event createEvent(String eventType)
                              throws DOMException;
 
     /**
@@ -69,7 +69,7 @@ public interface DocumentEvent {
      *   dispatch this event type, <code>false</code> otherwise. 
      * @since DOM Level 3
      */
-    public boolean canDispatch(String namespaceURI, 
-                               String type);
+    boolean canDispatch(String namespaceURI,
+                        String type);
 
 }

Modified: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/Event.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/Event.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/Event.java (original)
+++ xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/Event.java Mon Sep 11 12:43:22 2017
@@ -33,28 +33,28 @@ public interface Event {
     /**
      *  The current event phase is the capture phase. 
      */
-    public static final short CAPTURING_PHASE           = 1;
+    short CAPTURING_PHASE           = 1;
     /**
      *  The current event is in the target phase, i.e. it is being evaluated 
      * at the event target. 
      */
-    public static final short AT_TARGET                 = 2;
+    short AT_TARGET                 = 2;
     /**
      *  The current event phase is the bubbling phase. 
      */
-    public static final short BUBBLING_PHASE            = 3;
+    short BUBBLING_PHASE            = 3;
 
     /**
      *  The local name of the event type. The name must be an <a href='http://www.w3.org/TR/2004/REC-xml-names11-20040204/#NT-NCName'>NCName</a> as defined in [<a href='http://www.w3.org/TR/2004/REC-xml-names11-20040204/'>XML Namespaces 1.1</a>]
      *  and is case-sensitive. 
      */
-    public String getType();
+    String getType();
 
     /**
      *  Used to indicate the event target. This attribute contains the target 
      * node when used with the . 
      */
-    public EventTarget getTarget();
+    EventTarget getTarget();
 
     /**
      *  Used to indicate the <code>EventTarget</code> whose 
@@ -63,20 +63,20 @@ public interface Event {
      * attribute could contain the target node or a target ancestor when 
      * used with the . 
      */
-    public EventTarget getCurrentTarget();
+    EventTarget getCurrentTarget();
 
     /**
      *  Used to indicate which phase of event flow is currently being 
      * accomplished. 
      */
-    public short getEventPhase();
+    short getEventPhase();
 
     /**
      *  Used to indicate whether or not an event is a bubbling event. If the 
      * event can bubble the value is <code>true</code>, otherwise the value 
      * is <code>false</code>. 
      */
-    public boolean getBubbles();
+    boolean getBubbles();
 
     /**
      *  Used to indicate whether or not an event can have its default action 
@@ -84,7 +84,7 @@ public interface Event {
      * value is <code>true</code>, otherwise the value is <code>false</code>
      * . 
      */
-    public boolean getCancelable();
+    boolean getCancelable();
 
     /**
      *  Used to specify the time at which the event was created in 
@@ -93,7 +93,7 @@ public interface Event {
      * <code>timeStamp</code> may be not available for all events. When not 
      * available, the value is <code>0</code>. 
      */
-    public long getTimeStamp();
+    long getTimeStamp();
 
     /**
      *  This method is used to prevent event listeners of the same group to be 
@@ -105,7 +105,7 @@ public interface Event {
      * being invoked; use <code>Event.preventDefault()</code> for that 
      * effect.   
      */
-    public void stopPropagation();
+    void stopPropagation();
 
     /**
      *  If an event is cancelable, the <code>preventDefault</code> method is 
@@ -117,7 +117,7 @@ public interface Event {
      * <code>Event.stopPropagation()</code> or 
      * <code>Event.stopImmediatePropagation()</code> for that effect.   
      */
-    public void preventDefault();
+    void preventDefault();
 
     /**
      *  The <code>initEvent</code> method is used to initialize the value of 
@@ -143,9 +143,9 @@ public interface Event {
      *   parameter overrides the intrinsic cancelable behavior of the event. 
      *     
      */
-    public void initEvent(String eventTypeArg, 
-                          boolean canBubbleArg, 
-                          boolean cancelableArg);
+    void initEvent(String eventTypeArg,
+                   boolean canBubbleArg,
+                   boolean cancelableArg);
 
     /**
      *  The namespace URI associated with this event at creation time, or 
@@ -154,7 +154,7 @@ public interface Event {
      * <code>Event.initEvent()</code>, this is always <code>null</code>. 
      * @since DOM Level 3
      */
-    public String getNamespaceURI();
+    String getNamespaceURI();
 
     /**
      *  This method is used to prevent event listeners of the same group to be 
@@ -166,14 +166,14 @@ public interface Event {
      * effect.   
      * @since DOM Level 3
      */
-    public void stopImmediatePropagation();
+    void stopImmediatePropagation();
 
     /**
      *  Used to indicate whether <code>Event.preventDefault()</code> has been 
      * called for this event. 
      * @since DOM Level 3
      */
-    public boolean getDefaultPrevented();
+    boolean getDefaultPrevented();
 
     /**
      *  The <code>initEventNS</code> method is used to initialize the value of 
@@ -190,9 +190,9 @@ public interface Event {
      *   method for a description of this parameter.   
      * @since DOM Level 3
      */
-    public void initEventNS(String namespaceURIArg, 
-                            String eventTypeArg, 
-                            boolean canBubbleArg, 
-                            boolean cancelableArg);
+    void initEventNS(String namespaceURIArg,
+                     String eventTypeArg,
+                     boolean canBubbleArg,
+                     boolean cancelableArg);
 
 }

Modified: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/EventListener.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/EventListener.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/EventListener.java (original)
+++ xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/EventListener.java Mon Sep 11 12:43:22 2017
@@ -37,6 +37,6 @@ public interface EventListener {
      * @param evt  The <code>Event</code> contains contextual information 
      *   about the event.   
      */
-    public void handleEvent(Event evt);
+    void handleEvent(Event evt);
 
 }

Modified: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/EventTarget.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/EventTarget.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/EventTarget.java (original)
+++ xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/EventTarget.java Mon Sep 11 12:43:22 2017
@@ -60,9 +60,9 @@ public interface EventTarget {
      *   and bubbling phases. If <code>false</code>, the event listener will 
      *   only be triggered during the target and bubbling phases.   
      */
-    public void addEventListener(String type, 
-                                 EventListener listener, 
-                                 boolean useCapture);
+    void addEventListener(String type,
+                          EventListener listener,
+                          boolean useCapture);
 
     /**
      *  This method allows the removal of event listeners from the default 
@@ -85,9 +85,9 @@ public interface EventTarget {
      *   phase does not affect the same event listener registered for the 
      *   target and bubbling phases, and vice versa.   
      */
-    public void removeEventListener(String type, 
-                                    EventListener listener, 
-                                    boolean useCapture);
+    void removeEventListener(String type,
+                             EventListener listener,
+                             boolean useCapture);
 
     /**
      *  This method allows the dispatch of events into the implementation's 
@@ -115,7 +115,7 @@ public interface EventTarget {
      *   . 
      * @version DOM Level 3
      */
-    public boolean dispatchEvent(Event evt)
+    boolean dispatchEvent(Event evt)
                                  throws EventException, DOMException;
 
     /**
@@ -139,11 +139,11 @@ public interface EventTarget {
      *   group. 
      * @since DOM Level 3
      */
-    public void addEventListenerNS(String namespaceURI, 
-                                   String type, 
-                                   EventListener listener, 
-                                   boolean useCapture, 
-                                   Object evtGroup);
+    void addEventListenerNS(String namespaceURI,
+                            String type,
+                            EventListener listener,
+                            boolean useCapture,
+                            Object evtGroup);
 
     /**
      *  This method allows the removal of an event listener, independently of 
@@ -165,9 +165,9 @@ public interface EventTarget {
      *   description of this parameter.   
      * @since DOM Level 3
      */
-    public void removeEventListenerNS(String namespaceURI, 
-                                      String type, 
-                                      EventListener listener, 
-                                      boolean useCapture);
+    void removeEventListenerNS(String namespaceURI,
+                               String type,
+                               EventListener listener,
+                               boolean useCapture);
 
 }

Modified: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/KeyboardEvent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/KeyboardEvent.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/KeyboardEvent.java (original)
+++ xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/KeyboardEvent.java Mon Sep 11 12:43:22 2017
@@ -41,25 +41,25 @@ public interface KeyboardEvent extends U
      * originate with a virtual key corresponding to the numeric keypad). 
      * Example: the 'Q' key on a PC 101 Key US keyboard. 
      */
-    public static final int DOM_KEY_LOCATION_STANDARD = 0x00;
+    int DOM_KEY_LOCATION_STANDARD = 0x00;
     /**
      *  The key activated is in the left key location (there is more than one 
      * possible location for this key). Example: the left Shift key on a PC 
      * 101 Key US keyboard. 
      */
-    public static final int DOM_KEY_LOCATION_LEFT     = 0x01;
+    int DOM_KEY_LOCATION_LEFT     = 0x01;
     /**
      *  The key activation is in the right key location (there is more than 
      * one possible location for this key). Example: the right Shift key on 
      * a PC 101 Key US keyboard. 
      */
-    public static final int DOM_KEY_LOCATION_RIGHT    = 0x02;
+    int DOM_KEY_LOCATION_RIGHT    = 0x02;
     /**
      *  The key activation originated on the numeric keypad or with a virtual 
      * key corresponding to the numeric keypad. Example: the '1' key on a PC 
      * 101 Key US keyboard located on the numeric pad. 
      */
-    public static final int DOM_KEY_LOCATION_NUMPAD   = 0x03;
+    int DOM_KEY_LOCATION_NUMPAD   = 0x03;
 
     /**
      *  <code>keyIdentifier</code> holds the identifier of the key. The key 
@@ -67,37 +67,37 @@ public interface KeyboardEvent extends U
      * unable to identify a key must use the key identifier 
      * <code>"Unidentified"</code>. 
      */
-    public String getKeyIdentifier();
+    String getKeyIdentifier();
 
     /**
      *  The <code>keyLocation</code> attribute contains an indication of the 
      * location of they key on the device, as described in . 
      */
-    public int getKeyLocation();
+    int getKeyLocation();
 
     /**
      *  <code>true</code> if the control (Ctrl) key modifier is activated. 
      */
-    public boolean getCtrlKey();
+    boolean getCtrlKey();
 
     /**
      *  <code>true</code> if the shift (Shift) key modifier is activated. 
      */
-    public boolean getShiftKey();
+    boolean getShiftKey();
 
     /**
      *  <code>true</code> if the alternative (Alt) key modifier is activated. 
      * <p ><b>Note:</b>  The Option key modifier on Macintosh systems must be 
      * represented using this key modifier. 
      */
-    public boolean getAltKey();
+    boolean getAltKey();
 
     /**
      *  <code>true</code> if the meta (Meta) key modifier is activated. 
      * <p ><b>Note:</b>  The Command key modifier on Macintosh systems must be 
      * represented using this key modifier. 
      */
-    public boolean getMetaKey();
+    boolean getMetaKey();
 
     /**
      *  This methods queries the state of a modifier using a key identifier. 
@@ -113,7 +113,7 @@ public interface KeyboardEvent extends U
      * @return  <code>true</code> if it is modifier key and the modifier is 
      *   activated, <code>false</code> otherwise. 
      */
-    public boolean getModifierState(String keyIdentifierArg);
+    boolean getModifierState(String keyIdentifierArg);
 
     /**
      *  The <code>initKeyboardEvent</code> method is used to initialize the 
@@ -135,13 +135,13 @@ public interface KeyboardEvent extends U
      * @param modifiersList  A <a href='http://www.w3.org/TR/2004/REC-xml-20040204/#NT-S'>white space</a> separated list of modifier key identifiers to be activated on this 
      *   object. 
      */
-    public void initKeyboardEvent(String typeArg, 
-                                  boolean canBubbleArg, 
-                                  boolean cancelableArg, 
-                                  AbstractView viewArg, 
-                                  String keyIdentifierArg, 
-                                  int keyLocationArg, 
-                                  String modifiersList);
+    void initKeyboardEvent(String typeArg,
+                           boolean canBubbleArg,
+                           boolean cancelableArg,
+                           AbstractView viewArg,
+                           String keyIdentifierArg,
+                           int keyLocationArg,
+                           String modifiersList);
 
     /**
      *  The <code>initKeyboardEventNS</code> method is used to initialize the 
@@ -168,13 +168,13 @@ public interface KeyboardEvent extends U
      *   object. As an example, <code>"Control Alt"</code> will activated 
      *   the control and alt modifiers. 
      */
-    public void initKeyboardEventNS(String namespaceURI, 
-                                    String typeArg, 
-                                    boolean canBubbleArg, 
-                                    boolean cancelableArg, 
-                                    AbstractView viewArg, 
-                                    String keyIdentifierArg, 
-                                    int keyLocationArg, 
-                                    String modifiersList);
+    void initKeyboardEventNS(String namespaceURI,
+                             String typeArg,
+                             boolean canBubbleArg,
+                             boolean cancelableArg,
+                             AbstractView viewArg,
+                             String keyIdentifierArg,
+                             int keyLocationArg,
+                             String modifiersList);
 
 }

Modified: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MouseEvent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MouseEvent.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MouseEvent.java (original)
+++ xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MouseEvent.java Mon Sep 11 12:43:22 2017
@@ -38,49 +38,49 @@ public interface MouseEvent extends UIEv
      *  The horizontal coordinate at which the event occurred relative to the 
      * origin of the screen coordinate system. 
      */
-    public int getScreenX();
+    int getScreenX();
 
     /**
      *  The vertical coordinate at which the event occurred relative to the 
      * origin of the screen coordinate system. 
      */
-    public int getScreenY();
+    int getScreenY();
 
     /**
      *  The horizontal coordinate at which the event occurred relative to the 
      * DOM implementation's client area. 
      */
-    public int getClientX();
+    int getClientX();
 
     /**
      *  The vertical coordinate at which the event occurred relative to the 
      * DOM implementation's client area. 
      */
-    public int getClientY();
+    int getClientY();
 
     /**
      *  <code>true</code> if the control (Ctrl) key modifier is activated. 
      */
-    public boolean getCtrlKey();
+    boolean getCtrlKey();
 
     /**
      *  <code>true</code> if the shift (Shift) key modifier is activated. 
      */
-    public boolean getShiftKey();
+    boolean getShiftKey();
 
     /**
      *  <code>true</code> if the alt (alternative) key modifier is activated. 
      * <p ><b>Note:</b>  The Option key modifier on Macintosh systems must be 
      * represented using this key modifier. 
      */
-    public boolean getAltKey();
+    boolean getAltKey();
 
     /**
      *  <code>true</code> if the meta (Meta) key modifier is activated. 
      * <p ><b>Note:</b>  The Command key modifier on Macintosh system must be 
      * represented using this meta key. 
      */
-    public boolean getMetaKey();
+    boolean getMetaKey();
 
     /**
      *  During mouse events caused by the depression or release of a mouse 
@@ -95,13 +95,13 @@ public interface MouseEvent extends UIEv
      * buttons, and values higher than <code>2</code> can be used to 
      * represent such buttons. 
      */
-    public short getButton();
+    short getButton();
 
     /**
      *  Used to identify a secondary <code>EventTarget</code> related to a UI 
      * event, depending on the type of event. 
      */
-    public EventTarget getRelatedTarget();
+    EventTarget getRelatedTarget();
 
     /**
      *  The <code>initMouseEvent</code> method is used to initialize the value 
@@ -130,21 +130,21 @@ public interface MouseEvent extends UIEv
      *   <code>MouseEvent.relatedTarget</code>. This value may be 
      *   <code>null</code>.   
      */
-    public void initMouseEvent(String typeArg, 
-                               boolean canBubbleArg, 
-                               boolean cancelableArg, 
-                               AbstractView viewArg, 
-                               int detailArg, 
-                               int screenXArg, 
-                               int screenYArg, 
-                               int clientXArg, 
-                               int clientYArg, 
-                               boolean ctrlKeyArg, 
-                               boolean altKeyArg, 
-                               boolean shiftKeyArg, 
-                               boolean metaKeyArg, 
-                               short buttonArg, 
-                               EventTarget relatedTargetArg);
+    void initMouseEvent(String typeArg,
+                        boolean canBubbleArg,
+                        boolean cancelableArg,
+                        AbstractView viewArg,
+                        int detailArg,
+                        int screenXArg,
+                        int screenYArg,
+                        int clientXArg,
+                        int clientYArg,
+                        boolean ctrlKeyArg,
+                        boolean altKeyArg,
+                        boolean shiftKeyArg,
+                        boolean metaKeyArg,
+                        short buttonArg,
+                        EventTarget relatedTargetArg);
 
     /**
      *  This methods queries the state of a modifier using a key identifier. 
@@ -162,7 +162,7 @@ public interface MouseEvent extends UIEv
      *   activated, <code>false</code> otherwise. 
      * @since DOM Level 3
      */
-    public boolean getModifierState(String keyIdentifierArg);
+    boolean getModifierState(String keyIdentifierArg);
 
     /**
      *  The <code>initMouseEventNS</code> method is used to initialize the 
@@ -202,18 +202,18 @@ public interface MouseEvent extends UIEv
      *   the control and alt modifiers.   
      * @since DOM Level 3
      */
-    public void initMouseEventNS(String namespaceURI, 
-                                 String typeArg, 
-                                 boolean canBubbleArg, 
-                                 boolean cancelableArg, 
-                                 AbstractView viewArg, 
-                                 int detailArg, 
-                                 int screenXArg, 
-                                 int screenYArg, 
-                                 int clientXArg, 
-                                 int clientYArg, 
-                                 short buttonArg, 
-                                 EventTarget relatedTargetArg, 
-                                 String modifiersList);
+    void initMouseEventNS(String namespaceURI,
+                          String typeArg,
+                          boolean canBubbleArg,
+                          boolean cancelableArg,
+                          AbstractView viewArg,
+                          int detailArg,
+                          int screenXArg,
+                          int screenYArg,
+                          int clientXArg,
+                          int clientYArg,
+                          short buttonArg,
+                          EventTarget relatedTargetArg,
+                          String modifiersList);
 
 }

Modified: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MutationEvent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MutationEvent.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MutationEvent.java (original)
+++ xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MutationEvent.java Mon Sep 11 12:43:22 2017
@@ -29,15 +29,15 @@ public interface MutationEvent extends E
     /**
      *  The <code>Attr</code> was modified in place. 
      */
-    public static final short MODIFICATION              = 1;
+    short MODIFICATION              = 1;
     /**
      *  The <code>Attr</code> was just added. 
      */
-    public static final short ADDITION                  = 2;
+    short ADDITION                  = 2;
     /**
      *  The <code>Attr</code> was just removed. 
      */
-    public static final short REMOVAL                   = 3;
+    short REMOVAL                   = 3;
 
     /**
      *  <code>relatedNode</code> is used to identify a secondary node related 
@@ -49,34 +49,34 @@ public interface MutationEvent extends E
      * the DOMAttrModified event it indicates the <code>Attr</code> node 
      * which was modified, added, or removed. 
      */
-    public Node getRelatedNode();
+    Node getRelatedNode();
 
     /**
      *  <code>prevValue</code> indicates the previous value of the 
      * <code>Attr</code> node in DOMAttrModified events, and of the 
      * <code>CharacterData</code> node in DOMCharacterDataModified events. 
      */
-    public String getPrevValue();
+    String getPrevValue();
 
     /**
      *  <code>newValue</code> indicates the new value of the <code>Attr</code> 
      * node in DOMAttrModified events, and of the <code>CharacterData</code> 
      * node in DOMCharacterDataModified events. 
      */
-    public String getNewValue();
+    String getNewValue();
 
     /**
      *  <code>attrName</code> indicates the name of the changed 
      * <code>Attr</code> node in a DOMAttrModified event. 
      */
-    public String getAttrName();
+    String getAttrName();
 
     /**
      *  <code>attrChange</code> indicates the type of change which triggered 
      * the DOMAttrModified event. The values can be <code>MODIFICATION</code>
      * , <code>ADDITION</code>, or <code>REMOVAL</code>. 
      */
-    public short getAttrChange();
+    short getAttrChange();
 
     /**
      *  The <code>initMutationEvent</code> method is used to initialize the 
@@ -99,14 +99,14 @@ public interface MutationEvent extends E
      * @param attrChangeArg  Specifies <code>MutationEvent.attrChange</code>. 
      *   This value may be null.   
      */
-    public void initMutationEvent(String typeArg, 
-                                  boolean canBubbleArg, 
-                                  boolean cancelableArg, 
-                                  Node relatedNodeArg, 
-                                  String prevValueArg, 
-                                  String newValueArg, 
-                                  String attrNameArg, 
-                                  short attrChangeArg);
+    void initMutationEvent(String typeArg,
+                           boolean canBubbleArg,
+                           boolean cancelableArg,
+                           Node relatedNodeArg,
+                           String prevValueArg,
+                           String newValueArg,
+                           String attrNameArg,
+                           short attrChangeArg);
 
     /**
      *  The <code>initMutationEventNS</code> method is used to initialize the 
@@ -137,14 +137,14 @@ public interface MutationEvent extends E
      *   description of this parameter.   
      * @since DOM Level 3
      */
-    public void initMutationEventNS(String namespaceURI, 
-                                    String typeArg, 
-                                    boolean canBubbleArg, 
-                                    boolean cancelableArg, 
-                                    Node relatedNodeArg, 
-                                    String prevValueArg, 
-                                    String newValueArg, 
-                                    String attrNameArg, 
-                                    short attrChangeArg);
+    void initMutationEventNS(String namespaceURI,
+                             String typeArg,
+                             boolean canBubbleArg,
+                             boolean cancelableArg,
+                             Node relatedNodeArg,
+                             String prevValueArg,
+                             String newValueArg,
+                             String attrNameArg,
+                             short attrChangeArg);
 
 }

Modified: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MutationNameEvent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MutationNameEvent.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MutationNameEvent.java (original)
+++ xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/MutationNameEvent.java Mon Sep 11 12:43:22 2017
@@ -30,13 +30,13 @@ public interface MutationNameEvent exten
      *  The previous value of the <code>relatedNode</code>'s 
      * <code>namespaceURI</code>. 
      */
-    public String getPrevNamespaceURI();
+    String getPrevNamespaceURI();
 
     /**
      *  The previous value of the <code>relatedNode</code>'s 
      * <code>nodeName</code>. 
      */
-    public String getPrevNodeName();
+    String getPrevNodeName();
 
     /**
      *  The <code>initMutationNameEvent</code> method is used to initialize 
@@ -61,12 +61,12 @@ public interface MutationNameEvent exten
      *   <code>MutationNameEvent.prevNodeName</code>.   
      * @since DOM Level 3
      */
-    public void initMutationNameEvent(String typeArg, 
-                                      boolean canBubbleArg, 
-                                      boolean cancelableArg, 
-                                      Node relatedNodeArg, 
-                                      String prevNamespaceURIArg, 
-                                      String prevNodeNameArg);
+    void initMutationNameEvent(String typeArg,
+                               boolean canBubbleArg,
+                               boolean cancelableArg,
+                               Node relatedNodeArg,
+                               String prevNamespaceURIArg,
+                               String prevNodeNameArg);
 
     /**
      *  The <code>initMutationNameEventNS</code> method is used to initialize 
@@ -95,12 +95,12 @@ public interface MutationNameEvent exten
      *   description of this parameter.   
      * @since DOM Level 3
      */
-    public void initMutationNameEventNS(String namespaceURI, 
-                                        String typeArg, 
-                                        boolean canBubbleArg, 
-                                        boolean cancelableArg, 
-                                        Node relatedNodeArg, 
-                                        String prevNamespaceURIArg, 
-                                        String prevNodeNameArg);
+    void initMutationNameEventNS(String namespaceURI,
+                                 String typeArg,
+                                 boolean canBubbleArg,
+                                 boolean cancelableArg,
+                                 Node relatedNodeArg,
+                                 String prevNamespaceURIArg,
+                                 String prevNodeNameArg);
 
 }

Modified: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/TextEvent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/TextEvent.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/TextEvent.java (original)
+++ xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/TextEvent.java Mon Sep 11 12:43:22 2017
@@ -32,7 +32,7 @@ public interface TextEvent extends UIEve
      * normalization form NFC, defined in [<a href='http://www.unicode.org/reports/tr15/'>UAX #15</a>]. This attribute 
      * cannot be null or contain the empty string. 
      */
-    public String getData();
+    String getData();
 
     /**
      *  The <code>initTextEvent</code> method is used to initialize the value 
@@ -49,11 +49,11 @@ public interface TextEvent extends UIEve
      *   for a description of this parameter. 
      * @param dataArg  Specifies <code>TextEvent.data</code>. 
      */
-    public void initTextEvent(String typeArg, 
-                              boolean canBubbleArg, 
-                              boolean cancelableArg, 
-                              AbstractView viewArg, 
-                              String dataArg);
+    void initTextEvent(String typeArg,
+                       boolean canBubbleArg,
+                       boolean cancelableArg,
+                       AbstractView viewArg,
+                       String dataArg);
 
     /**
      *  The <code>initTextEventNS</code> method is used to initialize the 
@@ -73,11 +73,11 @@ public interface TextEvent extends UIEve
      * @param dataArg  Refer to the <code>TextEvent.initTextEvent()</code> 
      *   method for a description of this parameter. 
      */
-    public void initTextEventNS(String namespaceURI, 
-                                String type, 
-                                boolean canBubbleArg, 
-                                boolean cancelableArg, 
-                                AbstractView viewArg, 
-                                String dataArg);
+    void initTextEventNS(String namespaceURI,
+                         String type,
+                         boolean canBubbleArg,
+                         boolean cancelableArg,
+                         AbstractView viewArg,
+                         String dataArg);
 
 }

Modified: xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/UIEvent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/UIEvent.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/UIEvent.java (original)
+++ xmlgraphics/batik/trunk/batik-ext/src/main/java/org/w3c/dom/events/UIEvent.java Mon Sep 11 12:43:22 2017
@@ -29,13 +29,13 @@ public interface UIEvent extends Event {
      *  The <code>view</code> attribute identifies the 
      * <code>AbstractView</code> from which the event was generated. 
      */
-    public AbstractView getView();
+    AbstractView getView();
 
     /**
      *  Specifies some detail information about the <code>Event</code>, 
      * depending on the type of event. 
      */
-    public int getDetail();
+    int getDetail();
 
     /**
      *  The <code>initUIEvent</code> method is used to initialize the value of 
@@ -51,11 +51,11 @@ public interface UIEvent extends Event {
      *   <code>null</code>. 
      * @param detailArg  Specifies <code>UIEvent.detail</code>.   
      */
-    public void initUIEvent(String typeArg, 
-                            boolean canBubbleArg, 
-                            boolean cancelableArg, 
-                            AbstractView viewArg, 
-                            int detailArg);
+    void initUIEvent(String typeArg,
+                     boolean canBubbleArg,
+                     boolean cancelableArg,
+                     AbstractView viewArg,
+                     int detailArg);
 
     /**
      *  The <code>initUIEventNS</code> method is used to initialize the value 
@@ -75,11 +75,11 @@ public interface UIEvent extends Event {
      *   method for a description of this parameter.   
      * @since DOM Level 3
      */
-    public void initUIEventNS(String namespaceURI, 
-                              String typeArg, 
-                              boolean canBubbleArg, 
-                              boolean cancelableArg, 
-                              AbstractView viewArg, 
-                              int detailArg);
+    void initUIEventNS(String namespaceURI,
+                       String typeArg,
+                       boolean canBubbleArg,
+                       boolean cancelableArg,
+                       AbstractView viewArg,
+                       int detailArg);
 
 }

Modified: xmlgraphics/batik/trunk/batik-gui-util/src/main/java/org/apache/batik/util/gui/DropDownComponent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-gui-util/src/main/java/org/apache/batik/util/gui/DropDownComponent.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-gui-util/src/main/java/org/apache/batik/util/gui/DropDownComponent.java (original)
+++ xmlgraphics/batik/trunk/batik-gui-util/src/main/java/org/apache/batik/util/gui/DropDownComponent.java Mon Sep 11 12:43:22 2017
@@ -246,7 +246,7 @@ public class DropDownComponent extends J
     /**
      * The scrollable pop up menu item.
      */
-    public static interface ScrollablePopupMenuItem {
+    public interface ScrollablePopupMenuItem {
 
         /**
          * Selects and deselects the item.
@@ -401,7 +401,7 @@ public class DropDownComponent extends J
     /**
      * The scrollable popup menu model.
      */
-    public static interface ScrollablePopupMenuModel {
+    public interface ScrollablePopupMenuModel {
 
         /**
          * Gets the footer text for the ScrollablePopupMenu's footer item.
@@ -842,7 +842,7 @@ public class DropDownComponent extends J
      * The ScrollablePopupMenu listener. Handles the events that
      * ScrollablePopupMenu fires
      */
-    public static interface ScrollablePopupMenuListener extends EventListener {
+    public interface ScrollablePopupMenuListener extends EventListener {
 
         /**
          * Handles the 'itemsWereAdded' event.

Modified: xmlgraphics/batik/trunk/batik-gvt/src/main/java/org/apache/batik/gvt/CompositeGraphicsNode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-gvt/src/main/java/org/apache/batik/gvt/CompositeGraphicsNode.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-gvt/src/main/java/org/apache/batik/gvt/CompositeGraphicsNode.java (original)
+++ xmlgraphics/batik/trunk/batik-gvt/src/main/java/org/apache/batik/gvt/CompositeGraphicsNode.java Mon Sep 11 12:43:22 2017
@@ -792,7 +792,9 @@ public class CompositeGraphicsNode exten
         }
         // Remove the node
         int index = 0;
-        for (; node != children[index]; index++);     // fires exception when node not found!
+        for (; node != children[index]; index++) {
+            // fires exception when node not found!
+        }
         remove(index);
         return true;
     }

Modified: xmlgraphics/batik/trunk/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/ImageRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/ImageRenderer.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/ImageRenderer.java (original)
+++ xmlgraphics/batik/trunk/batik-gvt/src/main/java/org/apache/batik/gvt/renderer/ImageRenderer.java Mon Sep 11 12:43:22 2017
@@ -55,7 +55,7 @@ public interface ImageRenderer extends R
      * Returns the transform from the current user space (as defined
      * by the top node of the GVT tree) to the device space.
      */
-    public AffineTransform getTransform();
+    AffineTransform getTransform();
 
     /**
      * Sets the specified rendering hints to be used for future renderings.

Modified: xmlgraphics/batik/trunk/batik-script/src/main/java/org/apache/batik/script/ImportInfo.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-script/src/main/java/org/apache/batik/script/ImportInfo.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-script/src/main/java/org/apache/batik/script/ImportInfo.java (original)
+++ xmlgraphics/batik/trunk/batik-script/src/main/java/org/apache/batik/script/ImportInfo.java Mon Sep 11 12:43:22 2017
@@ -240,4 +240,4 @@ public class ImportInfo {
             }
         }
     }
-};
+}

Modified: xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMDocumentTree.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMDocumentTree.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMDocumentTree.java (original)
+++ xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMDocumentTree.java Mon Sep 11 12:43:22 2017
@@ -829,7 +829,7 @@ public class DOMDocumentTree extends JTr
     /**
      * The DOMDocumentTreeListener.
      */
-    public static interface DOMDocumentTreeListener extends EventListener {
+    public interface DOMDocumentTreeListener extends EventListener {
 
         /**
          * Fired after successfully completed drop.

Modified: xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMViewer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMViewer.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMViewer.java (original)
+++ xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/DOMViewer.java Mon Sep 11 12:43:22 2017
@@ -648,7 +648,7 @@ public class DOMViewer extends JFrame im
                     domViewerController.performUpdate(new Runnable() {
                         public void run() {
                             selectNode(elem);
-                        };
+                        }
                     });
                 }
             });

Modified: xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/HistoryBrowser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/HistoryBrowser.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/HistoryBrowser.java (original)
+++ xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/HistoryBrowser.java Mon Sep 11 12:43:22 2017
@@ -293,7 +293,7 @@ public class HistoryBrowser {
     /**
      * The HistoryBrowserListener.
      */
-    public static interface HistoryBrowserListener extends EventListener {
+    public interface HistoryBrowserListener extends EventListener {
 
         /**
          * The command has been executed.
@@ -535,7 +535,7 @@ public class HistoryBrowser {
     /**
      * Wrapps the command's execute, undo and redo methods.
      */
-    public static interface CommandController {
+    public interface CommandController {
 
         /**
          * Wrapps the execute method.

Modified: xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodePickerPanel.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodePickerPanel.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodePickerPanel.java (original)
+++ xmlgraphics/batik/trunk/batik-svgbrowser/src/main/java/org/apache/batik/apps/svgbrowser/NodePickerPanel.java Mon Sep 11 12:43:22 2017
@@ -1312,7 +1312,7 @@ public class NodePickerPanel extends JPa
     /**
      * Node picker listener.
      */
-    public static interface NodePickerListener extends EventListener {
+    public interface NodePickerListener extends EventListener {
         /**
          * Updates the element from the data contained in the NodePickerEvent.
          */

Modified: xmlgraphics/batik/trunk/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/Main.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/Main.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/Main.java (original)
+++ xmlgraphics/batik/trunk/batik-svgrasterizer/src/main/java/org/apache/batik/apps/rasterizer/Main.java Mon Sep 11 12:43:22 2017
@@ -54,7 +54,7 @@ public class Main implements SVGConverte
     /**
      * Interface for handling one command line option
      */
-    public static interface OptionHandler {
+    public interface OptionHandler {
         /**
          * The <code>OptionHandler</code> should configure the <code>SVGConverter</code>
          * according to the value of the option.

Modified: xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/xml/XMLTestReportProcessor.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/xml/XMLTestReportProcessor.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/xml/XMLTestReportProcessor.java (original)
+++ xmlgraphics/batik/trunk/batik-test/src/main/java/org/apache/batik/test/xml/XMLTestReportProcessor.java Mon Sep 11 12:43:22 2017
@@ -72,7 +72,7 @@ public class XMLTestReportProcessor
      * An <code>XMLReportConsumer</code> is notified every time a
      * new report is generated by an <code>XMLTestReportProcessor</code>
      */
-    public static interface XMLReportConsumer {
+    public interface XMLReportConsumer {
         /**
          * Invoked when new report has been generated.
          * @param xmlReport file containing the xml report

Modified: xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/CleanerThread.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/CleanerThread.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/CleanerThread.java (original)
+++ xmlgraphics/batik/trunk/batik-util/src/main/java/org/apache/batik/util/CleanerThread.java Mon Sep 11 12:43:22 2017
@@ -53,7 +53,7 @@ public class CleanerThread extends Threa
      * this class implement this interface then the 'cleared' method
      * will be called when the reference is queued.
      */
-    public static interface ReferenceCleared {
+    public interface ReferenceCleared {
         /* Called when the reference is cleared */
         void cleared();
     }

Modified: xmlgraphics/batik/trunk/batik-xml/src/main/java/org/apache/batik/xml/XMLUtilities.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/batik-xml/src/main/java/org/apache/batik/xml/XMLUtilities.java?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/batik-xml/src/main/java/org/apache/batik/xml/XMLUtilities.java (original)
+++ xmlgraphics/batik/trunk/batik-xml/src/main/java/org/apache/batik/xml/XMLUtilities.java Mon Sep 11 12:43:22 2017
@@ -275,7 +275,9 @@ public class XMLUtilities extends XMLCha
             return e;
         }
 
-        while (isXMLSpace((char)(c = r.read())));
+        while (isXMLSpace((char)(c = r.read()))) {
+            //skip
+        }
 
         if (c != 'v') {
             return e;
@@ -308,7 +310,9 @@ public class XMLUtilities extends XMLCha
             return e;
         }
 
-        while (isXMLSpace((char)(c = r.read())));
+        while (isXMLSpace((char)(c = r.read()))) {
+            //skip
+        }
 
         if (c != '"' && c != '\'') {
             return e;
@@ -328,7 +332,9 @@ public class XMLUtilities extends XMLCha
         if (!isXMLSpace((char)(c = r.read()))) {
             return e;
         }
-        while (isXMLSpace((char)(c = r.read())));
+        while (isXMLSpace((char)(c = r.read()))) {
+            //skip
+        }
 
         if (c != 'e') {
             return e;
@@ -364,7 +370,9 @@ public class XMLUtilities extends XMLCha
             return e;
         }
 
-        while (isXMLSpace((char)(c = r.read())));
+        while (isXMLSpace((char)(c = r.read()))) {
+            //skip
+        }
 
         if (c != '"' && c != '\'') {
             return e;

Modified: xmlgraphics/batik/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/checkstyle.xml?rev=1808023&r1=1808022&r2=1808023&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/checkstyle.xml (original)
+++ xmlgraphics/batik/trunk/checkstyle.xml Mon Sep 11 12:43:22 2017
@@ -63,21 +63,21 @@
     <module name="EmptyBlock">
       <property name="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_TRY,LITERAL_WHILE,STATIC_INIT"/>
       <property name="option" value="text"/>
-    </module>
+    </module>-->
 
     <module name="EmptyStatement"/>
 
-    <module name="EqualsHashCode"/>
+<!--     <module name="EqualsHashCode"/>
 
-    <module name="ExplicitInitialization"/>
+    <module name="ExplicitInitialization"/> -->
 
     <module name="FileContentsHolder"/>
 
-    <module name="FinalClass"/>
+    <!-- <module name="FinalClass"/> -->
 
     <module name="GenericWhitespace"/> 
 
-    <module name="HideUtilityClassConstructor"/>-->
+    <!-- <module name="HideUtilityClassConstructor"/> -->
 
     <module name="IllegalImport"/><!--