You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2012/12/26 23:20:27 UTC

svn commit: r1426057 - /incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java

Author: juanpablo
Date: Wed Dec 26 22:20:27 2012
New Revision: 1426057

URL: http://svn.apache.org/viewvc?rev=1426057&view=rev
Log:
adapted to use new Filter API

Modified:
    incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java?rev=1426057&r1=1426056&r2=1426057&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/WikiEngine.java Wed Dec 26 22:20:27 2012
@@ -35,6 +35,8 @@ import org.apache.commons.lang.time.Stop
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.wiki.api.PluginManager;
+import org.apache.wiki.api.exceptions.FilterException;
+import org.apache.wiki.api.filters.FilterManager;
 import org.apache.wiki.attachment.Attachment;
 import org.apache.wiki.attachment.AttachmentManager;
 import org.apache.wiki.auth.AuthenticationManager;
@@ -46,8 +48,6 @@ import org.apache.wiki.auth.authorize.Gr
 import org.apache.wiki.content.PageRenamer;
 import org.apache.wiki.diff.DifferenceManager;
 import org.apache.wiki.event.*;
-import org.apache.wiki.filters.FilterException;
-import org.apache.wiki.filters.FilterManager;
 import org.apache.wiki.i18n.InternationalizationManager;
 import org.apache.wiki.parser.JSPWikiMarkupParser;
 import org.apache.wiki.parser.MarkupParser;
@@ -1708,7 +1708,7 @@ public class WikiEngine
      *  save operation. If the page-save operation requires approval, the exception will
      *  be of type {@link org.apache.wiki.workflow.DecisionRequiredException}. Individual
      *  PageFilters, such as the {@link org.apache.wiki.filters.SpamFilter} may also
-     *  throw a {@link org.apache.wiki.filters.RedirectException}.
+     *  throw a {@link org.apache.wiki.api.exceptions.RedirectException}.
      */
     public void saveText( WikiContext context, String text )
         throws WikiException
@@ -2087,9 +2087,10 @@ public class WikiEngine
      *  @since 2.1.88
      *  @return The current FilterManager instance
      */
-    public FilterManager getFilterManager()
+    @SuppressWarnings("unchecked")
+    public < T extends FilterManager > T getFilterManager()
     {
-        return m_filterManager;
+        return (T)m_filterManager;
     }
 
     /**