Author: gmazza
Date: Mon Mar 10 04:13:14 2014
New Revision: 1575805
URL: http://svn.apache.org/r1575805
Log:
Removed old datamodel 4.0 diagram, implemented more parameterized types.
Removed:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/datamodel40.png
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/AutoPingManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/StartupException.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/PlanetGroup.java
Mon Mar 10 04:13:14 2014
@@ -47,7 +47,7 @@ public class PlanetGroup implements Seri
// associations
private Planet planet = null;
- private Set subscriptions = new TreeSet();
+ private Set<Subscription> subscriptions = new TreeSet<Subscription>();
public PlanetGroup() {}
@@ -131,11 +131,11 @@ public class PlanetGroup implements Seri
this.planet = planet;
}
- public Set getSubscriptions() {
+ public Set<Subscription> getSubscriptions() {
return subscriptions;
}
- public void setSubscriptions(Set subscriptions) {
+ public void setSubscriptions(Set<Subscription> subscriptions) {
this.subscriptions = subscriptions;
}
@@ -143,12 +143,12 @@ public class PlanetGroup implements Seri
/**
* Return a list of the most recent 10 entries from this group.
*/
- public List getRecentEntries() {
+ public List<SubscriptionEntry> getRecentEntries() {
PlanetManager mgr = WebloggerFactory.getWeblogger().getPlanetManager();
try {
return mgr.getEntries(this, 0, 10);
} catch(Exception e) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
Mon Mar 10 04:13:14 2014
@@ -92,17 +92,6 @@ public class GeneratePlanetTask extends
outputDirObj.mkdirs();
}
- List groups = Collections.EMPTY_LIST;
- // groups must be part of a planet now, so getGroupHandles() was
removed
- //List groups = planetManager.getGroupHandles();
- for (Object groupHandle : groups) {
- String groupDirName = outputDirObj + File.separator +
groupHandle;
- File groupDir = new File(groupDirName);
- if (!groupDir.exists()) {
- groupDir.mkdirs();
- }
- }
-
// Generate files: execute control template
Generator generator = Generator.getInstance();
generator.setVelocityEngine(engine);
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/StaticPlanetModel.java
Mon Mar 10 04:13:14 2014
@@ -25,6 +25,7 @@ import org.apache.roller.RollerException
import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.planet.pojos.PlanetGroup;
import org.apache.roller.planet.pojos.Subscription;
+import org.apache.roller.planet.pojos.SubscriptionEntry;
import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -53,13 +54,13 @@ public class StaticPlanetModel {
}
- public List getFeedEntries(String feedUrl, int maxEntries) throws
Exception {
+ public List<SubscriptionEntry> getFeedEntries(String feedUrl, int
maxEntries) throws Exception {
try {
Subscription sub = planetManager.getSubscription(feedUrl);
if(sub != null) {
return planetManager.getEntries(sub, 0, maxEntries);
} else {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
} catch (Exception e) {
e.printStackTrace();
@@ -67,17 +68,6 @@ public class StaticPlanetModel {
}
}
- // removed now that groups must be part of a planet, this method no longer
makes sense
-// public List getGroups() throws RollerException {
-// return planetManager.getGroups();
-// }
-
- // removed now that groups must be part of a planet, this method no longer
makes sense
-// public PlanetGroup getGroup(String handle) throws RollerException {
-// return planetManager.getGroup(handle);
-// }
-
-
public List getAggregation(
PlanetGroup group, int maxEntries) throws RollerException {
return planetManager.getEntries(group, 0, maxEntries);
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAAutoPingManagerImpl.java
Mon Mar 10 04:13:14 2014
@@ -119,14 +119,6 @@ public class JPAAutoPingManagerImpl impl
// .execute(changedWeblogEntry.getWebsite());
}
- public List getCategoryRestrictions(AutoPing autoPing) throws
WebloggerException {
- return Collections.EMPTY_LIST;
- }
-
- public void setCategoryRestrictions(AutoPing autoPing, Collection
newCategories) {
- // NOT YET IMPLEMENTED
- }
-
public void release() {
}
}
\ No newline at end of file
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
Mon Mar 10 04:13:14 2014
@@ -296,7 +296,7 @@ public class JPAWeblogEntryManagerImpl i
throws WebloggerException {
if (current == null) {
- log.debug("WeblogEntry current cannot be null");
+ log.debug("current WeblogEntry cannot be null");
return Collections.emptyList();
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/AutoPingManager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/AutoPingManager.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/AutoPingManager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/AutoPingManager.java
Mon Mar 10 04:13:14 2014
@@ -125,29 +125,6 @@ public interface AutoPingManager {
*/
void queueApplicableAutoPings(WeblogEntry changedWeblogEntry) throws
WebloggerException;
-
- /**
- * Get the category restrictions on the given auto ping configuration.
- *
- * @param autoPing
- * @return the category restrictions as a collection of
<code>WeblogCategoryData</code> objects. This collection
- * will be empty if there are no restrictions (meaning that the
auto ping configuration applies to changes
- * in any category of the website).
- */
- List getCategoryRestrictions(AutoPing autoPing) throws WebloggerException;
-
-
- /**
- * Set the category restrictions on the given ping configuration to the
specified ones. If the new collection is
- * empty, all category restrictions are removed.
- *
- * @param autoPing auto ping configuration to change
- * @param newCategories a collection of <code>WeblogCategoryData</code>
objects for the new category restrictions
- */
- void setCategoryRestrictions(AutoPing autoPing,
- Collection newCategories);
-
-
/**
* Release all resources associated with Roller session.
*/
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/StartupException.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/StartupException.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/StartupException.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/StartupException.java
Mon Mar 10 04:13:14 2014
@@ -33,12 +33,12 @@ public class StartupException extends We
public StartupException(String msg) {
super(msg);
- this.startupLog = Collections.EMPTY_LIST;
+ this.startupLog = Collections.emptyList();
}
public StartupException(String msg, Throwable t) {
super(msg, t);
- this.startupLog = Collections.EMPTY_LIST;
+ this.startupLog = Collections.emptyList();
}
public StartupException(String msg, List<String> log) {
@@ -47,7 +47,7 @@ public class StartupException extends We
if(log != null) {
this.startupLog = log;
} else {
- this.startupLog = Collections.EMPTY_LIST;
+ this.startupLog = Collections.emptyList();
}
}
@@ -57,7 +57,7 @@ public class StartupException extends We
if(log != null) {
this.startupLog = log;
} else {
- this.startupLog = Collections.EMPTY_LIST;
+ this.startupLog = Collections.emptyList();
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
Mon Mar 10 04:13:14 2014
@@ -91,7 +91,7 @@ public class PingConfig {
// This was introduced in order to support certain buggy (but popular) ping
// targets that implement minor variants of the WeblogUpdates.ping call.
// This is initialized once at startup, and referenced when pings are made.
- private static final Map CONFIGURED_VARIANTS = new HashMap();
+ private static final Map<String, Set<String>> CONFIGURED_VARIANTS = new
HashMap<String, Set<String>>();
// Pattern used to parse common ping targets as well as ping variants.
// Each initial commmon ping target is specified in the format
{{name}{url}}
@@ -225,7 +225,7 @@ public class PingConfig {
if (m.matches() && m.groupCount() == 2) {
String url = m.group(1).trim();
String optionsList = m.group(2).trim();
- Set variantOptions = new HashSet();
+ Set<String> variantOptions = new HashSet<String>();
String[] options = optionsList.split(",");
for (int j = 0; j < options.length; j++) {
String option = options[j].trim().toLowerCase();
@@ -251,10 +251,10 @@ public class PingConfig {
* @return the set of variant options configured for the given ping target
url, or
* the empty set if there are no variants configured.
*/
- public static Set getVariantOptions(String pingTargetUrl) {
- Set variantOptions = (Set) CONFIGURED_VARIANTS.get(pingTargetUrl);
+ public static Set<String> getVariantOptions(String pingTargetUrl) {
+ Set<String> variantOptions = CONFIGURED_VARIANTS.get(pingTargetUrl);
if (variantOptions == null) {
- variantOptions = Collections.EMPTY_SET;
+ variantOptions = Collections.emptySet();
}
return variantOptions;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetConfig.java
Mon Mar 10 04:13:14 2014
@@ -47,7 +47,7 @@ public class PlanetConfig extends Planet
private Map parameters = Collections.EMPTY_MAP;
// runtime properties data
- private Map<String, RuntimeConfigProperty> properties =
Collections.EMPTY_MAP;
+ private Map<String, RuntimeConfigProperty> properties =
Collections.emptyMap();
// the runtime config def used to populate the display
private ConfigDef globalConfigDef = null;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/planet/ui/PlanetSubscriptions.java
Mon Mar 10 04:13:14 2014
@@ -190,12 +190,12 @@ public class PlanetSubscriptions extends
public List<Subscription> getSubscriptions() {
- List<Subscription> subs = Collections.EMPTY_LIST;
+ List<Subscription> subs = Collections.emptyList();
if(getGroup() != null) {
Set<Subscription> subsSet = getGroup().getSubscriptions();
// iterate over list and build display list
- subs = new ArrayList();
+ subs = new ArrayList<Subscription>();
for( Subscription sub : subsSet ) {
// only include external subs for display
if(!sub.getFeedURL().startsWith("weblogger:")) {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
Mon Mar 10 04:13:14 2014
@@ -896,7 +896,7 @@ public class Weblog implements Serializa
} catch (WebloggerException e) {
log.error("PageModel getTodaysReferers()", e);
}
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalCommentManagement.java
Mon Mar 10 04:13:14 2014
@@ -93,11 +93,11 @@ public class GlobalCommentManagement ext
public void loadComments() {
- List comments = Collections.EMPTY_LIST;
+ List<WeblogEntryComment> comments = Collections.emptyList();
boolean hasMore = false;
try {
WeblogEntryManager wmgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
- List rawComments = wmgr.getComments(
+ List<WeblogEntryComment> rawComments = wmgr.getComments(
null,
null,
getBean().getSearchString(),
@@ -107,17 +107,17 @@ public class GlobalCommentManagement ext
true, // reverse chrono order
getBean().getPage() * COUNT,
COUNT + 1);
- comments = new ArrayList();
+ comments = new ArrayList<WeblogEntryComment>();
comments.addAll(rawComments);
- if(comments != null && comments.size() > 0) {
+ if(comments.size() > 0) {
if(comments.size() > COUNT) {
comments.remove(comments.size()-1);
hasMore = true;
}
- setFirstComment((WeblogEntryComment)comments.get(0));
-
setLastComment((WeblogEntryComment)comments.get(comments.size()-1));
+ setFirstComment(comments.get(0));
+ setLastComment(comments.get(comments.size()-1));
}
} catch (WebloggerException ex) {
log.error("Error looking up comments", ex);
@@ -133,7 +133,7 @@ public class GlobalCommentManagement ext
// use the action data to build a url representing this action, including
query data
private String buildBaseUrl() {
- Map<String, String> params = new HashMap();
+ Map<String, String> params = new HashMap<String, String>();
if(!StringUtils.isEmpty(getBean().getSearchString())) {
params.put("bean.searchString", getBean().getSearchString());
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/GlobalConfig.java
Mon Mar 10 04:13:14 2014
@@ -51,17 +51,17 @@ public class GlobalConfig extends UIActi
private static Log log = LogFactory.getLog(GlobalConfig.class);
- // the request parameters as <String, String[]>
- private Map params = Collections.EMPTY_MAP;
+ // the request parameters
+ private Map<String, String[]> params = Collections.emptyMap();
// map of config properties
- private Map<String, RuntimeConfigProperty> properties =
Collections.EMPTY_MAP;
+ private Map<String, RuntimeConfigProperty> properties =
Collections.emptyMap();
// the runtime config def used to populate the display
private ConfigDef globalConfigDef = null;
// list of comment plugins
- private List<WeblogEntryCommentPlugin> pluginsList =
Collections.EMPTY_LIST;
+ private List<WeblogEntryCommentPlugin> pluginsList =
Collections.emptyList();
// comment plugins that are enabled. this is what the html form submits to
private String[] commentPlugins = new String[0];
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/common/PingTargetsBase.java
Mon Mar 10 04:13:14 2014
@@ -36,7 +36,7 @@ import org.apache.roller.weblogger.ui.st
public abstract class PingTargetsBase extends UIAction {
// list of available ping targets
- private List pingTargets = Collections.EMPTY_LIST;
+ private List<PingTarget> pingTargets = Collections.emptyList();
// ping target we are working on, if any
private PingTarget pingTarget = null;
@@ -124,11 +124,11 @@ public abstract class PingTargetsBase ex
}
- public List getPingTargets() {
+ public List<PingTarget> getPingTargets() {
return pingTargets;
}
- public void setPingTargets(List pingTargets) {
+ public void setPingTargets(List<PingTarget> pingTargets) {
this.pingTargets = pingTargets;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
Mon Mar 10 04:13:14 2014
@@ -27,6 +27,7 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
@@ -99,21 +100,21 @@ public class MainMenu extends UIAction {
return SUCCESS;
}
- public List getExistingPermissions() {
+ public List<WeblogPermission> getExistingPermissions() {
try {
UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
return mgr.getWeblogPermissions(getAuthenticatedUser());
} catch(Exception e) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
}
- public List getPendingPermissions() {
+ public List<WeblogPermission> getPendingPermissions() {
try {
UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
return mgr.getPendingWeblogPermissions(getAuthenticatedUser());
} catch(Exception e) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
Mon Mar 10 04:13:14 2014
@@ -101,7 +101,7 @@ public class Entries extends UIAction {
COUNT + 1);
entries = new ArrayList<WeblogEntry>();
entries.addAll(rawEntries);
- if (entries != null && entries.size() > 0) {
+ if (entries.size() > 0) {
log.debug("query found "+rawEntries.size()+" results");
if(rawEntries.size() > COUNT) {
@@ -129,7 +129,7 @@ public class Entries extends UIAction {
// use the action data to build a url representing this action, including
query data
private String buildBaseUrl() {
- Map<String, String> params = new HashMap();
+ Map<String, String> params = new HashMap<String, String>();
if(!StringUtils.isEmpty(getBean().getCategoryPath())) {
params.put("bean.categoryPath", getBean().getCategoryPath());
@@ -164,13 +164,13 @@ public class Entries extends UIAction {
public List<WeblogCategory> getCategories() {
// make list of categories with first option being being a transient
// category just meant to represent the default option of any category
- List<WeblogCategory> cats = new ArrayList();
+ List<WeblogCategory> cats = new ArrayList<WeblogCategory>();
WeblogCategory tmpCat = new WeblogCategory();
tmpCat.setName("Any");
cats.add(tmpCat);
- List<WeblogCategory> weblogCats = Collections.EMPTY_LIST;
+ List<WeblogCategory> weblogCats = Collections.emptyList();
try {
WeblogEntryManager wmgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
weblogCats = wmgr.getWeblogCategories(getActionWeblog());
@@ -185,7 +185,7 @@ public class Entries extends UIAction {
public List<KeyValueObject> getSortByOptions() {
- List<KeyValueObject> opts = new ArrayList();
+ List<KeyValueObject> opts = new ArrayList<KeyValueObject>();
opts.add(new KeyValueObject("pubTime",
getText("weblogEntryQuery.label.pubTime")));
opts.add(new KeyValueObject("updateTime",
getText("weblogEntryQuery.label.updateTime")));
@@ -194,7 +194,7 @@ public class Entries extends UIAction {
}
public List<KeyValueObject> getStatusOptions() {
- List<KeyValueObject> opts = new ArrayList();
+ List<KeyValueObject> opts = new ArrayList<KeyValueObject>();
opts.add(new KeyValueObject("ALL",
getText("weblogEntryQuery.label.allEntries")));
opts.add(new KeyValueObject("DRAFT",
getText("weblogEntryQuery.label.draftOnly")));
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAdd.java
Mon Mar 10 04:13:14 2014
@@ -237,7 +237,7 @@ public final class EntryAdd extends Entr
log.error(
"Error getting category list for weblog
- " + getWeblog(),
ex);
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBase.java
Mon Mar 10 04:13:14 2014
@@ -80,7 +80,7 @@ public abstract class EntryBase extends
* @return List of WeblogEntryData objects.
*/
public List<WeblogEntry> getRecentPublishedEntries() {
- List<WeblogEntry> entries = Collections.EMPTY_LIST;
+ List<WeblogEntry> entries = Collections.emptyList();
try {
entries =
WebloggerFactory.getWeblogger().getWeblogEntryManager()
.getWeblogEntries(
@@ -106,7 +106,7 @@ public abstract class EntryBase extends
* @return List of WeblogEntryData objects.
*/
public List<WeblogEntry> getRecentScheduledEntries() {
- List<WeblogEntry> entries = Collections.EMPTY_LIST;
+ List<WeblogEntry> entries = Collections.emptyList();
try {
entries =
WebloggerFactory.getWeblogger().getWeblogEntryManager()
.getWeblogEntries(
@@ -132,7 +132,7 @@ public abstract class EntryBase extends
* @return List of WeblogEntryData objects.
*/
public List<WeblogEntry> getRecentDraftEntries() {
- List<WeblogEntry> entries = Collections.EMPTY_LIST;
+ List<WeblogEntry> entries = Collections.emptyList();
try {
entries =
WebloggerFactory.getWeblogger().getWeblogEntryManager()
.getWeblogEntries(
@@ -157,7 +157,7 @@ public abstract class EntryBase extends
* @return List of WeblogEntryData objects.
*/
public List<WeblogEntry> getRecentPendingEntries() {
- List<WeblogEntry> entries = Collections.EMPTY_LIST;
+ List<WeblogEntry> entries = Collections.emptyList();
try {
entries =
WebloggerFactory.getWeblogger().getWeblogEntryManager()
.getWeblogEntries(
@@ -176,7 +176,7 @@ public abstract class EntryBase extends
}
public List<WeblogEntryPlugin> getEntryPlugins() {
- List<WeblogEntryPlugin> availablePlugins =
Collections.EMPTY_LIST;
+ List<WeblogEntryPlugin> availablePlugins =
Collections.emptyList();
try {
PluginManager ppmgr = WebloggerFactory.getWeblogger()
.getPluginManager();
@@ -184,7 +184,7 @@ public abstract class EntryBase extends
.getWeblogEntryPlugins(getActionWeblog());
if (plugins.size() > 0) {
- availablePlugins = new ArrayList();
+ availablePlugins = new
ArrayList<WeblogEntryPlugin>();
for (WeblogEntryPlugin plugin :
plugins.values()) {
availablePlugins.add(plugin);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
Mon Mar 10 04:13:14 2014
@@ -323,7 +323,7 @@ public final class EntryEdit extends Ent
log.error(
"Error getting category list for weblog - " + getWeblog(),
ex);
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Pings.java
Mon Mar 10 04:13:14 2014
@@ -54,7 +54,7 @@ public class Pings extends UIAction {
private PingTarget pingTarget = null;
// commong ping targets list
- private List<PingTarget> commonPingTargets = Collections.EMPTY_LIST;
+ private List<PingTarget> commonPingTargets = Collections.emptyList();
// track the enabled/disabled status for pings
private Map pingStatus = Collections.EMPTY_MAP;
@@ -212,7 +212,7 @@ public class Pings extends UIAction {
// Build isEnabled map (keyed by ping target id and values
Boolean.TRUE/Boolean.FALSE)
Map<String, Boolean> isEnabled = new HashMap<String, Boolean>();
- List<AutoPing> autoPings = Collections.EMPTY_LIST;
+ List<AutoPing> autoPings = Collections.emptyList();
try {
autoPings = autoPingMgr.getAutoPingsByWebsite(getActionWeblog());
} catch (WebloggerException ex) {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java
Mon Mar 10 04:13:14 2014
@@ -38,7 +38,7 @@ public class Referrers extends UIAction
private static Log log = LogFactory.getLog(Referrers.class);
// list of referrers to display
- private List<WeblogReferrer> referrers = Collections.EMPTY_LIST;
+ private List<WeblogReferrer> referrers = Collections.emptyList();
// referrers hits today
private int dayHits = 0;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java
Mon Mar 10 04:13:14 2014
@@ -42,10 +42,10 @@ public class Templates extends UIAction
private static Log log = LogFactory.getLog(Templates.class);
// list of templates to display
- private List<WeblogTemplate> templates = Collections.EMPTY_LIST;
+ private List<WeblogTemplate> templates = Collections.emptyList();
// list of template action types user is allowed to create
- private List availableActions = Collections.EMPTY_LIST;
+ private List availableActions = Collections.emptyList();
// name and action of new template if we are adding a template
private String newTmplName = null;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
Mon Mar 10 04:13:14 2014
@@ -49,7 +49,7 @@ public class TemplatesRemove extends UIA
private String ids = null;
// list of templates to display
- private List<WeblogTemplate> templates = Collections.emptyList();;
+ private List<WeblogTemplate> templates = Collections.emptyList();
public TemplatesRemove() {
this.actionName = "templatesRemove";
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
Mon Mar 10 04:13:14 2014
@@ -51,13 +51,13 @@ public class WeblogConfig extends UIActi
private WeblogConfigBean bean = new WeblogConfigBean();
// categories list
- private List weblogCategories = Collections.EMPTY_LIST;
+ private List weblogCategories = Collections.emptyList();
// list of available editors
- private List editorsList = Collections.EMPTY_LIST;
+ private List editorsList = Collections.emptyList();
// list of available plugins
- private List pluginsList = Collections.EMPTY_LIST;
+ private List pluginsList = Collections.emptyList();
public WeblogConfig() {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java?rev=1575805&r1=1575804&r2=1575805&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Utilities.java
Mon Mar 10 04:13:14 2014
@@ -985,7 +985,7 @@ public class Utilities {
public static List splitStringAsTags(String tags) {
String[] tagsarr = StringUtils.split(tags, TAG_SPLIT_CHARS);
if (tagsarr == null) {
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
return Arrays.asList(tagsarr);
}
