[jspwiki] 12/17: make ModuleBean use WikiModuleInfo instead of to align with former change on FilterManager and PluginManager

[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 4fbb7680fab316c1ecf24b0eae81607838d72030
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Oct 28 22:41:09 2018 +0100

    make ModuleBean use WikiModuleInfo instead of <T extends WikiModuleInfo> to align with former change on FilterManager and PluginManager
---
 .../main/java/org/apache/wiki/ui/admin/beans/FilterBean.java |  2 +-
 .../main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java | 12 ++++++------
 .../main/java/org/apache/wiki/ui/admin/beans/PluginBean.java |  9 +++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java
index edbfaee..8d952bc 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java
@@ -29,7 +29,7 @@ import org.apache.wiki.util.XhtmlUtil;
 import org.jdom2.Element;
 
 
-public class FilterBean extends ModuleBean< WikiModuleInfo > {
+public class FilterBean extends ModuleBean {
 
     public FilterBean( WikiEngine engine ) throws NotCompliantMBeanException {
         super( engine );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
index 35d0308..af6c14c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java
@@ -32,7 +32,7 @@ import org.apache.wiki.util.XHTML;
 import org.apache.wiki.util.XhtmlUtil;
 import org.jdom2.Element;
 
-public abstract class ModuleBean< T extends WikiModuleInfo > extends SimpleAdminBean {
+public abstract class ModuleBean extends SimpleAdminBean {
 
     protected WikiEngine m_engine;
 
@@ -60,14 +60,14 @@ public abstract class ModuleBean< T extends WikiModuleInfo > extends SimpleAdmin
      * {@inheritDoc}
      */
     public String doGet( WikiContext context ) {
-        Collection< T > filters = modules();
+        Collection< WikiModuleInfo > filters = modules();
         Element root = title();
         Element tb = containerForModuleDetail( root );
 
         Element trHead = heading();
         tb.addContent( trHead );
 
-        for( T info : filters ) {
+        for( WikiModuleInfo info : filters ) {
             Element tr = rowBody( info );
             tb.addContent( tr );
         }
@@ -92,7 +92,7 @@ public abstract class ModuleBean< T extends WikiModuleInfo > extends SimpleAdmin
      *
      * @return a collection of {@link WikiModuleInfo}
      */
-    protected abstract Collection< T > modules();
+    protected abstract Collection< WikiModuleInfo > modules();
 
     /**
      * html blob describing the values of each {@link WikiModuleInfo} inspected.
@@ -107,9 +107,9 @@ public abstract class ModuleBean< T extends WikiModuleInfo > extends SimpleAdmin
      * @param module {@link WikiModuleInfo} inspected.
      * @return {@link Element} describing the {@link Element} inspected.
      */
-    protected abstract Element rowBody( T module );
+    protected abstract Element rowBody( WikiModuleInfo module );
 
-    protected String validModuleVersion( T info ) {
+    protected String validModuleVersion( WikiModuleInfo info ) {
         return Release.isNewerOrEqual( info.getMinVersion() ) && Release.isOlderOrEqual( info.getMaxVersion() )
                ? StringUtils.EMPTY
                : VER_WARNING;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java
index c798764..175fe9a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java
@@ -23,13 +23,14 @@ import java.util.Collection;
 import javax.management.NotCompliantMBeanException;
 
 import org.apache.wiki.WikiEngine;
+import org.apache.wiki.modules.WikiModuleInfo;
 import org.apache.wiki.plugin.DefaultPluginManager.WikiPluginInfo;
 import org.apache.wiki.util.XHTML;
 import org.apache.wiki.util.XhtmlUtil;
 import org.jdom2.Element;
 
 
-public class PluginBean extends ModuleBean< WikiPluginInfo > {
+public class PluginBean extends ModuleBean {
 
     public PluginBean( WikiEngine engine ) throws NotCompliantMBeanException {
         super( engine );
@@ -53,7 +54,7 @@ public class PluginBean extends ModuleBean< WikiPluginInfo > {
      * {@inheritDoc}
      */
     @Override
-    protected Collection< WikiPluginInfo > modules() {
+    protected Collection< WikiModuleInfo > modules() {
         return m_engine.getPluginManager().modules();
     }
 
@@ -74,10 +75,10 @@ public class PluginBean extends ModuleBean< WikiPluginInfo > {
      * {@inheritDoc}
      */
     @Override
-    protected Element rowBody( WikiPluginInfo plugin ) {
+    protected Element rowBody( WikiModuleInfo plugin ) {
         Element tr = XhtmlUtil.element( XHTML.tr );
         tr.addContent( XhtmlUtil.element( XHTML.td ).addContent( plugin.getName() ) )
-          .addContent( XhtmlUtil.element( XHTML.td ).addContent( plugin.getAlias() ) )
+          .addContent( XhtmlUtil.element( XHTML.td ).addContent( ( ( WikiPluginInfo )plugin).getAlias() ) )
           .addContent( XhtmlUtil.element( XHTML.td ).addContent( plugin.getAuthor() ) )
           .addContent( XhtmlUtil.element( XHTML.td ).addContent( validModuleVersion( plugin ) ) );
         return tr;