[jspwiki] 17/26: code cleanup

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 0f6c61ac03913c588d7659bf016f967372e3fbb0
Author: juanpablo <ju...@apache.org>
AuthorDate: Wed Jan 15 00:11:08 2020 +0100

    code cleanup
---
 .../main/java/org/apache/wiki/parser/MarkupParser.java    | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java
index 96a0b56..f2c6dab 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java
@@ -35,7 +35,6 @@ import java.io.Reader;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -67,7 +66,7 @@ public abstract class MarkupParser
     protected List< Pattern > m_inlineImagePatterns = null;
     protected LinkParsingOperations m_linkParsingOperations;
 
-    private static Logger log = Logger.getLogger( MarkupParser.class );
+    private static final Logger log = Logger.getLogger( MarkupParser.class );
 
     /** If set to "true", allows using raw HTML within Wiki text.  Be warned,
         this is a VERY dangerous option to set - never turn this on in a publicly
@@ -290,12 +289,10 @@ public abstract class MarkupParser
             //
             //  Make them into Regexp Patterns.  Unknown patterns are ignored.
             //
-            for( Iterator< String > i = ptrns.iterator(); i.hasNext(); ) {
-            	String pattern = i.next();
+            for( final String pattern : ptrns ) {
                 try {
-                    compiledpatterns.add( compiler.compile( pattern,
-                                                            GlobCompiler.DEFAULT_MASK | GlobCompiler.READ_ONLY_MASK ) );
-                } catch( MalformedPatternException e ) {
+                    compiledpatterns.add( compiler.compile( pattern, GlobCompiler.DEFAULT_MASK | GlobCompiler.READ_ONLY_MASK ) );
+                } catch( final MalformedPatternException e ) {
                     log.error( "Malformed pattern [" + pattern + "] in properties: ", e );
                 }
             }
@@ -474,9 +471,9 @@ public abstract class MarkupParser
      *  @return A cleaned link.
      *  @since 2.6
      */
-    public static String wikifyLink(String link)
+    public static String wikifyLink( final String link )
     {
-        return MarkupParser.cleanLink(link, MarkupParser.LEGACY_CHARS_ALLOWED);
+        return MarkupParser.cleanLink(link, LEGACY_CHARS_ALLOWED);
     }
 
 }