svn commit: r1418094 [2/2] - in /incubator/jspwiki/trunk: ./ src/org/apache/wiki/ src/org/apache/wiki/forms/ src/org/apache/wiki/parser/ src/org/apache/wiki/plugin/ src/org/apache/wiki/tags/ src/org/apache/wiki/util/ tests/org/apache/wiki/plugin/

[ju...@apache.org]

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WikiPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WikiPlugin.java?rev=1418094&r1=1418093&r2=1418094&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WikiPlugin.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/WikiPlugin.java Thu Dec  6 21:43:33 2012
@@ -27,7 +27,7 @@ import org.apache.wiki.WikiContext;
  *  should implement this interface.
  *
  */
-public interface WikiPlugin
+public interface WikiPlugin 
 {
     /**
      *  Name of the default plugin resource bundle.
@@ -57,6 +57,6 @@ public interface WikiPlugin
      *  @throws PluginException In case anything goes wrong.
      */
 
-    public String execute( WikiContext context, Map params )
+    String execute( WikiContext context, Map<String, String> params )
         throws PluginException;
 }

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/tags/PluginTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/tags/PluginTag.java?rev=1418094&r1=1418093&r2=1418094&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/tags/PluginTag.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/tags/PluginTag.java Thu Dec  6 21:43:33 2012
@@ -90,7 +90,6 @@ public class PluginTag
         return EVAL_BODY_BUFFERED;
     }
 
-    @SuppressWarnings("unchecked")
     private String executePlugin( String plugin, String args, String body )
         throws PluginException, IOException
     {

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/util/FormUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/util/FormUtil.java?rev=1418094&r1=1418093&r2=1418094&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/util/FormUtil.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/util/FormUtil.java Thu Dec  6 21:43:33 2012
@@ -84,7 +84,7 @@ public final class FormUtil
      * @return ArrayList, containing the values corresponding to the
      *          keyPrefix, in order.
      */
-    public static ArrayList getNumberedValues( Map params, String keyPrefix )
+    public static List getNumberedValues( Map params, String keyPrefix )
     {
         ArrayList<Object> rval = new ArrayList<Object>();
         if( params == null || 
@@ -133,8 +133,8 @@ public final class FormUtil
      * @param filterPrefix the prefix
      * @return the Map containing parsed key/value pairs
      */
-    public static Map requestToMap( HttpServletRequest req, 
-                                    String filterPrefix )
+    public static Map< String, String > requestToMap( HttpServletRequest req, 
+                                                      String filterPrefix )
     {
         HashMap<String,String> params = new HashMap<String,String>();
         

Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/JavaScriptPlugin.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/JavaScriptPlugin.java?rev=1418094&r1=1418093&r2=1418094&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/JavaScriptPlugin.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/JavaScriptPlugin.java Thu Dec  6 21:43:33 2012
@@ -18,9 +18,10 @@
  */
 package org.apache.wiki.plugin;
 
-import org.apache.wiki.*;
+import java.util.Map;
 
-import java.util.*;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiEngine;
 
 /**
  *  Implements a simple plugin that just returns a piece of Javascript
@@ -28,12 +29,11 @@ import java.util.*;
  *  Parameters: text - text to return.
  *
  */
-public class JavaScriptPlugin
-    implements WikiPlugin, InitializablePlugin
+public class JavaScriptPlugin implements WikiPlugin, InitializablePlugin
 {
     protected static boolean c_inited = false;
     
-    public String execute( WikiContext context, Map params )
+    public String execute( WikiContext context, Map< String, String > params )
         throws PluginException
     {
         return "<script language=\"JavaScript\"><!--\nfoo='';\n--></script>\n";