svn commit: r1547612 - in /jspwiki/trunk/jspwiki-war/src: main/java/org/apache/wiki/api/plugin/ main/java/org/apache/wiki/plugin/ test/java/org/apache/wiki/plugin/

[juanpablo]

Author: juanpablo
Date: Tue Dec  3 22:21:40 2013
New Revision: 1547612

URL: http://svn.apache.org/r1547612
Log:
 * (re)moved o.a.w.plugin.InitializablePlugin to 
o.a.w.api.plugin.InitializablePlugin
 * (re)moved o.a.w.plugin.InitializablePlugin to 
o.a.w.api.plugin.ParserStagePlugin
 * (re)moved o.a.w.plugin.WikiPlugin to o.a.w.api.plugin.WikiPlugin

Removed:
    
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/InitializablePlugin.java
    
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/ParserStagePlugin.java
    
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/plugin/WikiPlugin.java
Modified:
    
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java
    
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java
    
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/SamplePlugin.java

Modified: 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java?rev=1547612&r1=1547611&r2=1547612&view=diff
==============================================================================
--- 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java
 (original)
+++ 
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java
 Tue Dec  3 22:21:40 2013
@@ -23,13 +23,11 @@ import java.util.Map;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.api.exceptions.PluginException;
 
+
 /**
- *  Defines an interface for plugins.  Any instance of a wiki plugin
- *  should implement this interface.
- *
+ *  Defines an interface for plugins.  Any instance of a wiki plugin should 
implement this interface.
  */
-public interface WikiPlugin 
-{
+public interface WikiPlugin {
     /**
      *  Name of the default plugin resource bundle.
      */
@@ -58,4 +56,5 @@ public interface WikiPlugin 
      *  @throws PluginException In case anything goes wrong.
      */
     String execute( WikiContext context, Map< String, String > params ) throws 
PluginException;
+    
 }

Modified: 
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java?rev=1547612&r1=1547611&r2=1547612&view=diff
==============================================================================
--- 
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java
 (original)
+++ 
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java
 Tue Dec  3 22:21:40 2013
@@ -23,6 +23,9 @@ import java.util.Map;
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.WikiEngine;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.InitializablePlugin;
+import org.apache.wiki.api.plugin.WikiPlugin;
+
 
 /**
  *  Implements a simple plugin that just returns a piece of Javascript
@@ -30,18 +33,15 @@ import org.apache.wiki.api.exceptions.Pl
  *  Parameters: text - text to return.
  *
  */
-public class JavaScriptPlugin implements 
org.apache.wiki.api.plugin.WikiPlugin, InitializablePlugin
+public class JavaScriptPlugin implements WikiPlugin, InitializablePlugin
 {
     protected static boolean c_inited = false;
     
-    public String execute( WikiContext context, Map< String, String > params )
-        throws PluginException
-    {
+    public String execute( WikiContext context, Map< String, String > params ) 
throws PluginException {
         return "<script language=\"JavaScript\"><!--\nfoo='';\n--></script>\n";
     }
 
-    public void initialize(WikiEngine engine) throws PluginException
-    {
+    public void initialize( WikiEngine engine ) throws PluginException {
         c_inited = true;
     }
 

Modified: 
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/SamplePlugin.java
URL: 
http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/SamplePlugin.java?rev=1547612&r1=1547611&r2=1547612&view=diff
==============================================================================
--- 
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/SamplePlugin.java
 (original)
+++ 
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/plugin/SamplePlugin.java
 Tue Dec  3 22:21:40 2013
@@ -22,6 +22,8 @@ import java.util.Map;
 
 import org.apache.wiki.WikiContext;
 import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.api.plugin.ParserStagePlugin;
+import org.apache.wiki.api.plugin.WikiPlugin;
 import org.apache.wiki.parser.PluginContent;
 
 /**
@@ -31,34 +33,28 @@ import org.apache.wiki.parser.PluginCont
  *  Any _body content gets appended between brackets.
  *
  */
-public class SamplePlugin
-    implements org.apache.wiki.api.plugin.WikiPlugin, ParserStagePlugin
-{
+public class SamplePlugin implements WikiPlugin, ParserStagePlugin {
+       
     protected static boolean c_rendered = false;
     
-    public String execute( WikiContext context, Map params )
-        throws PluginException
-    {
+    public String execute( WikiContext context, Map< String, String > params ) 
throws PluginException {
         StringBuffer sb = new StringBuffer();
 
         String text = (String) params.get("text");
 
-        if( text != null )
-        {
+        if( text != null ) {
             sb.append( text );
         }
 
         String body = (String)params.get("_body");
-        if( body != null )
-        {
+        if( body != null ) {
             sb.append( " ("+body.replace('\n','+')+")" );
         }
 
         return sb.toString();
     }
 
-    public void executeParser(PluginContent element, WikiContext context, Map 
params)
-    {
+    public void executeParser(PluginContent element, WikiContext context, Map< 
String, String > params) {
         if( element.getParameter("render") != null ) c_rendered = true;
     }