[jspwiki] 10/17: FilterManager and PluginManager return Collection< WikiModuleInfo > instead of Collection for modules(); remove unused imports on DefaultFilterManager

[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 cdef9c1f9736450b68edacee42e6d45aa9f9e063
Author: juanpablo <juanpa...@apache.org>
AuthorDate: Sun Oct 28 21:15:26 2018 +0100

    FilterManager and PluginManager return Collection< WikiModuleInfo > instead 
of Collection for modules(); remove unused imports on DefaultFilterManager
---
 .../src/main/java/org/apache/wiki/api/engine/FilterManager.java     | 2 +-
 .../src/main/java/org/apache/wiki/api/engine/PluginManager.java     | 2 +-
 .../src/main/java/org/apache/wiki/filters/DefaultFilterManager.java | 6 +-----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git 
a/jspwiki-main/src/main/java/org/apache/wiki/api/engine/FilterManager.java 
b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/FilterManager.java
index 894fcb1..a9a825e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/api/engine/FilterManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/FilterManager.java
@@ -120,7 +120,7 @@ public interface FilterManager
      * 
      * @return A Collection of {@link WikiModuleInfo} instances.
      */
-    Collection modules();
+    Collection< WikiModuleInfo > modules();
     
     /**
      * Returns the {@link WikiModuleInfo} information about the provided 
filterName.
diff --git 
a/jspwiki-main/src/main/java/org/apache/wiki/api/engine/PluginManager.java 
b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/PluginManager.java
index cbc0f9f..7ed71ff 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/api/engine/PluginManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/api/engine/PluginManager.java
@@ -157,7 +157,7 @@ public interface PluginManager {
      * 
      * @return A Collection of {@link WikiModuleInfo} instances.
      */
-    Collection modules();
+    Collection< WikiModuleInfo > modules();
 
     /**
      * Returns the {@link WikiPluginInfo} information about the provided 
pluginName.
diff --git 
a/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java 
b/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
index b3da1d2..8b72442 100644
--- 
a/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
+++ 
b/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
@@ -22,15 +22,12 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
@@ -44,7 +41,6 @@ import org.apache.wiki.event.WikiEventManager;
 import org.apache.wiki.event.WikiPageEvent;
 import org.apache.wiki.modules.ModuleManager;
 import org.apache.wiki.modules.WikiModuleInfo;
-import org.apache.wiki.plugin.DefaultPluginManager.WikiPluginInfo;
 import org.apache.wiki.util.ClassUtil;
 import org.apache.wiki.util.PriorityList;
 import org.apache.wiki.util.XmlUtil;
@@ -407,7 +403,7 @@ public class DefaultFilterManager extends ModuleManager 
implements FilterManager
      *  {@inheritDoc}
      */
     @Override
-    public Collection modules() {
+    public Collection< WikiModuleInfo > modules() {
         return modules( m_filterClassMap.values().iterator() );
     }