[jspwiki] 02/03: Minor refactors on BaseModuleManager

[juanpablo]

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 47a3ca995066d5e584f92a2c98fcfef6bd7495c9
Author: Juan Pablo Santos Rodríguez <juanpablo.san...@gmail.com>
AuthorDate: Mon Sep 27 11:09:27 2021 +0200

    Minor refactors on BaseModuleManager
    
    * Use while( iterator.. ) instead of for( ; iterator.hasNext().. )
    * remove private m_loadIncompatibilities variable, always set to false, so 
checkCompatibility method can be simplified
---
 .../java/org/apache/wiki/modules/BaseModuleManager.java  | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git 
a/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java 
b/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java
index 67aa9d5..a35dae8 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java
@@ -28,14 +28,12 @@ import java.util.TreeSet;
 
 
 /**
- *  Superclass for all JSPWiki managers for modules (plugins, etc).
+ *  Superclass for all JSPWiki managers for modules (plugins, etc.).
  */
 public abstract class BaseModuleManager implements ModuleManager {
 
     protected final Engine m_engine;
 
-    private final boolean m_loadIncompatibleModules = false;
-
     /**
      *  Constructs the ModuleManager.
      *
@@ -53,19 +51,15 @@ public abstract class BaseModuleManager implements 
ModuleManager {
      */
     @Override
     public boolean checkCompatibility( final WikiModuleInfo info ) {
-        if( !m_loadIncompatibleModules ) {
-            final String minVersion = info.getMinVersion();
-            final String maxVersion = info.getMaxVersion();
-
-            return Release.isNewerOrEqual( minVersion ) && 
Release.isOlderOrEqual( maxVersion );
-        }
+        final String minVersion = info.getMinVersion();
+        final String maxVersion = info.getMaxVersion();
 
-        return true;
+        return Release.isNewerOrEqual( minVersion ) && Release.isOlderOrEqual( 
maxVersion );
     }
 
     protected < T extends WikiModuleInfo > Collection< WikiModuleInfo > 
modules( final Iterator< T > iterator ) {
         final Set< WikiModuleInfo > ls = new TreeSet<>();
-        for( ; iterator.hasNext(); ) {
+        while( iterator.hasNext() ) {
             final WikiModuleInfo wmi = iterator.next();
             ls.add( wmi );
         }