You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/07/11 17:14:57 UTC
svn commit: r555299 - in /roller/trunk/apps/weblogger:
src/java/org/apache/roller/weblogger/business/
src/java/org/apache/roller/weblogger/planet/business/
src/java/org/apache/roller/weblogger/pojos/
src/java/org/apache/roller/weblogger/pojos/wrapper/ ...
Author: agilliland
Date: Wed Jul 11 08:14:54 2007
New Revision: 555299
URL: http://svn.apache.org/viewvc?view=rev&rev=555299
Log:
renaming Weblogger method getPagePluginManager because it's not a page plugin manager, it's just a plugin manager.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/plugins/CommentPluginsTest.java
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.java?view=diff&rev=555299&r1=555298&r2=555299
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/Weblogger.java Wed Jul 11 08:14:54 2007
@@ -124,7 +124,7 @@
/**
* Get PluginManager associated with this Weblogger instance.
*/
- public PluginManager getPagePluginManager();
+ public PluginManager getPluginManager();
/**
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.java?view=diff&rev=555299&r1=555298&r2=555299
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/WebloggerImpl.java Wed Jul 11 08:14:54 2007
@@ -253,7 +253,7 @@
*
* @see org.apache.roller.weblogger.modelWebloggerr#getPluginManager()
*/
- public PluginManager getPagePluginManager() {
+ public PluginManager getPluginManager() {
return pluginManager;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java?view=diff&rev=555299&r1=555298&r2=555299
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java Wed Jul 11 08:14:54 2007
@@ -126,7 +126,7 @@
entryCount);
// Populate subscription object with new entries
- PluginManager ppmgr = WebloggerFactory.getWeblogger().getPagePluginManager();
+ PluginManager ppmgr = WebloggerFactory.getWeblogger().getPluginManager();
Map pagePlugins = ppmgr.getWeblogEntryPlugins(localWeblog);
for ( WeblogEntry rollerEntry : entries ) {
SubscriptionEntry entry = new SubscriptionEntry();
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java?view=diff&rev=555299&r1=555298&r2=555299
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/Weblog.java Wed Jul 11 08:14:54 2007
@@ -916,7 +916,7 @@
if (initializedPlugins == null) {
try {
Weblogger roller = WebloggerFactory.getWeblogger();
- PluginManager ppmgr = roller.getPagePluginManager();
+ PluginManager ppmgr = roller.getPluginManager();
initializedPlugins = ppmgr.getWeblogEntryPlugins(this);
} catch (Exception e) {
this.log.error("ERROR: initializing plugins");
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java?view=diff&rev=555299&r1=555298&r2=555299
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java Wed Jul 11 08:14:54 2007
@@ -112,7 +112,7 @@
content = StringEscapeUtils.escapeHtml(content);
// apply plugins for transformation
- PluginManager pmgr = WebloggerFactory.getWeblogger().getPagePluginManager();
+ PluginManager pmgr = WebloggerFactory.getWeblogger().getPluginManager();
content = pmgr.applyCommentPlugins(this.pojo);
// always add rel=nofollow for links
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java?view=diff&rev=555299&r1=555298&r2=555299
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldPageHelper.java Wed Jul 11 08:14:54 2007
@@ -92,7 +92,7 @@
// init plugins
Weblogger roller = WebloggerFactory.getWeblogger();
- PluginManager ppmgr = roller.getPagePluginManager();
+ PluginManager ppmgr = roller.getPluginManager();
mPagePlugins = ppmgr.getWeblogEntryPlugins(mWebsite);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java?view=diff&rev=555299&r1=555298&r2=555299
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java Wed Jul 11 08:14:54 2007
@@ -179,7 +179,7 @@
public List<WeblogEntryPlugin> getEntryPlugins() {
List<WeblogEntryPlugin> availablePlugins = Collections.EMPTY_LIST;
try {
- PluginManager ppmgr = WebloggerFactory.getWeblogger().getPagePluginManager();
+ PluginManager ppmgr = WebloggerFactory.getWeblogger().getPluginManager();
Map<String, WeblogEntryPlugin> plugins = ppmgr.getWeblogEntryPlugins(getActionWeblog());
if(plugins.size() > 0) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java?view=diff&rev=555299&r1=555298&r2=555299
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java Wed Jul 11 08:14:54 2007
@@ -90,7 +90,7 @@
}
// set plugins list
- PluginManager ppmgr = WebloggerFactory.getWeblogger().getPagePluginManager();
+ PluginManager ppmgr = WebloggerFactory.getWeblogger().getPluginManager();
Map pluginsMap = ppmgr.getWeblogEntryPlugins(getActionWeblog());
List plugins = new ArrayList();
Iterator iter = pluginsMap.values().iterator();
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/plugins/CommentPluginsTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/plugins/CommentPluginsTest.java?view=diff&rev=555299&r1=555298&r2=555299
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/plugins/CommentPluginsTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/plugins/CommentPluginsTest.java Wed Jul 11 08:14:54 2007
@@ -44,7 +44,7 @@
public void testAutoFormatPlugin() {
- PluginManager pmgr = WebloggerFactory.getWeblogger().getPagePluginManager();
+ PluginManager pmgr = WebloggerFactory.getWeblogger().getPluginManager();
// setup test comment
WeblogEntryComment comment = new WeblogEntryComment();