Author: gmazza
Date: Sat Sep 7 23:46:18 2013
New Revision: 1520821
URL: http://svn.apache.org/r1520821
Log:
Various Sonar complaints fixed.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java?rev=1520821&r1=1520820&r2=1520821&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/SubscriptionEntry.java
Sat Sep 7 23:46:18 2013
@@ -68,8 +68,12 @@ public class SubscriptionEntry implement
* Compare planet entries by comparing permalinks.
*/
public boolean equals(Object other) {
- if(this == other) return true;
- if(!(other instanceof SubscriptionEntry)) return false;
+ if (this == other) {
+ return true;
+ }
+ if (!(other instanceof SubscriptionEntry)) {
+ return false;
+ }
final SubscriptionEntry that = (SubscriptionEntry) other;
return getPermalink().equals(that.getPermalink());
}
@@ -236,7 +240,9 @@ public class SubscriptionEntry implement
while (cats.hasNext()) {
String cat = (String)cats.next();
sb.append(cat);
- if (cats.hasNext()) sb.append(",");
+ if (cats.hasNext()) {
+ sb.append(",");
+ }
}
categoriesString = sb.toString();
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java?rev=1520821&r1=1520820&r2=1520821&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
Sat Sep 7 23:46:18 2013
@@ -406,9 +406,15 @@ public abstract class WebloggerImpl impl
public void shutdown() {
try {
HitCountQueue.getInstance().shutdown();
- if (getReferrerQueueManager() != null)
getReferrerQueueManager().shutdown();
- if (indexManager != null) indexManager.shutdown();
- if (threadManager != null) threadManager.shutdown();
+ if (getReferrerQueueManager() != null) {
+ getReferrerQueueManager().shutdown();
+ }
+ if (indexManager != null) {
+ indexManager.shutdown();
+ }
+ if (threadManager != null) {
+ threadManager.shutdown();
+ }
} catch(Exception e) {
log.error("Error calling Roller.shutdown()", e);
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java?rev=1520821&r1=1520820&r2=1520821&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java
Sat Sep 7 23:46:18 2013
@@ -48,8 +48,8 @@ import java.util.Set;
* @author <a href="mailto:[email protected]";>Anil Gangolli</a>
* @author llavandowska (for code refactored from the now-defunct
<code>RollerXmlRpcClient</code>)
*/
-public class WeblogUpdatePinger {
- public static final Log logger =
LogFactory.getLog(WeblogUpdatePinger.class);
+public final class WeblogUpdatePinger {
+ public static final Log LOGGER =
LogFactory.getLog(WeblogUpdatePinger.class);
/**
* Conveys a ping result.
@@ -109,8 +109,8 @@ public class WeblogUpdatePinger {
params.add(website.getName());
}
params.add(websiteUrl);
- if (logger.isDebugEnabled()) {
- logger.debug("Executing ping to '" + pingTargetUrl + "' for
website '" + websiteUrl + "' (" + website.getName() + ")" +
(variantOptions.isEmpty() ? "" : " with variant options " + variantOptions));
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Executing ping to '" + pingTargetUrl + "' for
website '" + websiteUrl + "' (" + website.getName() + ")" +
(variantOptions.isEmpty() ? "" : " with variant options " + variantOptions));
}
// Send the ping.
@@ -120,13 +120,17 @@ public class WeblogUpdatePinger {
client.setConfig(config);
PingResult pingResult =
parseResult(client.execute("weblogUpdates.ping", params.toArray()));
- if (logger.isDebugEnabled()) logger.debug("Ping result is: " +
pingResult);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Ping result is: " + pingResult);
+ }
return pingResult;
}
private static PingResult parseResult(Object obj) {
// Deal with the fact that some buggy ping targets may not respond
with the proper struct type.
- if (obj == null) return new PingResult(null,null);
+ if (obj == null) {
+ return new PingResult(null,null);
+ }
try {
// normal case: response is a struct (represented as a Map) with
Boolean flerror and String fields.
Map result = (Map) obj;
@@ -134,7 +138,9 @@ public class WeblogUpdatePinger {
} catch (Exception ex) {
// exception case: The caller responded with an unexpected type,
though parsed at the basic XML RPC level.
// This effectively assumes flerror = false, and sets message =
obj.toString();
- if (logger.isDebugEnabled()) logger.debug("Invalid ping result of
type: " + obj.getClass().getName() + "; proceeding with stand-in
representative.");
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Invalid ping result of type: " +
obj.getClass().getName() + "; proceeding with stand-in representative.");
+ }
return new PingResult(null,obj.toString());
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java?rev=1520821&r1=1520820&r2=1520821&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
Sat Sep 7 23:46:18 2013
@@ -131,7 +131,7 @@ public class PluginManagerImpl implement
if (commentPlugins.size() > 0) {
for( WeblogEntryCommentPlugin plugin : commentPlugins ) {
if(comment.getPlugins() != null &&
- comment.getPlugins().indexOf(plugin.getId()) != -1) {
+ comment.getPlugins().contains(plugin.getId())) {
log.debug("Invoking comment plugin "+plugin.getId());
content = plugin.render(comment, content);
}
@@ -152,12 +152,16 @@ public class PluginManagerImpl implement
log.debug("Initializing page plugins");
String pluginStr = WebloggerConfig.getProperty("plugins.page");
- if (log.isDebugEnabled()) log.debug(pluginStr);
+ if (log.isDebugEnabled()) {
+ log.debug(pluginStr);
+ }
if (pluginStr != null) {
String[] plugins = StringUtils.stripAll(
StringUtils.split(pluginStr, ",") );
for (int i=0; i<plugins.length; i++) {
- if (log.isDebugEnabled()) log.debug("try " + plugins[i]);
+ if (log.isDebugEnabled()) {
+ log.debug("try " + plugins[i]);
+ }
try {
Class pluginClass = Class.forName(plugins[i]);
if (isPagePlugin(pluginClass)) {
@@ -219,7 +223,9 @@ public class PluginManagerImpl implement
private static boolean isPagePlugin(Class pluginClass) {
Class[] interfaces = pluginClass.getInterfaces();
for (int i=0; i<interfaces.length; i++) {
- if (interfaces[i].equals(WeblogEntryPlugin.class)) return true;
+ if (interfaces[i].equals(WeblogEntryPlugin.class)) {
+ return true;
+ }
}
return false;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java?rev=1520821&r1=1520820&r2=1520821&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/BookmarkPlugin.java
Sat Sep 7 23:46:18 2013
@@ -112,7 +112,9 @@ public class BookmarkPlugin implements W
while (bookmarks.hasNext()) {
WeblogBookmark bookmark = (WeblogBookmark)bookmarks.next();
String bkDescription = bookmark.getDescription();
- if (bkDescription == null) bkDescription = "";
+ if (bkDescription == null) {
+ bkDescription = "";
+ }
String bookmarkLink = "<a href=\"" +
bookmark.getUrl() + "\" title=\"" +
bkDescription + "\">" +
@@ -136,10 +138,14 @@ public class BookmarkPlugin implements W
inLink++;
} else if (m.group(3) != null) {
// closing anchor tag </a>, but ignore nonmatching ones
- if (inLink > 0) inLink--;
+ if (inLink > 0) {
+ inLink--;
+ }
} else if (m.group(4) != null) {
// matched the bookmark -- replace, but only if not
within a link tag.
- if (inLink == 0) m.appendReplacement(textBuf,
bookmarkLink);
+ if (inLink == 0) {
+ m.appendReplacement(textBuf, bookmarkLink);
+ }
}
// Any remaining case indicates a bug. One could add an
else with assertion here. Conservatively don't substitute.
}
@@ -150,7 +156,7 @@ public class BookmarkPlugin implements W
mLogger.warn("Failed to substitute for bookmark [" +
bookmark.getName() + "] due to regular expression characters.");
}
}
- return workingText.toString();
+ return workingText;
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java?rev=1520821&r1=1520820&r2=1520821&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
Sat Sep 7 23:46:18 2013
@@ -35,13 +35,11 @@ import org.apache.roller.weblogger.pojos
* A WeblogTheme custom defined by the weblog owner.
*/
public class WeblogCustomTheme extends WeblogTheme {
-
-
+
public WeblogCustomTheme(Weblog weblog) {
super(weblog);
}
-
-
+
public String getId() {
return CUSTOM;
}
@@ -103,8 +101,9 @@ public class WeblogCustomTheme extends W
* Returns null if the template cannot be found.
*/
public ThemeTemplate getTemplateByAction(String action) throws
WebloggerException {
- if(action == null)
+ if (action == null) {
return null;
+ }
return
WebloggerFactory.getWeblogger().getWeblogManager().getPageByAction(this.weblog,
action);
}
@@ -115,8 +114,9 @@ public class WeblogCustomTheme extends W
* Returns null if the template cannot be found.
*/
public ThemeTemplate getTemplateByName(String name) throws
WebloggerException {
- if(name == null)
+ if (name == null) {
return null;
+ }
return
WebloggerFactory.getWeblogger().getWeblogManager().getPageByName(this.weblog,
name);
}
@@ -127,10 +127,11 @@ public class WeblogCustomTheme extends W
* Returns null if the template cannot be found.
*/
public ThemeTemplate getTemplateByLink(String link) throws
WebloggerException {
- if(link == null)
+ if (link == null) {
return null;
+ }
- return
WebloggerFactory.getWeblogger().getWeblogManager().getPageByLink(this.weblog,
link);
+ return
WebloggerFactory.getWeblogger().getWeblogManager().getPageByLink(this.weblog,
link);
}
@@ -147,7 +148,6 @@ public class WeblogCustomTheme extends W
WebloggerFactory.getWeblogger().getMediaFileManager();
MediaFile mf = mmgr.getMediaFileByOriginalPath(
this.weblog, path);
-
} catch (WebloggerException ex) {
// ignored, resource considered not found
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java?rev=1520821&r1=1520820&r2=1520821&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/runtime/RuntimeConfigDefsParser.java
Sat Sep 7 23:46:18 2013
@@ -52,8 +52,9 @@ public class RuntimeConfigDefsParser {
public RuntimeConfigDefs unmarshall(InputStream instream)
throws IOException, JDOMException {
- if(instream == null)
+ if(instream == null) {
throw new IOException("InputStream is null!");
+ }
RuntimeConfigDefs configs = new RuntimeConfigDefs();
@@ -80,8 +81,7 @@ public class RuntimeConfigDefsParser {
List displaygroups = element.getChildren("display-group");
Iterator iter = displaygroups.iterator();
- while (iter.hasNext())
- {
+ while (iter.hasNext()) {
Element e = (Element) iter.next();
configdef.addDisplayGroup(this.elementToDisplayGroup(e));
}
@@ -119,11 +119,13 @@ public class RuntimeConfigDefsParser {
prop.setDefaultValue(element.getChildText("default-value"));
// optional elements
- if(element.getChild("rows") != null)
+ if (element.getChild("rows") != null) {
prop.setRows(element.getChildText("rows"));
+ }
- if(element.getChild("cols") != null)
+ if (element.getChild("cols") != null) {
prop.setCols(element.getChildText("cols"));
+ }
return prop;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java?rev=1520821&r1=1520820&r2=1520821&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/AutoPing.java
Sat Sep 7 23:46:18 2013
@@ -75,7 +75,9 @@ public class AutoPing implements Seriali
*/
public void setId(String id) {
// Form bean workaround: empty string is never a valid id
- if (id != null && id.trim().length() == 0) return;
+ if (id != null && id.trim().length() == 0) {
+ return;
+ }
this.id = id;
}
@@ -118,7 +120,7 @@ public class AutoPing implements Seriali
//------------------------------------------------------- Good citizenship
public String toString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append("{");
buf.append(getId());
buf.append("}");
@@ -126,8 +128,12 @@ public class AutoPing implements Seriali
}
public boolean equals(Object other) {
- if (other == this) return true;
- if (other instanceof AutoPing != true) return false;
+ if (other == this) {
+ return true;
+ }
+ if (!(other instanceof AutoPing)) {
+ return false;
+ }
AutoPing o = (AutoPing)other;
return new EqualsBuilder()
.append(getId(), o.getId())
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java?rev=1520821&r1=1520820&r2=1520821&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
Sat Sep 7 23:46:18 2013
@@ -43,8 +43,6 @@ import org.apache.roller.weblogger.util.
*/
public abstract class AbstractWeblogEntriesPager implements WeblogEntriesPager
{
- private static Log log =
LogFactory.getLog(AbstractWeblogEntriesPager.class);
-
// message utils for doing i18n messages
I18nMessages messageUtils = null;
@@ -83,8 +81,9 @@ public abstract class AbstractWeblogEntr
this.dateString = dateString;
this.catPath = catPath;
- if(tags != null)
- this.tags = tags;
+ if (tags != null) {
+ this.tags = tags;
+ }
// make sure offset, length, and page are valid
int maxLength =
WebloggerRuntimeConfig.getIntProperty("site.pages.maxEntries");
@@ -199,7 +198,9 @@ public abstract class AbstractWeblogEntr
// make sure the requested date is not in the future
Date today = getToday();
- if (ret.after(today)) ret = today;
+ if (ret.after(today)) {
+ ret = today;
+ }
}
if ( dateString!=null
&& dateString.length()==6
@@ -210,7 +211,9 @@ public abstract class AbstractWeblogEntr
// make sure the requested date is not in the future
Date today = getToday();
- if (ret.after(today)) ret = today;
+ if (ret.after(today)) {
+ ret = today;
+ }
}
return ret;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java?rev=1520821&r1=1520820&r2=1520821&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesPermalinkPager.java
Sat Sep 7 23:46:18 2013
@@ -69,16 +69,18 @@ public class WeblogEntriesPermalinkPager
public Map getEntries() {
- if (entries == null) try {
- Weblogger roller = WebloggerFactory.getWeblogger();
- WeblogEntryManager wmgr = roller.getWeblogEntryManager();
- currEntry = wmgr.getWeblogEntryByAnchor(weblog, entryAnchor);
- if (currEntry != null &&
currEntry.getStatus().equals(WeblogEntry.PUBLISHED)) {
- entries = new TreeMap();
- entries.put(new
Date(currEntry.getPubTime().getTime()),Collections.singletonList(WeblogEntryWrapper.wrap(currEntry,
urlStrategy)));
+ if (entries == null) {
+ try {
+ Weblogger roller = WebloggerFactory.getWeblogger();
+ WeblogEntryManager wmgr = roller.getWeblogEntryManager();
+ currEntry = wmgr.getWeblogEntryByAnchor(weblog, entryAnchor);
+ if (currEntry != null &&
currEntry.getStatus().equals(WeblogEntry.PUBLISHED)) {
+ entries = new TreeMap();
+ entries.put(new
Date(currEntry.getPubTime().getTime()),Collections.singletonList(WeblogEntryWrapper.wrap(currEntry,
urlStrategy)));
+ }
+ } catch (Exception e) {
+ log.error("ERROR: fetching entry");
}
- } catch (Exception e) {
- log.error("ERROR: fetching entry");
}
@@ -132,17 +134,19 @@ public class WeblogEntriesPermalinkPager
private WeblogEntry getNextEntry() {
- if (nextEntry == null) try {
- Weblogger roller = WebloggerFactory.getWeblogger();
- WeblogEntryManager wmgr = roller.getWeblogEntryManager();
- nextEntry = wmgr.getNextEntry(currEntry, null, locale);
- // make sure that entry is published and not to future
- if (nextEntry != null && nextEntry.getPubTime().after(new Date())
- && nextEntry.getStatus().equals(WeblogEntry.PUBLISHED)) {
- nextEntry = null;
+ if (nextEntry == null) {
+ try {
+ Weblogger roller = WebloggerFactory.getWeblogger();
+ WeblogEntryManager wmgr = roller.getWeblogEntryManager();
+ nextEntry = wmgr.getNextEntry(currEntry, null, locale);
+ // make sure that entry is published and not to future
+ if (nextEntry != null && nextEntry.getPubTime().after(new
Date())
+ &&
nextEntry.getStatus().equals(WeblogEntry.PUBLISHED)) {
+ nextEntry = null;
+ }
+ } catch (WebloggerException e) {
+ log.error("ERROR: getting next entry", e);
}
- } catch (WebloggerException e) {
- log.error("ERROR: getting next entry", e);
}
return nextEntry;
@@ -150,17 +154,19 @@ public class WeblogEntriesPermalinkPager
private WeblogEntry getPrevEntry() {
- if (prevEntry == null) try {
- Weblogger roller = WebloggerFactory.getWeblogger();
- WeblogEntryManager wmgr = roller.getWeblogEntryManager();
- prevEntry = wmgr.getPreviousEntry(currEntry, null, locale);
- // make sure that entry is published and not to future
- if (prevEntry != null && prevEntry.getPubTime().after(new Date())
- && prevEntry.getStatus().equals(WeblogEntry.PUBLISHED)) {
- prevEntry = null;
+ if (prevEntry == null) {
+ try {
+ Weblogger roller = WebloggerFactory.getWeblogger();
+ WeblogEntryManager wmgr = roller.getWeblogEntryManager();
+ prevEntry = wmgr.getPreviousEntry(currEntry, null, locale);
+ // make sure that entry is published and not to future
+ if (prevEntry != null && prevEntry.getPubTime().after(new
Date())
+ &&
prevEntry.getStatus().equals(WeblogEntry.PUBLISHED)) {
+ prevEntry = null;
+ }
+ } catch (WebloggerException e) {
+ log.error("ERROR: getting prev entry", e);
}
- } catch (WebloggerException e) {
- log.error("ERROR: getting prev entry", e);
}
return prevEntry;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java?rev=1520821&r1=1520820&r2=1520821&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
Sat Sep 7 23:46:18 2013
@@ -200,8 +200,9 @@ public class SearchServlet extends HttpS
} catch (WebloggerException ex) {
log.error("Error loading model objects for page", ex);
- if (!response.isCommitted())
+ if (!response.isCommitted()) {
response.reset();
+ }
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
return;
}
@@ -242,8 +243,9 @@ public class SearchServlet extends HttpS
// nobody wants to render my content :(
log.error("Couldn't find renderer for rsd template", e);
- if (!response.isCommitted())
+ if (!response.isCommitted()) {
response.reset();
+ }
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
}
@@ -261,8 +263,9 @@ public class SearchServlet extends HttpS
// bummer, error during rendering
log.error("Error during rendering for rsd template", e);
- if (!response.isCommitted())
+ if (!response.isCommitted()) {
response.reset();
+ }
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?rev=1520821&r1=1520820&r2=1520821&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
Sat Sep 7 23:46:18 2013
@@ -48,7 +48,7 @@ import org.apache.struts2.interceptor.va
public class Register extends UIAction implements ServletRequestAware {
private static Log log = LogFactory.getLog(Register.class);
-
+ private static final String DISABLED_RETURN_CODE = "disabled";
public static final String DEFAULT_ALLOWED_CHARS = "A-Za-z0-9";
// this is a no-no, we should not need this
@@ -86,11 +86,11 @@ public class Register extends UIAction i
if
(!WebloggerRuntimeConfig.getBooleanProperty("users.registration.enabled")
// unless there are 0 users (need to allow creation of first
user)
&&
WebloggerFactory.getWeblogger().getUserManager().getUserCount() != 0) {
- return "disabled";
+ return DISABLED_RETURN_CODE;
}
} catch (Exception e) {
log.error("Error checking user count", e);
- return "disabled";
+ return DISABLED_RETURN_CODE;
}
// For new user default to locale set in browser
@@ -167,104 +167,109 @@ public class Register extends UIAction i
if
(!WebloggerRuntimeConfig.getBooleanProperty("users.registration.enabled")
// unless there are 0 users (need to allow creation of first
user)
&&
WebloggerFactory.getWeblogger().getUserManager().getUserCount() != 0) {
- return "disabled";
+ return DISABLED_RETURN_CODE;
}
} catch (Exception e) {
log.error("Error checking user count", e);
- return "disabled";
+ return DISABLED_RETURN_CODE;
}
myValidate();
- if (!hasActionErrors()) try {
-
- UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
-
- // copy form data into new user pojo
- User ud = new User();
- getBean().copyTo(ud); // doesn't copy password
- ud.setUserName(getBean().getUserName());
- ud.setDateCreated(new java.util.Date());
- ud.setEnabled(Boolean.TRUE);
-
- // If user set both password and passwordConfirm then reset
password
- if (!StringUtils.isEmpty(getBean().getPasswordText()) &&
- !StringUtils.isEmpty(getBean().getPasswordConfirm())) {
- ud.resetPassword(getBean().getPasswordText());
- }
-
- // are we using email activation?
- boolean activationEnabled =
WebloggerRuntimeConfig.getBooleanProperty(
- "user.account.activation.enabled");
- if (activationEnabled) {
- // User account will be enabled after the activation process
- ud.setEnabled(Boolean.FALSE);
-
- // Create & save the activation data
- String activationCode = UUID.randomUUID().toString();
-
- if (mgr.getUserByActivationCode(activationCode) != null) {
- // In the *extremely* unlikely event that we generate an
- // activation code that is already use, we'll retry 3
times.
- int numOfRetries = 3;
- if (numOfRetries < 1) numOfRetries = 1;
- for (int i = 0; i < numOfRetries; i++) {
- activationCode = UUID.randomUUID().toString();
- if (mgr.getUserByActivationCode(activationCode) ==
null) {
- break;
- } else {
- activationCode = null;
+ if (!hasActionErrors()) {
+ try {
+
+ UserManager mgr =
WebloggerFactory.getWeblogger().getUserManager();
+
+ // copy form data into new user pojo
+ User ud = new User();
+ // copyTo skips password
+ getBean().copyTo(ud);
+ ud.setUserName(getBean().getUserName());
+ ud.setDateCreated(new java.util.Date());
+ ud.setEnabled(Boolean.TRUE);
+
+ // If user set both password and passwordConfirm then reset
password
+ if (!StringUtils.isEmpty(getBean().getPasswordText()) &&
+ !StringUtils.isEmpty(getBean().getPasswordConfirm())) {
+ ud.resetPassword(getBean().getPasswordText());
+ }
+
+ // are we using email activation?
+ boolean activationEnabled =
WebloggerRuntimeConfig.getBooleanProperty(
+ "user.account.activation.enabled");
+ if (activationEnabled) {
+ // User account will be enabled after the activation
process
+ ud.setEnabled(Boolean.FALSE);
+
+ // Create & save the activation data
+ String inActivationCode = UUID.randomUUID().toString();
+
+ if (mgr.getUserByActivationCode(inActivationCode) != null)
{
+ // In the *extremely* unlikely event that we generate
an
+ // activation code that is already use, we'll retry 3
times.
+ int numOfRetries = 3;
+ if (numOfRetries < 1) {
+ numOfRetries = 1;
+ }
+ for (int i = 0; i < numOfRetries; i++) {
+ inActivationCode = UUID.randomUUID().toString();
+ if (mgr.getUserByActivationCode(inActivationCode)
== null) {
+ break;
+ } else {
+ inActivationCode = null;
+ }
+ }
+ // In more unlikely event that three retries isn't
enough
+ if (inActivationCode == null){
+ throw new
WebloggerException("error.add.user.activationCodeInUse");
}
}
- // In more unlikely event that three retries isn't enough
- if (activationCode == null){
- throw new
WebloggerException("error.add.user.activationCodeInUse");
+ ud.setActivationCode(inActivationCode);
+ }
+
+ // save new user
+ mgr.addUser(ud);
+
+ String openidurl = getBean().getOpenIdUrl();
+ if (openidurl != null) {
+ if (openidurl.endsWith("/")) {
+ openidurl = openidurl.substring(0, openidurl.length()
- 1);
}
+ mgr.setUserAttribute(
+ ud.getUserName(),
UserAttribute.Attributes.OPENID_URL.toString(),
+ openidurl);
}
- ud.setActivationCode(activationCode);
- }
-
- // save new user
- mgr.addUser(ud);
-
- String openidurl = getBean().getOpenIdUrl();
- if (openidurl != null) {
- if (openidurl.endsWith("/")) {
- openidurl = openidurl.substring(0, openidurl.length() - 1);
- }
- mgr.setUserAttribute(
- ud.getUserName(),
UserAttribute.Attributes.OPENID_URL.toString(),
- openidurl);
- }
-
- WebloggerFactory.getWeblogger().flush();
-
- // now send activation email if necessary
- if (activationEnabled && ud.getActivationCode() != null) {
- try {
- // send activation mail to the user
- MailUtil.sendUserActivationEmail(ud);
- } catch (WebloggerException ex) {
- log.error("Error sending activation email to -
"+ud.getEmailAddress(), ex);
+
+ WebloggerFactory.getWeblogger().flush();
+
+ // now send activation email if necessary
+ if (activationEnabled && ud.getActivationCode() != null) {
+ try {
+ // send activation mail to the user
+ MailUtil.sendUserActivationEmail(ud);
+ } catch (WebloggerException ex) {
+ log.error("Error sending activation email to -
"+ud.getEmailAddress(), ex);
+ }
+
+ setActivationStatus("pending");
}
-
- setActivationStatus("pending");
+
+ // Invalidate session, otherwise new user who was originally
+ // authenticated via LDAP/SSO will remain logged in with
+ // a but without a valid Roller role.
+ getServletRequest().getSession().invalidate();
+
+ // set a special page title
+ setPageTitle("welcome.title");
+
+ return SUCCESS;
+
+ } catch (WebloggerException ex) {
+ log.error("Error adding new user", ex);
+ // TODO: i18n
+ addError("Error adding new user");
}
-
- // Invalidate session, otherwise new user who was originally
- // authenticated via LDAP/SSO will remain logged in with
- // a but without a valid Roller role.
- getServletRequest().getSession().invalidate();
-
- // set a special page title
- setPageTitle("welcome.title");
-
- return SUCCESS;
-
- } catch (WebloggerException ex) {
- log.error("Error adding new user", ex);
- // TODO: i18n
- addError("Error adding new user");
}
return INPUT;
@@ -354,11 +359,10 @@ public class Register extends UIAction i
}
// check password, it is required if OpenID and SSO are disabled
- if (getOpenIdConfiguration().equals("disabled") && !getFromSso()) {
- if (StringUtils.isEmpty(getBean().getPasswordText())) {
+ if (getOpenIdConfiguration().equals("disabled") && !getFromSso()
+ && StringUtils.isEmpty(getBean().getPasswordText())) {
addError("error.add.user.passwordEmpty");
return;
- }
}
// User.password does not allow null, so generate one
@@ -374,17 +378,19 @@ public class Register extends UIAction i
}
// check that username is not taken
- if (!StringUtils.isEmpty(getBean().getUserName())) try {
- UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
- if (mgr.getUserByUserName(getBean().getUserName(), null) != null) {
- addError("error.add.user.userNameInUse");
- // reset user name
- getBean().setUserName(null);
+ if (!StringUtils.isEmpty(getBean().getUserName())) {
+ try {
+ UserManager mgr =
WebloggerFactory.getWeblogger().getUserManager();
+ if (mgr.getUserByUserName(getBean().getUserName(), null) !=
null) {
+ addError("error.add.user.userNameInUse");
+ // reset user name
+ getBean().setUserName(null);
+ }
+ } catch (WebloggerException ex) {
+ log.error("error checking for user", ex);
+ // TODO: i18n
+ addError("unexpected error");
}
- } catch (WebloggerException ex) {
- log.error("error checking for user", ex);
- // TODO: i18n
- addError("unexpected error");
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java?rev=1520821&r1=1520820&r2=1520821&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ThemeEdit.java
Sat Sep 7 23:46:18 2013
@@ -134,51 +134,53 @@ public class ThemeEdit extends UIAction
// do theme import if necessary
SharedTheme t = null;
- if (isImportTheme() &&
!StringUtils.isEmpty(getImportThemeId()))
- try {
- ThemeManager themeMgr =
WebloggerFactory.getWeblogger()
-
.getThemeManager();
- t =
themeMgr.getTheme(getImportThemeId());
-
themeMgr.importTheme(getActionWeblog(), t);
- } catch (Exception re) {
- log.error("Error customizing
theme for weblog - "
- +
getActionWeblog().getHandle(), re);
- // TODO: i18n
- addError("Error importing
theme");
- }
-
- if (!hasActionErrors())
- try {
-
weblog.setEditorTheme(WeblogTheme.CUSTOM);
- log.debug("Saving custom theme
for weblog "
- +
weblog.getHandle());
-
- // save updated weblog and flush
-
WebloggerFactory.getWeblogger().getWeblogManager()
-
.saveWeblog(weblog);
-
WebloggerFactory.getWeblogger().flush();
-
- // make sure to flush the page
cache so ppl can see the
- // change
- CacheManager.invalidate(weblog);
-
- // TODO: i18n
- addMessage("Successfully set
theme to - "
- +
WeblogTheme.CUSTOM);
- if (t != null) {
-
addMessage("Successfully copied templates from theme - "
- +
t.getName());
- }
-
- // reset import theme options
- setImportTheme(false);
- setImportThemeId(null);
-
- } catch (WebloggerException re) {
- log.error("Error saving weblog
- "
- +
getActionWeblog().getHandle(), re);
- addError("Error setting theme");
- }
+ if (isImportTheme() &&
!StringUtils.isEmpty(getImportThemeId())) {
+ try {
+ ThemeManager themeMgr = WebloggerFactory.getWeblogger()
+ .getThemeManager();
+ t = themeMgr.getTheme(getImportThemeId());
+ themeMgr.importTheme(getActionWeblog(), t);
+ } catch (Exception re) {
+ log.error("Error customizing theme for weblog - "
+ + getActionWeblog().getHandle(), re);
+ // TODO: i18n
+ addError("Error importing theme");
+ }
+ }
+
+ if (!hasActionErrors()) {
+ try {
+ weblog.setEditorTheme(WeblogTheme.CUSTOM);
+ log.debug("Saving custom theme for weblog "
+ + weblog.getHandle());
+
+ // save updated weblog and flush
+ WebloggerFactory.getWeblogger().getWeblogManager()
+ .saveWeblog(weblog);
+ WebloggerFactory.getWeblogger().flush();
+
+ // make sure to flush the page cache so ppl can see the
+ // change
+ CacheManager.invalidate(weblog);
+
+ // TODO: i18n
+ addMessage("Successfully set theme to - "
+ + WeblogTheme.CUSTOM);
+ if (t != null) {
+ addMessage("Successfully copied templates from
theme - "
+ + t.getName());
+ }
+
+ // reset import theme options
+ setImportTheme(false);
+ setImportThemeId(null);
+
+ } catch (WebloggerException re) {
+ log.error("Error saving weblog - "
+ + getActionWeblog().getHandle(), re);
+ addError("Error setting theme");
+ }
+ }
} else {
// TODO: i18n
addError("Sorry, custom themes are not
allowed");
@@ -211,30 +213,31 @@ public class ThemeEdit extends UIAction
}
}
- if (!hasActionErrors())
- try {
- weblog.setEditorTheme(getThemeId());
- log.debug("Saving theme " +
getThemeId() + " for weblog "
- + weblog.getHandle());
-
- // save updated weblog and flush
-
WebloggerFactory.getWeblogger().getWeblogManager()
- .saveWeblog(weblog);
- WebloggerFactory.getWeblogger().flush();
-
- // make sure to flush the page cache so
ppl can see the
- // change
- CacheManager.invalidate(weblog);
-
- // TODO: i18n
- addMessage("Successfully set theme to -
"
- + newTheme.getName());
-
- } catch (WebloggerException re) {
- log.error("Error saving weblog - "
- +
getActionWeblog().getHandle(), re);
- addError("Error setting theme");
- }
+ if (!hasActionErrors()) {
+ try {
+ weblog.setEditorTheme(getThemeId());
+ log.debug("Saving theme " + getThemeId() + " for weblog "
+ + weblog.getHandle());
+
+ // save updated weblog and flush
+ WebloggerFactory.getWeblogger().getWeblogManager()
+ .saveWeblog(weblog);
+ WebloggerFactory.getWeblogger().flush();
+
+ // make sure to flush the page cache so ppl can see the
+ // change
+ CacheManager.invalidate(weblog);
+
+ // TODO: i18n
+ addMessage("Successfully set theme to - "
+ + newTheme.getName());
+
+ } catch (WebloggerException re) {
+ log.error("Error saving weblog - "
+ + getActionWeblog().getHandle(), re);
+ addError("Error setting theme");
+ }
+ }
// unknown theme scenario, error
} else {
