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 2020/01/03 09:03:19 UTC
[jspwiki] 10/18: use ReferenceManager from
org.apache.wiki.references
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 757ee2ba2102b8f80e8808f4ada62fb72abb27b8
Author: juanpablo <ju...@apache.org>
AuthorDate: Thu Jan 2 16:39:22 2020 +0100
use ReferenceManager from org.apache.wiki.references
---
.../org/apache/wiki/plugin/PageViewPlugin.java | 2 +-
.../apache/wiki/plugin/ReferredPagesPlugin.java | 14 ++++----
.../apache/wiki/plugin/ReferringPagesPlugin.java | 21 ++++++-----
.../wiki/plugin/ReferringUndefinedPagesPlugin.java | 14 ++++----
.../apache/wiki/plugin/UndefinedPagesPlugin.java | 42 +++++++++-------------
.../org/apache/wiki/plugin/UnusedPagesPlugin.java | 10 +++---
6 files changed, 47 insertions(+), 56 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java
index 6f27c41..266297a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/PageViewPlugin.java
@@ -27,7 +27,6 @@ import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.PatternCompiler;
import org.apache.oro.text.regex.PatternMatcher;
import org.apache.oro.text.regex.Perl5Matcher;
-import org.apache.wiki.ReferenceManager;
import org.apache.wiki.WikiBackgroundThread;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
@@ -40,6 +39,7 @@ import org.apache.wiki.event.WikiEvent;
import org.apache.wiki.event.WikiEventListener;
import org.apache.wiki.event.WikiPageEvent;
import org.apache.wiki.event.WikiPageRenameEvent;
+import org.apache.wiki.references.ReferenceManager;
import org.apache.wiki.util.TextUtil;
import java.io.File;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
index f950079..a586057 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
@@ -18,12 +18,6 @@
*/
package org.apache.wiki.plugin;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-
import org.apache.log4j.Logger;
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.Pattern;
@@ -31,14 +25,20 @@ import org.apache.oro.text.regex.PatternCompiler;
import org.apache.oro.text.regex.PatternMatcher;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
-import org.apache.wiki.ReferenceManager;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.WikiPage;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.WikiPlugin;
+import org.apache.wiki.references.ReferenceManager;
import org.apache.wiki.util.TextUtil;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+
/**
* Displays the pages referring to the current page.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
index c25e916..6d1bd72 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringPagesPlugin.java
@@ -18,20 +18,20 @@
*/
package org.apache.wiki.plugin;
-import java.text.MessageFormat;
-import java.util.Collection;
-import java.util.Map;
-import java.util.ResourceBundle;
-
import org.apache.log4j.Logger;
-import org.apache.wiki.ReferenceManager;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.preferences.Preferences;
+import org.apache.wiki.references.ReferenceManager;
import org.apache.wiki.util.TextUtil;
+import java.text.MessageFormat;
+import java.util.Collection;
+import java.util.Map;
+import java.util.ResourceBundle;
+
/**
* Displays the pages referring to the current page.
*
@@ -44,8 +44,7 @@ import org.apache.wiki.util.TextUtil;
*
* From AbstractReferralPlugin:
* <ul>
- * <li><b>separator</b> - How to separate generated links; default is a wikitext line break,
- * producing a vertical list.</li>
+ * <li><b>separator</b> - How to separate generated links; default is a wikitext line break, producing a vertical list.</li>
* <li><b>maxwidth</b> - maximum width, in chars, of generated links.</li>
* </ul>
*/
@@ -101,9 +100,9 @@ public class ReferringPagesPlugin
extras = rb.getString("referringpagesplugin.more");
}
- if( log.isDebugEnabled() )
- log.debug( "Fetching referring pages for "+page.getName()+
- " with a max of "+items);
+ if( log.isDebugEnabled() ) {
+ log.debug( "Fetching referring pages for " + page.getName() + " with a max of "+items);
+ }
if( links != null && links.size() > 0 )
{
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
index 6632424..93a7916 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferringUndefinedPagesPlugin.java
@@ -18,18 +18,18 @@
*/
package org.apache.wiki.plugin;
-import java.text.MessageFormat;
-import java.util.Collection;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.TreeMap;
-
-import org.apache.wiki.ReferenceManager;
import org.apache.wiki.WikiContext;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.WikiPlugin;
import org.apache.wiki.preferences.Preferences;
+import org.apache.wiki.references.ReferenceManager;
import org.apache.wiki.util.TextUtil;
+
+import java.text.MessageFormat;
+import java.util.Collection;
+import java.util.Map;
+import java.util.ResourceBundle;
+import java.util.TreeMap;
/**
* <p>Lists all pages containing links to Undefined Pages (pages containing dead links).</p>
*
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java
index b94fa24..d760a20 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/UndefinedPagesPlugin.java
@@ -18,12 +18,13 @@
*/
package org.apache.wiki.plugin;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.references.ReferenceManager;
+
import java.util.Collection;
import java.util.Map;
-import org.apache.wiki.ReferenceManager;
-import org.apache.wiki.WikiContext;
-import org.apache.wiki.api.exceptions.PluginException;
/**
* Plugin that enumerates the pages in the wiki that have not yet been defined.
@@ -33,40 +34,31 @@ import org.apache.wiki.api.exceptions.PluginException;
* <li><b>separator</b> - how to separate generated links; default is a wikitext line break, producing a vertical list</li>
* <li><b> maxwidth</b> - maximum width, in chars, of generated links.</li>
* </ul>
- *
*/
-public class UndefinedPagesPlugin
- extends AbstractReferralPlugin
-{
+public class UndefinedPagesPlugin extends AbstractReferralPlugin {
+
/**
* {@inheritDoc}
*/
- public String execute( WikiContext context, Map<String, String> params )
- throws PluginException
- {
- ReferenceManager refmgr = context.getEngine().getReferenceManager();
- Collection< String > links = refmgr.findUncreated();
-
+ public String execute( final WikiContext context, final Map< String, String > params ) throws PluginException {
+ final ReferenceManager refmgr = context.getEngine().getReferenceManager();
super.initialize( context, params );
+ Collection< String > links = refmgr.findUncreated();
links = filterAndSortCollection( links );
-
- String wikitext = null;
-
- if (m_lastModified)
- {
- throw new PluginException("parameter " + PARAM_LASTMODIFIED + " is not valid for the UndefinedPagesPlugin");
+
+ if( m_lastModified ) {
+ throw new PluginException( "parameter " + PARAM_LASTMODIFIED + " is not valid for the UndefinedPagesPlugin" );
}
-
- if (m_show.equals(PARAM_SHOW_VALUE_COUNT))
- {
+
+ final String wikitext;
+ if( m_show.equals( PARAM_SHOW_VALUE_COUNT ) ) {
wikitext = "" + links.size();
- }
- else
- {
+ } else {
wikitext = wikitizeCollection( links, m_separator, ALL_ITEMS );
}
return makeHTML( context, wikitext );
}
+
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/UnusedPagesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/UnusedPagesPlugin.java
index 47e797b..a979d8d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/UnusedPagesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/UnusedPagesPlugin.java
@@ -18,15 +18,15 @@
*/
package org.apache.wiki.plugin;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.wiki.ReferenceManager;
import org.apache.wiki.WikiContext;
import org.apache.wiki.api.exceptions.PluginException;
+import org.apache.wiki.references.ReferenceManager;
import org.apache.wiki.util.TextUtil;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
/**
* Plugin for displaying pages that are not linked to in other pages.
* Uses the ReferenceManager.