Author: jalkanen
Date: Thu Jun 12 14:06:10 2008
New Revision: 667227
URL: http://svn.apache.org/viewvc?rev=667227&view=rev
Log:
Java5 and checkstyle fixes.
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Denounce.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WikiPlugin.java
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java?rev=667227&r1=667226&r2=667227&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java Thu
Jun 12 14:06:10 2008
@@ -345,7 +345,7 @@
*
* @param source
* @param list
- * @return
+ * @return A Collection of the Patterns that were found from the lists.
*/
private Collection<Pattern> parseWordList( WikiPage source, String list )
{
@@ -380,7 +380,7 @@
* Pattern objects.
*
* @param list
- * @return
+ * @return The parsed blacklist patterns.
*/
private Collection<Pattern> parseBlacklist( String list )
{
@@ -932,10 +932,10 @@
}
/**
- * Returns true, if this user should be ignored.
+ * Returns true, if this user should be ignored. For example, admin
users.
*
* @param context
- * @return
+ * @return True, if this users should be ignored.
*/
private boolean ignoreThisUser(WikiContext context)
{
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Denounce.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Denounce.java?rev=667227&r1=667226&r2=667227&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Denounce.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Denounce.java Thu Jun
12 14:06:10 2008
@@ -53,9 +53,9 @@
public static final String PROP_DENOUNCETEXT = "denounce.denouncetext";
- private static ArrayList c_refererPatterns = new ArrayList();
- private static ArrayList c_agentPatterns = new ArrayList();
- private static ArrayList c_hostPatterns = new ArrayList();
+ private static ArrayList<Pattern> c_refererPatterns = new
ArrayList<Pattern>();
+ private static ArrayList<Pattern> c_agentPatterns = new
ArrayList<Pattern>();
+ private static ArrayList<Pattern> c_hostPatterns = new
ArrayList<Pattern>();
private static String c_denounceText = "";
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java?rev=667227&r1=667226&r2=667227&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java Thu
Jun 12 14:06:10 2008
@@ -614,6 +614,7 @@
* @return A DOM element
* @throws PluginException If plugin invocation is faulty
*/
+ @SuppressWarnings("unchecked")
public PluginContent parsePluginLine( WikiContext context, String
commandline, int pos )
throws PluginException
{
@@ -1005,6 +1006,13 @@
return ls;
}
+ /**
+ * Executes parse stage, unless plugins are disabled.
+ *
+ * @param content The content item.
+ * @param context A WikiContext
+ * @throws PluginException If something goes wrong.
+ */
// FIXME: This method needs to be reintegrated with execute() above, since
they
// share plenty of code.
public void executeParse(PluginContent content, WikiContext context)
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java?rev=667227&r1=667226&r2=667227&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/RPCSamplePlugin.java
Thu Jun 12 14:06:10 2008
@@ -36,7 +36,7 @@
/**
* This method is called when the Javascript is encountered by
* the browser.
- * @param echo
+ * @param echo The parameter
* @return the string <code>JSON says:</code>, plus the value
* supplied by the <code>echo</code> parameter
*/
@@ -46,7 +46,9 @@
}
-
+ /**
+ * [EMAIL PROTECTED]
+ */
public String execute(WikiContext context, Map params) throws
PluginException
{
JSONRPCManager.registerJSONObject( context, this );
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java?rev=667227&r1=667226&r2=667227&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/ReferredPagesPlugin.java
Thu Jun 12 14:06:10 2008
@@ -20,6 +20,14 @@
*/
package com.ecyrd.jspwiki.plugin;
+import java.util.*;
+
+import org.apache.log4j.Logger;
+import org.apache.oro.text.regex.*;
+
+import com.ecyrd.jspwiki.*;
+
+
/**
* Displays the pages referring to the current page.
*
@@ -36,20 +44,12 @@
*
* @author Dirk Frederickx
*/
-
-import java.util.*;
-
-import org.apache.log4j.Logger;
-import org.apache.oro.text.regex.*;
-
-import com.ecyrd.jspwiki.*;
-
public class ReferredPagesPlugin implements WikiPlugin
{
private static Logger log = Logger.getLogger( ReferredPagesPlugin.class );
private WikiEngine m_engine;
private int m_depth;
- private HashSet m_exists = new HashSet();
+ private HashSet<String> m_exists = new HashSet<String>();
private StringBuffer m_result = new StringBuffer(1024);
private PatternMatcher m_matcher = new Perl5Matcher();
private Pattern m_includePattern;
@@ -57,15 +57,33 @@
private boolean m_formatCompact = true;
private boolean m_formatSort = false;
+ /** The parameter name for the root page to start from. Value is
<tt>[EMAIL PROTECTED]</tt>. */
public static final String PARAM_ROOT = "page";
+
+ /** The parameter name for the depth. Value is <tt>[EMAIL
PROTECTED]</tt>. */
public static final String PARAM_DEPTH = "depth";
+
+ /** The parameter name for the type of the references. Value is
<tt>[EMAIL PROTECTED]</tt>. */
public static final String PARAM_TYPE = "type";
+
+ /** The parameter name for the included pages. Value is <tt>[EMAIL
PROTECTED]</tt>. */
public static final String PARAM_INCLUDE = "include";
+
+ /** The parameter name for the excluded pages. Value is <tt>[EMAIL
PROTECTED]</tt>. */
public static final String PARAM_EXCLUDE = "exclude";
+
+ /** The parameter name for the format. Value is <tt>[EMAIL
PROTECTED]</tt>. */
public static final String PARAM_FORMAT = "format";
+
+ /** The minimum depth. Value is <tt>[EMAIL PROTECTED]</tt>. */
public static final int MIN_DEPTH = 1;
+
+ /** The maximum depth. Value is <tt>[EMAIL PROTECTED]</tt>. */
public static final int MAX_DEPTH = 8;
+ /**
+ * [EMAIL PROTECTED]
+ */
public String execute( WikiContext context, Map params )
throws PluginException
{
@@ -154,7 +172,8 @@
* Retrieves a list of all referred pages. Is called recursively
* depending on the depth parameter
*/
- protected void getReferredPages( WikiContext context, String pagename, int
depth )
+ @SuppressWarnings("unchecked")
+ private void getReferredPages( WikiContext context, String pagename, int
depth )
{
if( depth >= m_depth ) return; // end of recursion
if( pagename == null ) return;
@@ -162,19 +181,19 @@
ReferenceManager mgr = m_engine.getReferenceManager();
- Collection allPages = mgr.findRefersTo( pagename );
+ Collection<String> allPages = mgr.findRefersTo( pagename );
handleLinks( context, allPages, ++depth, pagename );
}
- protected void handleLinks(WikiContext context,Collection links, int
depth, String pagename)
+ private void handleLinks(WikiContext context,Collection<String> links, int
depth, String pagename)
{
boolean isUL = false;
- HashSet localLinkSet = new HashSet(); // needed to skip multiple
+ HashSet<String> localLinkSet = new HashSet<String>(); // needed to
skip multiple
// links to the same page
localLinkSet.add(pagename);
- ArrayList allLinks = new ArrayList();
+ ArrayList<String> allLinks = new ArrayList<String>();
if( links != null )
allLinks.addAll( links );
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java?rev=667227&r1=667226&r2=667227&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UndefinedPagesPlugin.java
Thu Jun 12 14:06:10 2008
@@ -36,6 +36,10 @@
public class UndefinedPagesPlugin
extends AbstractReferralPlugin
{
+ /**
+ * [EMAIL PROTECTED]
+ */
+ @SuppressWarnings("unchecked")
public String execute( WikiContext context, Map params )
throws PluginException
{
@@ -44,7 +48,7 @@
super.initialize( context, params );
- TreeSet sortedSet = new TreeSet();
+ TreeSet<String> sortedSet = new TreeSet<String>();
links = filterCollection( links );
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java?rev=667227&r1=667226&r2=667227&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java
Thu Jun 12 14:06:10 2008
@@ -45,6 +45,7 @@
/**
* [EMAIL PROTECTED]
*/
+ @SuppressWarnings("unchecked")
public String execute( WikiContext context, Map params )
throws PluginException
{
@@ -71,7 +72,7 @@
super.initialize( context, params );
- TreeSet sortedSet = new TreeSet();
+ TreeSet<?> sortedSet = new TreeSet<Object>();
links = filterCollection( links );
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java?rev=667227&r1=667226&r2=667227&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogPlugin.java Thu
Jun 12 14:06:10 2008
@@ -118,6 +118,7 @@
return TextUtil.replaceString(DEFAULT_PAGEFORMAT,"%p",pageName)+date;
}
+ @SuppressWarnings("unchecked")
public String execute( WikiContext context, Map params )
throws PluginException
{
@@ -226,10 +227,10 @@
try
{
- List blogEntries = findBlogEntries( engine.getPageManager(),
- weblogName,
- startTime.getTime(),
- stopTime.getTime() );
+ List<WikiPage> blogEntries = findBlogEntries(
engine.getPageManager(),
+ weblogName,
+ startTime.getTime(),
+ stopTime.getTime() );
Collections.sort( blogEntries, new PageDateComparator() );
@@ -393,7 +394,7 @@
throws ProviderException
{
Collection everyone = mgr.getAllPages();
- ArrayList result = new ArrayList();
+ ArrayList<WikiPage> result = new ArrayList<WikiPage>();
baseName = makeEntryPage( baseName );
SimpleDateFormat fmt = new SimpleDateFormat(DEFAULT_DATEFORMAT);
@@ -452,18 +453,15 @@
/**
* Reverse comparison.
*/
- private static class PageDateComparator implements Comparator
+ private static class PageDateComparator implements Comparator<WikiPage>
{
- public int compare( Object o1, Object o2 )
+ public int compare( WikiPage page1, WikiPage page2 )
{
- if( o1 == null || o2 == null )
+ if( page1 == null || page2 == null )
{
return 0;
}
- WikiPage page1 = (WikiPage)o1;
- WikiPage page2 = (WikiPage)o2;
-
return page2.getLastModified().compareTo( page1.getLastModified()
);
}
}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WikiPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WikiPlugin.java?rev=667227&r1=667226&r2=667227&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WikiPlugin.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WikiPlugin.java Thu
Jun 12 14:06:10 2008
@@ -31,6 +31,9 @@
*/
public interface WikiPlugin
{
+ /**
+ * Name of the default plugin resource bundle.
+ */
static final String CORE_PLUGINS_RESOURCEBUNDLE = "plugin.PluginResources";
/**
