Author: gmazza
Date: Fri Sep 6 21:59:44 2013
New Revision: 1520708
URL: http://svn.apache.org/r1520708
Log:
Various Sonar complaints fixed.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAThreadManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/ThemeTemplateWrapper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryWrapper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.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/editor/BookmarkEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
Fri Sep 6 21:59:44 2013
@@ -456,8 +456,9 @@ public class JPAMediaFileManagerImpl imp
public MediaFile getMediaFileByOriginalPath(Weblog weblog, String origpath)
throws WebloggerException {
- if (null == origpath)
+ if (null == origpath) {
return null;
+ }
if (!origpath.startsWith("/")) {
origpath = "/" + origpath;
@@ -543,8 +544,6 @@ public class JPAMediaFileManagerImpl imp
public List<MediaFile> fetchRecentPublicMediaFiles(int length)
throws WebloggerException {
- List<Object> params = new ArrayList<Object>();
- int size = 0;
StringBuilder queryString = new StringBuilder();
queryString
@@ -815,8 +814,8 @@ public class JPAMediaFileManagerImpl imp
upgradeUploadsDir(weblog, user, files[i], subDir);
}
- } else { // a file: create a database record for it
-
+ } else {
+ // a file: create a database record for it
// check to make sure that file does not already exist
if (newDir.hasMediaFile(files[i].getName())) {
log.debug(" Skipping file that already exists: "
@@ -868,10 +867,11 @@ public class JPAMediaFileManagerImpl imp
}
}
- try { // flush changes to this directory
+ try {
+ // flush changes to this directory
roller.flush();
- log.debug("Count of dirs created: " + dirCount);
+ log.debug("Count of dirs created: " + dirCount);
log.debug("Count of files created: " + fileCount);
} catch (WebloggerException ex) {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAThreadManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAThreadManagerImpl.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAThreadManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAThreadManagerImpl.java
Fri Sep 6 21:59:44 2013
@@ -41,9 +41,8 @@ import org.apache.roller.weblogger.pojos
@com.google.inject.Singleton
public class JPAThreadManagerImpl extends ThreadManagerImpl {
- private static final Log log =
LogFactory.getLog(JPAThreadManagerImpl.class);
+ private static final Log LOG =
LogFactory.getLog(JPAThreadManagerImpl.class);
- private final Weblogger roller;
private final JPAPersistenceStrategy strategy;
@@ -51,9 +50,8 @@ public class JPAThreadManagerImpl extend
protected JPAThreadManagerImpl(Weblogger roller, JPAPersistenceStrategy
strat) {
super();
- log.debug("Instantiating JPA Thread Manager");
+ LOG.debug("Instantiating JPA Thread Manager");
- this.roller = roller;
this.strategy = strat;
}
@@ -64,7 +62,7 @@ public class JPAThreadManagerImpl extend
@Override
public boolean registerLease(RollerTask task) {
- log.debug("Attempting to register lease for task - "+task.getName());
+ LOG.debug("Attempting to register lease for task - " + task.getName());
// keep a copy of the current time
Date currentTime = new Date();
@@ -74,59 +72,61 @@ public class JPAThreadManagerImpl extend
try {
taskLock = getTaskLockByName(task.getName());
if(taskLock == null) {
- log.warn("Cannot acquire lease when no tasklock record exists
for task - "+task.getName());
+ LOG.warn("Cannot acquire lease when no tasklock record exists
for task - " + task.getName());
}
} catch (WebloggerException ex) {
- log.warn("Error getting TaskLock", ex);
+ LOG.warn("Error getting TaskLock", ex);
return false;
}
// try to acquire lease
- if(taskLock != null) try {
- // calculate lease expiration time
- Date leaseExpiration = taskLock.getLeaseExpiration();
-
- // calculate run time for task, this is expected time, not actual
time
- // i.e. if a task is meant to run daily at midnight this should
- // reflect 00:00:00 on the current day
- Date runTime = currentTime;
- if("startOfDay".equals(task.getStartTimeDesc())) {
- // start of today
- runTime = DateUtil.getStartOfDay(currentTime);
- } else if("startOfHour".equals(task.getStartTimeDesc())) {
- // start of this hour
- runTime = DateUtil.getStartOfHour(currentTime);
- } else {
- // start of this minute
- runTime = DateUtil.getStartOfMinute(currentTime);
- }
-
- if(log.isDebugEnabled()) {
- log.debug("last run = "+taskLock.getLastRun());
- log.debug("new run time = "+runTime);
- log.debug("last acquired = "+taskLock.getTimeAquired());
- log.debug("time leased = "+taskLock.getTimeLeased());
- log.debug("lease expiration = "+leaseExpiration);
- }
+ if(taskLock != null) {
+ try {
+ // calculate lease expiration time
+ Date leaseExpiration = taskLock.getLeaseExpiration();
+
+ // calculate run time for task, this is expected time, not
actual time
+ // i.e. if a task is meant to run daily at midnight this should
+ // reflect 00:00:00 on the current day
+ Date runTime = currentTime;
+ if("startOfDay".equals(task.getStartTimeDesc())) {
+ // start of today
+ runTime = DateUtil.getStartOfDay(currentTime);
+ } else if("startOfHour".equals(task.getStartTimeDesc())) {
+ // start of this hour
+ runTime = DateUtil.getStartOfHour(currentTime);
+ } else {
+ // start of this minute
+ runTime = DateUtil.getStartOfMinute(currentTime);
+ }
+
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("last run = "+taskLock.getLastRun());
+ LOG.debug("new run time = "+runTime);
+ LOG.debug("last acquired = "+taskLock.getTimeAquired());
+ LOG.debug("time leased = "+taskLock.getTimeLeased());
+ LOG.debug("lease expiration = "+leaseExpiration);
+ }
+
+ Query q = strategy.getNamedUpdate(
+
"TaskLock.updateClient&Timeacquired&Timeleased&LastRunByName&Timeacquired");
+ q.setParameter(1, task.getClientId());
+ q.setParameter(2, Integer.valueOf(task.getLeaseTime()));
+ q.setParameter(3, new Timestamp(runTime.getTime()));
+ q.setParameter(4, task.getName());
+ q.setParameter(5, taskLock.getTimeAquired());
+ q.setParameter(6, new Timestamp(leaseExpiration.getTime()));
+ int result = q.executeUpdate();
+
+ if(result == 1) {
+ strategy.flush();
+ return true;
+ }
- Query q = strategy.getNamedUpdate(
-
"TaskLock.updateClient&Timeacquired&Timeleased&LastRunByName&Timeacquired");
- q.setParameter(1, task.getClientId());
- q.setParameter(2, Integer.valueOf(task.getLeaseTime()));
- q.setParameter(3, new Timestamp(runTime.getTime()));
- q.setParameter(4, task.getName());
- q.setParameter(5, taskLock.getTimeAquired());
- q.setParameter(6, new Timestamp(leaseExpiration.getTime()));
- int result = q.executeUpdate();
-
- if(result == 1) {
- strategy.flush();
- return true;
+ } catch (Exception e) {
+ LOG.warn("Error obtaining lease, assuming race condition.", e);
+ return false;
}
-
- } catch (Exception e) {
- log.warn("Error obtaining lease, assuming race condition.", e);
- return false;
}
return false;
@@ -149,10 +149,10 @@ public class JPAThreadManagerImpl extend
}
} catch (WebloggerException ex) {
- if (log.isDebugEnabled()) {
- log.debug("Error getting TaskLock", ex);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Error getting TaskLock", ex);
} else {
- log.warn("Error getting TaskLock, enable debug for more info");
+ LOG.warn("Error getting TaskLock, enable debug for more info");
}
return false;
}
@@ -172,10 +172,10 @@ public class JPAThreadManagerImpl extend
}
} catch (Exception e) {
- if (log.isDebugEnabled()) {
- log.debug("Error releasing lease", e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Error releasing lease", e);
} else {
- log.warn("Error releasing lease, enable debug for more info");
+ LOG.warn("Error releasing lease, enable debug for more info");
}
return false;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/TopicTagPlugin.java
Fri Sep 6 21:59:44 2013
@@ -98,8 +98,8 @@ import java.util.regex.PatternSyntaxExce
*/
public class TopicTagPlugin implements WeblogEntryPlugin
{
- private static final String version = "0.3";
- private static final Log mLogger =
LogFactory.getFactory().getInstance(TopicTagPlugin.class);
+ private static final String VERSION = "0.3";
+ private static final Log LOG =
LogFactory.getFactory().getInstance(TopicTagPlugin.class);
// Default values of properties that can be set from the web.xml
configuration.
@@ -126,15 +126,13 @@ public class TopicTagPlugin implements W
/**
* Initialize the plugin instance. This sets up the configurable
properties and default topic site.
*
- * @param rreq Plugins may need to access RollerRequest.
- * @param ctx Plugins may place objects into the Velocity Context.
- * @see
PagWeblogEntryPluginit(org.apache.roller.weblogger.presentation.RollerRequest,
org.apache.velocity.context.Context)
+ * @param website Website plugin is attached to.
+ * @see WeblogEntryPlugin#init(Weblog)
*/
public void init(Weblog website) throws WebloggerException
{
- if (mLogger.isDebugEnabled())
- {
- mLogger.debug("TopicTagPlugin v. " + version);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("TopicTagPlugin v. " + VERSION);
}
// Initialize property settings
@@ -145,11 +143,12 @@ public class TopicTagPlugin implements W
// Determine default topic site from bookmark if present
WeblogBookmark defaultTopicBookmark = (WeblogBookmark)
userBookmarks.get(defaultTopicBookmarkName);
- if (defaultTopicBookmark != null) defaultTopicSite =
defaultTopicBookmark.getUrl();
+ if (defaultTopicBookmark != null) {
+ defaultTopicSite = defaultTopicBookmark.getUrl();
+ }
// Append / to defaultTopicSite if it doesn't have it
- if (!defaultTopicSite.endsWith("/"))
- {
+ if (!defaultTopicSite.endsWith("/")) {
defaultTopicSite += "/";
}
@@ -194,7 +193,7 @@ public class TopicTagPlugin implements W
* Apply the plugin to the given entry. Returns the entry text with topic
tags expanded.
*
* @param entry WeblogEntry to which plugin should be applied.
- * @param singleEntry Ignored.
+ * @param str Ignored.
* @return Results of applying plugin to entry.
*/
public String render(WeblogEntry entry, String str)
@@ -310,7 +309,7 @@ public class TopicTagPlugin implements W
}
if (website == null)
{
- mLogger.debug("Init called without website. Skipping bookmark
initialization.");
+ LOG.debug("Init called without website. Skipping bookmark
initialization.");
}
else
{
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/ReferrerProcessingJob.java
Fri Sep 6 21:59:44 2013
@@ -53,8 +53,9 @@ public class ReferrerProcessingJob imple
*/
public void execute() {
- if(this.referrer == null)
+ if(this.referrer == null) {
return;
+ }
mLogger.debug("PROCESSING: "+referrer.getRequestUrl());
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
Fri Sep 6 21:59:44 2013
@@ -203,9 +203,9 @@ public class SearchOperation extends Rea
* @return the results count
*/
public int getResultsCount() {
- if (searchresults == null)
+ if (searchresults == null) {
return -1;
-
+ }
return searchresults.totalHits;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/RollerPermission.java
Fri Sep 6 21:59:44 2013
@@ -55,7 +55,9 @@ public abstract class RollerPermission e
public boolean hasActions(List<String> actionsToCheck) {
List<String> actionList = getActionsAsList();
for (String actionToCheck : actionsToCheck) {
- if (!actionList.contains(actionToCheck)) return false;
+ if (!actionList.contains(actionToCheck)) {
+ return false;
+ }
}
return true;
}
@@ -103,9 +105,6 @@ public abstract class RollerPermission e
* True if permission specifies no actions
*/
public boolean isEmpty() {
- if (getActions() == null || getActions().trim().length() == 0) {
- return true;
- }
- return false;
+ return (getActions() == null || getActions().trim().length() == 0);
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/ThemeTemplateWrapper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/ThemeTemplateWrapper.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/ThemeTemplateWrapper.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/ThemeTemplateWrapper.java
Fri Sep 6 21:59:44 2013
@@ -25,7 +25,7 @@ import org.apache.roller.weblogger.pojos
/**
* Pojo safety wrapper for ThemeTemplate objects.
*/
-public class ThemeTemplateWrapper {
+public final class ThemeTemplateWrapper {
// keep a reference to the wrapped pojo
private final ThemeTemplate pojo;
@@ -34,17 +34,15 @@ public class ThemeTemplateWrapper {
private ThemeTemplateWrapper(ThemeTemplate toWrap) {
this.pojo = toWrap;
}
-
-
+
// wrap the given pojo if it is not null
public static ThemeTemplateWrapper wrap(ThemeTemplate toWrap) {
- if(toWrap != null)
+ if (toWrap != null) {
return new ThemeTemplateWrapper(toWrap);
-
+ }
return null;
}
-
public String getId() {
return this.pojo.getId();
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkWrapper.java
Fri Sep 6 21:59:44 2013
@@ -24,7 +24,7 @@ import org.apache.roller.weblogger.pojos
/**
* Pojo safety wrapper for WeblogBookmark object.
*/
-public class WeblogBookmarkWrapper {
+public final class WeblogBookmarkWrapper {
// keep a reference to the wrapped pojo
private final WeblogBookmark pojo;
@@ -37,8 +37,9 @@ public class WeblogBookmarkWrapper {
// wrap the given pojo if it is not null
public static WeblogBookmarkWrapper wrap(WeblogBookmark toWrap) {
- if(toWrap != null)
+ if(toWrap != null) {
return new WeblogBookmarkWrapper(toWrap);
+ }
return null;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryWrapper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryWrapper.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryWrapper.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogCategoryWrapper.java
Fri Sep 6 21:59:44 2013
@@ -31,7 +31,7 @@ import org.apache.roller.weblogger.pojos
/**
* Pojo safety wrapper for WeblogCategory objects.
*/
-public class WeblogCategoryWrapper {
+public final class WeblogCategoryWrapper {
// keep a reference to the wrapped pojo
private final WeblogCategory pojo;
@@ -49,8 +49,9 @@ public class WeblogCategoryWrapper {
// wrap the given pojo if it is not null
public static WeblogCategoryWrapper wrap(WeblogCategory toWrap,
URLStrategy strat) {
- if(toWrap != null)
+ if (toWrap != null) {
return new WeblogCategoryWrapper(toWrap, strat);
+ }
return null;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryCommentWrapper.java
Fri Sep 6 21:59:44 2013
@@ -30,7 +30,7 @@ import org.apache.roller.weblogger.util.
/**
* Pojo safety wrapper for WeblogEntryComment object.
*/
-public class WeblogEntryCommentWrapper {
+public final class WeblogEntryCommentWrapper {
// keep a reference to the wrapped pojo
private final WeblogEntryComment pojo;
@@ -48,8 +48,9 @@ public class WeblogEntryCommentWrapper {
// wrap the given pojo if it is not null
public static WeblogEntryCommentWrapper wrap(WeblogEntryComment toWrap,
URLStrategy strat) {
- if(toWrap != null)
+ if(toWrap != null) {
return new WeblogEntryCommentWrapper(toWrap, strat);
+ }
return null;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/util/menu/MenuHelper.java
Fri Sep 6 21:59:44 2013
@@ -49,7 +49,9 @@ public class MenuHelper {
private static Log log = LogFactory.getLog(MenuHelper.class);
private static Hashtable menus = new Hashtable();
-
+
+ private MenuHelper() {
+ }
static {
try {
@@ -250,8 +252,9 @@ public class MenuHelper {
private static ParsedMenu unmarshall(InputStream instream)
throws IOException, JDOMException {
- if (instream == null)
+ if (instream == null) {
throw new IOException("InputStream is null!");
+ }
ParsedMenu config = new ParsedMenu();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/mobile/MobileDeviceRepository.java
Fri Sep 6 21:59:44 2013
@@ -31,10 +31,10 @@ public class MobileDeviceRepository {
standard, mobile
}
- public static final String possibleDevices1 =
".*(android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)"
+ public static final String POSSIBLE_DEVICES_1 =
".*(android|avantgo|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)"
+ "|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm(
os)?|phone|p(ixi|re)\\\\/|"
+
"plucker|pocket|psp|symbian|treo|up\\\\.(browser|link)|vodafone|wap|windows
(ce|phone)|xda|xiino).*";
- public static final String possibleDevices2 =
"\"1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\\\-)|"
+ public static final String POSSIBLE_DEVICES_2 =
"\"1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\\\\-)|"
+
"ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\\\\-m|r
|s )|"
+
"avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\\\\-(n|u)|c55\\\\/|capi|ccwa|cdm\\\\-|"
+
"cell|chtm|cldc|cmd\\\\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\\\\-s|devi|dica|dmob|do(c|p)o|ds(12|\\\\-d)|"
@@ -70,8 +70,8 @@ public class MobileDeviceRepository {
userAgent = request.getHeader("User-Agent").toLowerCase();
try {
- return (userAgent.matches(possibleDevices1) || userAgent
- .substring(0, 4).matches(possibleDevices2));
+ return (userAgent.matches(POSSIBLE_DEVICES_1) || userAgent
+ .substring(0, 4).matches(POSSIBLE_DEVICES_2));
} catch (StringIndexOutOfBoundsException e) {
// invalid device
log.error("ERROR invalid userAgent type : " + userAgent);
@@ -106,13 +106,14 @@ public class MobileDeviceRepository {
private static String getCookieValue(Cookie[] cookies, String cookieName,
String defaultValue) {
- if (cookies != null)
+ if (cookies != null) {
for (int i = 0; i < cookies.length; i++) {
Cookie cookie = cookies[i];
if (cookieName.equals(cookie.getName())) {
return (cookie.getValue());
}
}
+ }
return (defaultValue);
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesListPager.java
Fri Sep 6 21:59:44 2013
@@ -110,9 +110,7 @@ public class WeblogEntriesListPager exte
try {
Weblogger roller = WebloggerFactory.getWeblogger();
WeblogEntryManager wmgr = roller.getWeblogEntryManager();
- UserManager umgr = roller.getUserManager();
List rawEntries = wmgr.getWeblogEntries(
-
queryWeblog,
queryUser,
startDate,
@@ -134,7 +132,9 @@ public class WeblogEntriesListPager exte
results.add(WeblogEntryWrapper.wrap(entry,
urlStrategy));
}
}
- if (rawEntries.size() > length) more = true;
+ if (rawEntries.size() > length) {
+ more = true;
+ }
} catch (Exception e) {
log.error("ERROR: fetching weblog entries list", e);
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogFeedRequest.java
Fri Sep 6 21:59:44 2013
@@ -58,8 +58,7 @@ public class WeblogFeedRequest extends W
// heavyweight attributes
private WeblogCategory weblogCategory = null;
-
-
+
public WeblogFeedRequest() {}
@@ -133,9 +132,10 @@ public class WeblogFeedRequest extends W
if(request.getParameter("tags") != null) {
this.tags =
Utilities.splitStringAsTags(request.getParameter("tags"));
int maxSize =
WebloggerConfig.getIntProperty("tags.queries.maxIntersectionSize", 3);
- if (this.tags.size() > maxSize)
+ if (this.tags.size() > maxSize) {
throw new InvalidRequestException("max number of tags allowed
is " + maxSize + ", "
- + request.getRequestURL());
+ + request.getRequestURL());
+ }
}
if(request.getParameter("excerpts") != null) {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/WeblogPageRequest.java
Fri Sep 6 21:59:44 2013
@@ -66,11 +66,9 @@ public class WeblogPageRequest extends W
private WeblogEntry weblogEntry = null;
private ThemeTemplate weblogPage = null;
private WeblogCategory weblogCategory = null;
-
-
+
public WeblogPageRequest() {}
-
-
+
/**
* Construct the WeblogPageRequest by parsing the incoming url
*/
@@ -87,11 +85,11 @@ public class WeblogPageRequest extends W
String pathInfo = this.getPathInfo();
// parse the request object and figure out what we've got
- log.debug("parsing path "+pathInfo);
+ log.debug("parsing path " + pathInfo);
// was this request bound for the right servlet?
if(!isValidDestination(servlet)) {
- throw new InvalidRequestException("invalid destination for
request, "+
+ throw new InvalidRequestException("invalid destination for
request, " +
request.getRequestURL());
}
@@ -149,9 +147,9 @@ public class WeblogPageRequest extends W
String tagsString = pathElements[1].replace('+', ' ');
this.tags =
Utilities.splitStringAsTags(URLUtilities.decode(tagsString));
int maxSize =
WebloggerConfig.getIntProperty("tags.queries.maxIntersectionSize", 3);
- if(this.tags.size() > maxSize)
+ if(this.tags.size() > maxSize) {
throw new InvalidRequestException("max number of tags
allowed is " + maxSize + ", " + request.getRequestURL());
-
+ }
} else {
throw new InvalidRequestException("context "+this.context+
"not supported, "+request.getRequestURL());
@@ -164,12 +162,8 @@ public class WeblogPageRequest extends W
request.getRequestURL());
}
}
-
- } else {
- // default view, weblog homepage
}
-
/*
* parse request parameters
*
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/CreateUser.java
Fri Sep 6 21:59:44 2013
@@ -86,37 +86,40 @@ public class CreateUser extends UIAction
// run some validation
myValidate();
- if (!hasActionErrors()) try {
-
- UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
-
- // copy form data into new user pojo
- User newUser = new User();
- getBean().copyTo(newUser, getLocale()); // doesn't copy password
- newUser.setDateCreated(new java.util.Date());
-
- // set username and password
- newUser.setUserName(getBean().getUserName());
- newUser.resetPassword(getBean().getPassword());
-
- // are we granting the user admin rights?
- if(((CreateUserBean)getBean()).isAdministrator()) {
- mgr.grantRole("admin", newUser);
+ if (!hasActionErrors()) {
+ try {
+
+ UserManager mgr =
WebloggerFactory.getWeblogger().getUserManager();
+
+ // copy form data into new user pojo
+ User newUser = new User();
+ getBean().copyTo(newUser, getLocale());
+ // password not copied
+ newUser.setDateCreated(new java.util.Date());
+
+ // set username and password
+ newUser.setUserName(getBean().getUserName());
+ newUser.resetPassword(getBean().getPassword());
+
+ // are we granting the user admin rights?
+ if(((CreateUserBean)getBean()).isAdministrator()) {
+ mgr.grantRole("admin", newUser);
+ }
+
+ // save new user
+ mgr.addUser(newUser);
+ WebloggerFactory.getWeblogger().flush();
+
+ // TODO: i18n
+ addMessage("New user created");
+
+ return INPUT;
+
+ } catch (WebloggerException e) {
+ log.error("Error adding new user", e);
+ // TODO: i18n
+ addError("Error creating user");
}
-
- // save new user
- mgr.addUser(newUser);
- WebloggerFactory.getWeblogger().flush();
-
- // TODO: i18n
- addMessage("New user created");
-
- return INPUT;
-
- } catch (WebloggerException e) {
- log.error("Error adding new user", e);
- // TODO: i18n
- addError("Error creating user");
}
return INPUT;
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=1520708&r1=1520707&r2=1520708&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
Fri Sep 6 21:59:44 2013
@@ -242,7 +242,9 @@ public class GlobalCommentManagement ext
* Update a list of comments.
*/
public String update() {
- if (!"POST".equals(httpMethod)) return ERROR;
+ if (!"POST".equals(httpMethod)) {
+ return ERROR;
+ }
try {
WeblogEntryManager wmgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
Fri Sep 6 21:59:44 2013
@@ -100,23 +100,23 @@ public class BookmarkEdit extends UIActi
// validation
myValidate();
- if(!hasActionErrors()) try {
-
- getBean().copyTo(getBookmark());
-
- BookmarkManager bmgr =
WebloggerFactory.getWeblogger().getBookmarkManager();
- bmgr.saveBookmark(getBookmark());
- WebloggerFactory.getWeblogger().flush();
-
- CacheManager.invalidate(getBookmark());
-
- // TODO: i18n
- addMessage("bookmark updated");
-
- } catch(Exception ex) {
- log.error("Error saving bookmark", ex);
- // TODO: i18n
- addError("Error saving bookmark");
+ if(!hasActionErrors()) {
+ try {
+ getBean().copyTo(getBookmark());
+
+ BookmarkManager bmgr =
WebloggerFactory.getWeblogger().getBookmarkManager();
+ bmgr.saveBookmark(getBookmark());
+ WebloggerFactory.getWeblogger().flush();
+
+ CacheManager.invalidate(getBookmark());
+
+ // TODO: i18n
+ addMessage("bookmark updated");
+ } catch(Exception ex) {
+ log.error("Error saving bookmark", ex);
+ // TODO: i18n
+ addError("Error saving bookmark");
+ }
}
return INPUT;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
Fri Sep 6 21:59:44 2013
@@ -85,7 +85,7 @@ public class CategoryRemove extends UIAc
public String execute() {
// build list of categories for display
- TreeSet allCategories = new TreeSet(new
WeblogCategoryPathComparator());
+ TreeSet allCategoriesSet = new TreeSet(new
WeblogCategoryPathComparator());
try {
// Build list of all categories, except for current one, sorted by
path.
@@ -93,7 +93,7 @@ public class CategoryRemove extends UIAc
List<WeblogCategory> cats =
wmgr.getWeblogCategories(getActionWeblog(), true);
for(WeblogCategory cat : cats) {
if (!cat.getId().equals(getRemoveId())) {
- allCategories.add(cat);
+ allCategoriesSet.add(cat);
}
}
} catch (WebloggerException ex) {
@@ -102,8 +102,8 @@ public class CategoryRemove extends UIAc
addError("Error building categories list");
}
- if (allCategories.size() > 0) {
- setAllCategories(allCategories);
+ if (allCategoriesSet.size() > 0) {
+ setAllCategories(allCategoriesSet);
}
return INPUT;
@@ -115,31 +115,33 @@ public class CategoryRemove extends UIAc
*/
public String remove() {
- if(getCategory() != null) try {
- WeblogEntryManager wmgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
-
- if(getTargetCategoryId() != null) {
- WeblogCategory target =
wmgr.getWeblogCategory(getTargetCategoryId());
- wmgr.moveWeblogCategoryContents(getCategory(), target);
+ if(getCategory() != null) {
+ try {
+ WeblogEntryManager wmgr =
WebloggerFactory.getWeblogger().getWeblogEntryManager();
+
+ if(getTargetCategoryId() != null) {
+ WeblogCategory target =
wmgr.getWeblogCategory(getTargetCategoryId());
+ wmgr.moveWeblogCategoryContents(getCategory(), target);
+ WebloggerFactory.getWeblogger().flush();
+ }
+
+ // notify cache
+ String id = getCategory().getId();
+ CacheManager.invalidate(getCategory());
+
+ wmgr.removeWeblogCategory(getCategory());
WebloggerFactory.getWeblogger().flush();
+
+ // set category id to parent for next page
+ setRemoveId(id);
+
+ return SUCCESS;
+
+ } catch(Exception ex) {
+ log.error("Error removing category - "+getRemoveId(), ex);
+ // TODO: i18n
+ addError("Error removing category");
}
-
- // notify cache
- String id = getCategory().getId();
- CacheManager.invalidate(getCategory());
-
- wmgr.removeWeblogCategory(getCategory());
- WebloggerFactory.getWeblogger().flush();
-
- // set category id to parent for next page
- setRemoveId(id);
-
- return SUCCESS;
-
- } catch(Exception ex) {
- log.error("Error removing category - "+getRemoveId(), ex);
- // TODO: i18n
- addError("Error removing category");
}
return execute();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
Fri Sep 6 21:59:44 2013
@@ -18,23 +18,25 @@
package org.apache.roller.weblogger.ui.struts2.editor;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.roller.weblogger.WebloggerException;
+import org.apache.roller.weblogger.business.WeblogEntryManager;
+import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.apache.roller.weblogger.pojos.WeblogCategory;
+import org.apache.roller.weblogger.pojos.WeblogEntry;
+import org.apache.roller.weblogger.pojos.WeblogEntryAttribute;
+
import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
import java.util.Set;
import java.util.TimeZone;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.WebloggerException;
-import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.WeblogEntryManager;
-import org.apache.roller.weblogger.pojos.WeblogEntryAttribute;
-import org.apache.roller.weblogger.pojos.WeblogCategory;
-import org.apache.roller.weblogger.pojos.WeblogEntry;
/**
@@ -52,15 +54,14 @@ public class EntryBean {
private String summary = null;
private String text = null;
private String status = null;
- private String weblogHandle = null;
-
+
private String[] plugins = null;
private String dateString = null;
private int hours = 0;
private int minutes = 0;
private int seconds = 0;
private boolean allowComments = true;
- private Integer commentDays = new Integer(0);
+ private Integer commentDays = Integer.valueOf(0);
private boolean rightToLeft = false;
private boolean pinnedToMain = false;
private String enclosureURL = null;
@@ -234,32 +235,34 @@ public class EntryBean {
Timestamp pubtime = null;
- if(!StringUtils.isEmpty(getDateString())) try {
- log.debug("pubtime vals are "+getDateString()+", "+getHours()+",
"+getMinutes()+", "+getSeconds());
-
- // first convert the specified date string into an actual Date obj
- // TODO: at some point this date conversion should be locale
sensitive,
- // however at this point our calendar widget does not take into
account
- // locales and only operates in the standard English US locale.
+ if(!StringUtils.isEmpty(getDateString())) {
+ try {
+ log.debug("pubtime vals are "+getDateString()+",
"+getHours()+", "+getMinutes()+", "+getSeconds());
- // Don't require user add preceding '0' of month and day.
- DateFormat df = new SimpleDateFormat("M/d/yy");
- df.setTimeZone(timezone);
- Date newDate = df.parse(getDateString());
-
- log.debug("dateString yields date - "+newDate);
-
- // Now handle the time from the hour, minute and second combos
- Calendar cal = Calendar.getInstance(timezone,locale);
- cal.setTime(newDate);
- cal.set(Calendar.HOUR_OF_DAY, getHours());
- cal.set(Calendar.MINUTE, getMinutes());
- cal.set(Calendar.SECOND, getSeconds());
- pubtime = new Timestamp(cal.getTimeInMillis());
-
- log.debug("pubtime is "+pubtime);
- } catch(Exception e) {
- log.error("Error calculating pubtime", e);
+ // first convert the specified date string into an actual Date
obj
+ // TODO: at some point this date conversion should be locale
sensitive,
+ // however at this point our calendar widget does not take
into account
+ // locales and only operates in the standard English US locale.
+
+ // Don't require user add preceding '0' of month and day.
+ DateFormat df = new SimpleDateFormat("M/d/yy");
+ df.setTimeZone(timezone);
+ Date newDate = df.parse(getDateString());
+
+ log.debug("dateString yields date - "+newDate);
+
+ // Now handle the time from the hour, minute and second combos
+ Calendar cal = Calendar.getInstance(timezone,locale);
+ cal.setTime(newDate);
+ cal.set(Calendar.HOUR_OF_DAY, getHours());
+ cal.set(Calendar.MINUTE, getMinutes());
+ cal.set(Calendar.SECOND, getSeconds());
+ pubtime = new Timestamp(cal.getTimeInMillis());
+
+ log.debug("pubtime is "+pubtime);
+ } catch(Exception e) {
+ log.error("Error calculating pubtime", e);
+ }
}
return pubtime;
@@ -405,7 +408,7 @@ public class EntryBean {
buf.append("search description =
").append(getSearchDescription()).append("\n");
buf.append("comments = ").append(getAllowComments()).append("\n");
buf.append("commentDays = ").append(getCommentDays()).append("\n");
- buf.append("plugins = ").append(getPlugins()).append("\n");
+ buf.append("plugins =
").append(Arrays.toString(getPlugins())).append("\n");
return buf.toString();
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
Fri Sep 6 21:59:44 2013
@@ -118,37 +118,39 @@ public class TemplateEdit extends UIActi
// validation
myValidate();
- if (!hasActionErrors()) try {
+ if (!hasActionErrors()) {
+ try {
- WeblogTemplate template = getTemplate();
- getBean().copyTo(template);
- template.setLastModified(new Date());
-
- if (getBean().getAutoContentType() == null ||
- !getBean().getAutoContentType().booleanValue()) {
-
template.setOutputContentType(getBean().getManualContentType());
- } else {
- // empty content-type indicates that template uses auto
content-type detection
- template.setOutputContentType(null);
- }
+ WeblogTemplate templateToSave = getTemplate();
+ getBean().copyTo(templateToSave);
+ templateToSave.setLastModified(new Date());
+
+ if (getBean().getAutoContentType() == null ||
+ !getBean().getAutoContentType().booleanValue()) {
+
templateToSave.setOutputContentType(getBean().getManualContentType());
+ } else {
+ // empty content-type indicates that template uses auto
content-type detection
+ templateToSave.setOutputContentType(null);
+ }
- // save template
-
WebloggerFactory.getWeblogger().getWeblogManager().savePage(template);
- log.debug("Saved template: " + template.getId());
-
- //flush
- WebloggerFactory.getWeblogger().flush();
-
- // notify caches
- CacheManager.invalidate(template);
-
- // success message
- addMessage("pageForm.save.success", template.getName());
-
- } catch (Exception ex) {
- log.error("Error updating page - " + getBean().getId(), ex);
- // TODO: i18n
- addError("Error saving template");
+ // save template
+
WebloggerFactory.getWeblogger().getWeblogManager().savePage(templateToSave);
+ log.debug("Saved template: " + templateToSave.getId());
+
+ //flush
+ WebloggerFactory.getWeblogger().flush();
+
+ // notify caches
+ CacheManager.invalidate(templateToSave);
+
+ // success message
+ addMessage("pageForm.save.success", templateToSave.getName());
+
+ } catch (Exception ex) {
+ log.error("Error updating page - " + getBean().getId(), ex);
+ // TODO: i18n
+ addError("Error saving template");
+ }
}
log.debug("Leaving save()");
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java
Fri Sep 6 21:59:44 2013
@@ -50,7 +50,7 @@ import org.apache.roller.weblogger.pojos
* their cached data needs to be invalidated, and the CacheManager makes that
* process easier.
*/
-public class CacheManager {
+public final class CacheManager {
private static Log log = LogFactory.getLog(CacheManager.class);
@@ -83,14 +83,16 @@ public class CacheManager {
" falling back on default", e);
}
- if(cacheFactory == null) try {
- // hmm ... failed to load the specified cache factory
- // lets try our default
- Class factoryClass = Class.forName(DEFAULT_FACTORY);
- cacheFactory = (CacheFactory) factoryClass.newInstance();
- } catch(Exception e) {
- log.fatal("Failed to instantiate a cache factory", e);
- throw new RuntimeException(e);
+ if(cacheFactory == null) {
+ try {
+ // hmm ... failed to load the specified cache factory
+ // lets try our default
+ Class factoryClass = Class.forName(DEFAULT_FACTORY);
+ cacheFactory = (CacheFactory) factoryClass.newInstance();
+ } catch(Exception e) {
+ log.fatal("Failed to instantiate a cache factory", e);
+ throw new RuntimeException(e);
+ }
}
log.info("Cache Manager Initialized.");
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java?rev=1520708&r1=1520707&r2=1520708&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
Fri Sep 6 21:59:44 2013
@@ -312,7 +312,6 @@ public class EntryCollection {
private Entry createAtomEntry(WeblogEntry entry) {
Entry atomEntry = new Entry();
- String absUrl = WebloggerRuntimeConfig.getAbsoluteContextURL();
atomEntry.setId( entry.getPermalink());
atomEntry.setTitle( entry.getTitle());
atomEntry.setPublished( entry.getPubTime());
@@ -449,18 +448,19 @@ public class EntryCollection {
// Now process incoming categories that are tags:
// Atom categories with no scheme are considered tags.
String tags = "";
+ StringBuilder buff = new StringBuilder();
if (categories != null && categories.size() > 0) {
for (int i=0; i<categories.size(); i++) {
Category cat = (Category)categories.get(i);
if (cat.getScheme() == null) {
- tags = tags + " " + cat.getTerm();
+ buff.append(" ").append(cat.getTerm());
}
}
+ tags = buff.toString();
}
rollerEntry.setTagsAsString(tags);
}
-
-
+
private void reindexEntry(WeblogEntry entry) throws WebloggerException {
IndexManager manager = roller.getIndexManager();
