Author: gmazza
Date: Sun Sep 8 14:28:27 2013
New Revision: 1520867
URL: http://svn.apache.org/r1520867
Log:
Various Sonar complaints fixed.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java
roller/trunk/app/src/main/java/org/apache/roller/planet/tasks/GeneratePlanetTask.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.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/servlets/PreviewServlet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/EntryCollection.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java?rev=1520867&r1=1520866&r2=1520867&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/planet/pojos/Subscription.java
Sun Sep 8 14:28:27 2013
@@ -63,8 +63,12 @@ public class Subscription implements Ser
* Determines if subscriptions are equal by comparing feed URLs.
*/
public boolean equals(Object other) {
- if(this == other) return true;
- if(!(other instanceof Subscription)) return false;
+ if (this == other) {
+ return true;
+ }
+ if (!(other instanceof Subscription)) {
+ return false;
+ }
final Subscription that = (Subscription) other;
return this.feedUrl.equals(that.getFeedURL());
}
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=1520867&r1=1520866&r2=1520867&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
Sun Sep 8 14:28:27 2013
@@ -25,7 +25,6 @@ import java.util.Iterator;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.planet.business.PlanetManager;
import org.apache.roller.weblogger.business.Weblogger;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.config.WebloggerConfig;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java?rev=1520867&r1=1520866&r2=1520867&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
Sun Sep 8 14:28:27 2013
@@ -94,8 +94,9 @@ public class JPAUserManagerImpl implemen
public void addUser(User newUser) throws WebloggerException {
- if(newUser == null)
+ if(newUser == null) {
throw new WebloggerException("cannot add null user");
+ }
// TODO BACKEND: we must do this in a better fashion, like
getUserCnt()?
boolean adminUser = false;
@@ -140,8 +141,9 @@ public class JPAUserManagerImpl implemen
public User getUserByUserName(String userName, Boolean enabled)
throws WebloggerException {
- if (userName==null )
+ if (userName==null) {
throw new WebloggerException("userName cannot be null");
+ }
// check cache first
// NOTE: if we ever allow changing usernames then this needs updating
@@ -196,7 +198,6 @@ public class JPAUserManagerImpl implemen
Date endDate, int offset, int length)
throws WebloggerException {
Query query = null;
- List results = null;
// if we are doing date range then we must have an end date
if (startDate != null && endDate == null) {
@@ -272,7 +273,9 @@ public class JPAUserManagerImpl implemen
List results = null;
boolean setRange = offset != 0 || length != -1;
- if (endDate == null) endDate = new Date();
+ if (endDate == null) {
+ endDate = new Date();
+ }
if (enabled != null) {
if (startDate != null) {
@@ -320,8 +323,6 @@ public class JPAUserManagerImpl implemen
*/
public List getUsers(Weblog website, Boolean enabled, int offset, int
length) throws WebloggerException {
Query query = null;
- List results = null;
- boolean setRange = offset != 0 || length != -1;
if (length == -1) {
length = Integer.MAX_VALUE - offset;
@@ -555,11 +556,15 @@ public class JPAUserManagerImpl implemen
existingPerm = getWeblogPermission(permToCheck.getWeblog(),
user);
} catch (WebloggerException ignored) {}
}
- if (existingPerm != null && existingPerm.implies(perm)) return true;
+ if (existingPerm != null && existingPerm.implies(perm)) {
+ return true;
+ }
// user has no existing perm in a weblog, so try his global perms
GlobalPermission globalPerm = new GlobalPermission(user);
- if (globalPerm.implies(perm)) return true;
+ if (globalPerm.implies(perm)) {
+ return true;
+ }
if (log.isDebugEnabled()) {
log.debug("PERM CHECK FAILED: user "+user.getUserName()+" does not
have " + perm.toString());
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java?rev=1520867&r1=1520866&r2=1520867&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/pings/PingQueueProcessor.java
Sun Sep 8 14:28:27 2013
@@ -38,7 +38,7 @@ import org.apache.roller.weblogger.pojos
*/
public class PingQueueProcessor {
- private static final Log logger =
LogFactory.getLog(PingQueueProcessor.class);
+ private static final Log LOGGER =
LogFactory.getLog(PingQueueProcessor.class);
private static PingQueueProcessor theInstance;
@@ -62,11 +62,13 @@ public class PingQueueProcessor {
*/
public static synchronized void init() throws WebloggerException {
if (theInstance != null) {
- logger.warn("Ignoring duplicate initialization of
PingQueueProcessor!");
+ LOGGER.warn("Ignoring duplicate initialization of
PingQueueProcessor!");
return;
}
theInstance = new PingQueueProcessor();
- if (logger.isDebugEnabled()) logger.debug("Ping queue processor
initialized.");
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Ping queue processor initialized.");
+ }
}
@@ -77,13 +79,13 @@ public class PingQueueProcessor {
*/
public synchronized void processQueue() {
if (PingConfig.getSuspendPingProcessing()) {
- logger.info("Ping processing has been suspended. Skipping current
round of ping queue processing.");
+ LOGGER.info("Ping processing has been suspended. Skipping current
round of ping queue processing.");
return;
}
String absoluteContextUrl =
WebloggerRuntimeConfig.getAbsoluteContextURL();
if (absoluteContextUrl == null) {
- logger.warn("WARNING: Skipping current ping queue processing round
because we cannot yet determine the site's absolute context url.");
+ LOGGER.warn("WARNING: Skipping current ping queue processing round
because we cannot yet determine the site's absolute context url.");
return;
}
@@ -93,7 +95,9 @@ public class PingQueueProcessor {
// that.
try {
- if (logger.isDebugEnabled()) logger.debug("Started processing ping
queue.");
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Started processing ping queue.");
+ }
// Get all of the entries
List entries = pingQueueMgr.getAllQueueEntries();
@@ -102,9 +106,11 @@ public class PingQueueProcessor {
PingQueueEntry pingQueueEntry = (PingQueueEntry) i.next();
processQueueEntry(pingQueueEntry);
}
- if (logger.isDebugEnabled()) logger.debug("Finished processing
ping queue.");
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Finished processing ping queue.");
+ }
} catch (Exception ex) {
- logger.error("Unexpected exception processing ping queue!
Aborting this pass of ping queue processing.", ex);
+ LOGGER.error("Unexpected exception processing ping queue!
Aborting this pass of ping queue processing.", ex);
}
}
@@ -117,14 +123,16 @@ public class PingQueueProcessor {
* handled, not thrown.
*/
private void processQueueEntry(PingQueueEntry pingQueueEntry) throws
WebloggerException {
- if (logger.isDebugEnabled()) logger.debug("Processing ping queue
entry: " + pingQueueEntry);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Processing ping queue entry: " + pingQueueEntry);
+ }
PingTarget pingTarget = pingQueueEntry.getPingTarget();
Weblog website = pingQueueEntry.getWebsite();
boolean pingSucceeded = false;
if (PingConfig.getLogPingsOnly()) {
// Just log the ping and pretend it succeeded.
- logger.info("Logging simulated ping for ping queue entry " +
pingQueueEntry);
+ LOGGER.info("Logging simulated ping for ping queue entry " +
pingQueueEntry);
pingSucceeded = true;
} else {
// Actually process the ping
@@ -141,7 +149,9 @@ public class PingQueueProcessor {
}
// We do this outside of the previous try-catch because we don't want
an exception here to be considered a ping error.
if (pingSucceeded) {
- if (logger.isDebugEnabled()) logger.debug("Processed ping: " +
pingQueueEntry);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Processed ping: " + pingQueueEntry);
+ }
pingQueueMgr.removeQueueEntry(pingQueueEntry);
}
}
@@ -160,13 +170,13 @@ public class PingQueueProcessor {
if ((pingQueueEntry.incrementAttempts() <
PingConfig.getMaxPingAttempts()) && WeblogUpdatePinger.shouldRetry(ex)) {
// We have attempts remaining, and it looks like we should retry,
// so requeue the entry for processing on subsequent rounds
- logger.debug("Error on ping attempt (" +
pingQueueEntry.getAttempts() + ") for " + pingQueueEntry + ": [" +
ex.getMessage() + "]. Will re-queue for later attempts.");
- logger.debug("Error on last ping attempt was: ", ex);
+ LOGGER.debug("Error on ping attempt (" +
pingQueueEntry.getAttempts() + ") for " + pingQueueEntry + ": [" +
ex.getMessage() + "]. Will re-queue for later attempts.");
+ LOGGER.debug("Error on last ping attempt was: ", ex);
pingQueueMgr.saveQueueEntry(pingQueueEntry);
} else {
// Remove the entry
- logger.warn("Error on ping attempt (" +
pingQueueEntry.getAttempts() + ") for " + pingQueueEntry + ": [" +
ex.getMessage() + "]. Entry will be REMOVED from ping queue.");
- logger.debug("Error on last ping attempt was: ", ex);
+ LOGGER.warn("Error on ping attempt (" +
pingQueueEntry.getAttempts() + ") for " + pingQueueEntry + ": [" +
ex.getMessage() + "]. Entry will be REMOVED from ping queue.");
+ LOGGER.debug("Error on last ping attempt was: ", ex);
pingQueueMgr.removeQueueEntry(pingQueueEntry);
// TODO: mark ping target invalid?
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java?rev=1520867&r1=1520866&r2=1520867&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/ConvertLineBreaksPlugin.java
Sun Sep 8 14:28:27 2013
@@ -114,8 +114,9 @@ public class ConvertLineBreaksPlugin imp
// if the text ends without an empty line then we need to
// terminate the last paragraph now
- if(insidePara)
+ if(insidePara) {
buf.append("</p>\n\n");
+ }
} catch(Exception e) {
mLogger.warn("trouble rendering text.", e);
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java?rev=1520867&r1=1520866&r2=1520867&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java
Sun Sep 8 14:28:27 2013
@@ -54,14 +54,14 @@ public class WebloggerConfig {
try {
// we'll need this to get at our properties files in the classpath
- Class config_class =
Class.forName("org.apache.roller.weblogger.config.WebloggerConfig");
+ Class configClass =
Class.forName("org.apache.roller.weblogger.config.WebloggerConfig");
// first, lets load our default properties
- InputStream is = config_class.getResourceAsStream(default_config);
+ InputStream is = configClass.getResourceAsStream(default_config);
config.load(is);
// now, see if we can find our custom config
- is = config_class.getResourceAsStream(custom_config);
+ is = configClass.getResourceAsStream(custom_config);
if(is != null) {
config.load(is);
System.out.println("Roller Weblogger: Successfully loaded
custom properties file from classpath");
@@ -151,8 +151,9 @@ public class WebloggerConfig {
public static String getProperty(String key, String defaultValue) {
log.debug("Fetching property
["+key+"="+config.getProperty(key)+",defaultValue="+defaultValue+"]");
String value = config.getProperty(key);
- if(value == null)
- return defaultValue;
+ if (value == null) {
+ return defaultValue;
+ }
return value.trim();
}
@@ -171,10 +172,11 @@ public class WebloggerConfig {
// get the value first, then convert
String value = WebloggerConfig.getProperty(name);
- if(value == null)
+ if(value == null) {
return defaultValue;
+ }
- return (new Boolean(value)).booleanValue();
+ return Boolean.valueOf(value);
}
/**
@@ -191,10 +193,11 @@ public class WebloggerConfig {
// get the value first, then convert
String value = WebloggerConfig.getProperty(name);
- if (value == null)
+ if (value == null) {
return defaultValue;
+ }
- return (new Integer(value)).intValue();
+ return Integer.valueOf(value);
}
/**
@@ -230,8 +233,9 @@ public class WebloggerConfig {
*/
public static void setUploadsDir(String path) {
// only do this if the user wants to use the webapp context
- if("${webapp.context}".equals(config.getProperty("uploads.dir")))
+ if("${webapp.context}".equals(config.getProperty("uploads.dir"))) {
config.setProperty("uploads.dir", path);
+ }
}
/**
@@ -245,8 +249,9 @@ public class WebloggerConfig {
*/
public static void setThemesDir(String path) {
// only do this if the user wants to use the webapp context
- if("${webapp.context}".equals(config.getProperty("themes.dir")))
+ if("${webapp.context}".equals(config.getProperty("themes.dir"))) {
config.setProperty("themes.dir", path);
+ }
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java?rev=1520867&r1=1520866&r2=1520867&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/GlobalPermission.java
Sun Sep 8 14:28:27 2013
@@ -31,7 +31,7 @@ import org.apache.roller.weblogger.util.
* Represents a permission that applies globally to the entire web application.
*/
public class GlobalPermission extends RollerPermission {
- protected String actions;
+ protected String actions;
/** Allowed to login and edit profile */
public static final String LOGIN = "login";
@@ -70,7 +70,7 @@ public class GlobalPermission extends Ro
/**
* Create global permission with the actions specified by array.
- * @param user User of permission.
+ * @param actions actions to add to permission
* @throws org.apache.roller.weblogger.WebloggerException
*/
public GlobalPermission(List<String> actions) throws WebloggerException {
@@ -104,14 +104,20 @@ public class GlobalPermission extends Ro
} else if (hasAction(WEBLOG)) {
// Best we've got is WEBLOG, so make sure perm doesn't specify
ADMIN
for (String action : rperm.getActionsAsList()) {
- if (action.equals(ADMIN)) return false;
+ if (action.equals(ADMIN)) {
+ return false;
+ }
}
} else if (hasAction(LOGIN)) {
// Best we've got is LOGIN, so make sure perm doesn't specify
anything else
for (String action : rperm.getActionsAsList()) {
- if (action.equals(WEBLOG)) return false;
- if (action.equals(ADMIN)) return false;
+ if (action.equals(WEBLOG)) {
+ return false;
+ }
+ if (action.equals(ADMIN)) {
+ return false;
+ }
}
}
return true;
@@ -120,17 +126,7 @@ public class GlobalPermission extends Ro
}
private boolean actionImplies(String action1, String action2) {
- if (action1.equals(ADMIN)) return true;
- if (action1.equals(WEBLOG) && action2.equals(LOGIN)) return true;
- return false;
- }
-
- public boolean equals(Object arg0) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
- public int hashCode() {
- throw new UnsupportedOperationException("Not supported yet.");
+ return action1.equals(ADMIN) || (action1.equals(WEBLOG) &&
action2.equals(LOGIN));
}
public String toString() {
@@ -142,6 +138,14 @@ public class GlobalPermission extends Ro
return sb.toString();
}
+ public boolean equals(Object arg0) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ public int hashCode() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
@Override
public void setActions(String actions) {
this.actions = actions;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java?rev=1520867&r1=1520866&r2=1520867&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/UserAttribute.java
Sun Sep 8 14:28:27 2013
@@ -112,7 +112,7 @@ public class UserAttribute implements Se
if (other == this) {
return true;
}
- if (!(other instanceof UserRole)) {
+ if (!(other instanceof UserAttribute)) {
return false;
}
UserAttribute o = (UserAttribute)other;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java?rev=1520867&r1=1520866&r2=1520867&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.java
Sun Sep 8 14:28:27 2013
@@ -106,7 +106,7 @@ public class WeblogEntryTagAggregate imp
//------------------------------------------------------- Good citizenship
public String toString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append("{");
buf.append(getId());
buf.append(", ").append(getName());
@@ -117,8 +117,12 @@ public class WeblogEntryTagAggregate imp
}
public boolean equals(Object other) {
- if (other == this) return true;
- if (other instanceof WeblogEntryTagAggregate != true) return false;
+ if (other == this) {
+ return true;
+ }
+ if (!(other instanceof WeblogEntryTagAggregate)) {
+ return false;
+ }
WeblogEntryTagAggregate o = (WeblogEntryTagAggregate)other;
return new EqualsBuilder()
.append(getName(), o.getName())
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java?rev=1520867&r1=1520866&r2=1520867&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
Sun Sep 8 14:28:27 2013
@@ -97,18 +97,22 @@ public class WeblogPermission extends Ob
if (hasAction(ADMIN)) {
// admin implies all other permissions
return true;
-
} else if (hasAction(POST)) {
// Best we've got is POST, so make sure perm doesn't specify
ADMIN
for (String action : rperm.getActionsAsList()) {
- if (action.equals(ADMIN)) return false;
+ if (action.equals(ADMIN)) {
+ return false;
+ }
}
-
} else if (hasAction(EDIT_DRAFT)) {
// Best we've got is EDIT_DRAFT, so make sure perm doesn't
specify anything else
for (String action : rperm.getActionsAsList()) {
- if (action.equals(POST)) return false;
- if (action.equals(ADMIN)) return false;
+ if (action.equals(POST)) {
+ return false;
+ }
+ if (action.equals(ADMIN)) {
+ return false;
+ }
}
}
return true;
@@ -126,8 +130,12 @@ public class WeblogPermission extends Ob
}
public boolean equals(Object other) {
- if (other == this) return true;
- if (other instanceof WeblogPermission != true) return false;
+ if (other == this) {
+ return true;
+ }
+ if (!(other instanceof WeblogPermission)) {
+ return false;
+ }
WeblogPermission o = (WeblogPermission)other;
return new EqualsBuilder()
.append(getUserName(), o.getUserName())
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=1520867&r1=1520866&r2=1520867&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
Sun Sep 8 14:28:27 2013
@@ -26,8 +26,6 @@ import java.util.Date;
import java.util.List;
import java.util.Locale;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.util.DateUtil;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java?rev=1520867&r1=1520866&r2=1520867&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PreviewServlet.java
Sun Sep 8 14:28:27 2013
@@ -84,14 +84,9 @@ public class PreviewServlet extends Http
WeblogPreviewRequest previewRequest = null;
- String type = null;
-
try {
previewRequest = new WeblogPreviewRequest(request);
- // type of the page we are going to preview
- type = previewRequest.getType();
-
// lookup weblog specified by preview request
weblog = previewRequest.getWeblog();
if (weblog == null) {
@@ -185,7 +180,9 @@ public class PreviewServlet extends Http
// Still no page? Then that is a 404
if (page == null) {
- if(!response.isCommitted()) response.reset();
+ if (!response.isCommitted()) {
+ response.reset();
+ }
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
}
@@ -227,7 +224,7 @@ public class PreviewServlet extends Http
ModelLoader.loadModels(pageModels, model, initData, true);
// Load special models for site-wide blog
- if(WebloggerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
+ if (WebloggerRuntimeConfig.isSiteWideWeblog(weblog.getHandle())) {
String siteModels =
WebloggerConfig.getProperty("rendering.siteModels");
ModelLoader.loadModels(siteModels, model, initData, true);
}
@@ -238,7 +235,9 @@ public class PreviewServlet extends Http
} catch (WebloggerException ex) {
log.error("ERROR loading model for page", ex);
- if(!response.isCommitted()) response.reset();
+ if (!response.isCommitted()) {
+ response.reset();
+ }
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
return;
}
@@ -253,7 +252,9 @@ public class PreviewServlet extends Http
// nobody wants to render my content :(
log.error("Couldn't find renderer for page "+page.getId(), e);
- if(!response.isCommitted()) response.reset();
+ if (!response.isCommitted()) {
+ response.reset();
+ }
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
}
@@ -271,7 +272,9 @@ public class PreviewServlet extends Http
// bummer, error during rendering
log.error("Error during rendering for page "+page.getId(), e);
- if(!response.isCommitted()) response.reset();
+ 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/editor/Bookmarks.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java?rev=1520867&r1=1520866&r2=1520867&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
Sun Sep 8 14:28:27 2013
@@ -98,7 +98,7 @@ public class Bookmarks extends UIAction
public String execute() {
// build list of folders for display
- TreeSet allFolders = new TreeSet(new FolderPathComparator());
+ TreeSet newFolders = new TreeSet(new FolderPathComparator());
try {
// Build list of all folders, except for current one,
sorted by
@@ -111,20 +111,20 @@ public class Bookmarks extends UIAction
if (getFolderId() == null && fd.getParent() ==
null) {
// Root folder so do not show the root /
} else if (!fd.getId().equals(getFolderId())) {
- allFolders.add(fd);
+ newFolders.add(fd);
}
}
// build folder path
WeblogBookmarkFolder parent = getFolder().getParent();
if (parent != null) {
- List folderPath = new LinkedList();
- folderPath.add(0, getFolder());
+ List inFolderPath = new LinkedList();
+ inFolderPath.add(0, getFolder());
while (parent != null) {
- folderPath.add(0, parent);
+ inFolderPath.add(0, parent);
parent = parent.getParent();
}
- setFolderPath(folderPath);
+ setFolderPath(inFolderPath);
}
} catch (WebloggerException ex) {
log.error("Error building folders list", ex);
@@ -132,8 +132,8 @@ public class Bookmarks extends UIAction
addError("Error building folders list");
}
- if (allFolders.size() > 0) {
- setAllFolders(allFolders);
+ if (newFolders.size() > 0) {
+ setAllFolders(newFolders);
}
return LIST;
@@ -152,12 +152,14 @@ public class Bookmarks extends UIAction
try {
String folders[] = getSelectedFolders();
if (null != folders && folders.length > 0) {
- if (log.isDebugEnabled())
- log.debug("Processing delete of " +
folders.length
- + " folders.");
+ if (log.isDebugEnabled()) {
+ log.debug("Processing delete of " + folders.length
+ + " folders.");
+ }
for (int i = 0; i < folders.length; i++) {
- if (log.isDebugEnabled())
- log.debug("Deleting folder - "
+ folders[i]);
+ if (log.isDebugEnabled()) {
+ log.debug("Deleting folder - " + folders[i]);
+ }
WeblogBookmarkFolder fd =
bmgr.getFolder(folders[i]);
if (fd != null) {
bmgr.removeFolder(fd); //
removes child folders and
@@ -169,9 +171,10 @@ public class Bookmarks extends UIAction
WeblogBookmark bookmark = null;
String bookmarks[] = getSelectedBookmarks();
if (null != bookmarks && bookmarks.length > 0) {
- if (log.isDebugEnabled())
- log.debug("Processing delete of " +
bookmarks.length
- + " bookmarks.");
+ if (log.isDebugEnabled()) {
+ log.debug("Processing delete of " + bookmarks.length
+ + " bookmarks.");
+ }
for (int j = 0; j < bookmarks.length; j++) {
if (log.isDebugEnabled())
log.debug("Deleting bookmark -
" + bookmarks[j]);
@@ -207,9 +210,10 @@ public class Bookmarks extends UIAction
BookmarkManager bmgr = WebloggerFactory.getWeblogger()
.getBookmarkManager();
- if (log.isDebugEnabled())
- log.debug("Moving folders and bookmarks to
folder - "
- + getTargetFolderId());
+ if (log.isDebugEnabled()) {
+ log.debug("Moving folders and bookmarks to folder - "
+ + getTargetFolderId());
+ }
// Move folders to new parent folder.
String folders[] = getSelectedFolders();
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java?rev=1520867&r1=1520866&r2=1520867&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
Sun Sep 8 14:28:27 2013
@@ -59,7 +59,7 @@ public abstract class UIAction extends A
// a common result name used to indicate the result should list some data
public static final String LIST = "list";
-
+
// the authenticated user accessing this action, or null if client is not
logged in
private User authenticatedUser = null;
@@ -171,7 +171,7 @@ public abstract class UIAction extends A
value = WebloggerRuntimeConfig.getProperty(key);
}
- return (value == null) ? 0 : new Integer(value);
+ return (value == null) ? 0 : Integer.valueOf(value);
}
@Override
@@ -374,23 +374,23 @@ public abstract class UIAction extends A
List opts = new ArrayList();
- opts.add(new KeyValueObject(new Integer(0),
getText("weblogEdit.unlimitedCommentDays")));
- opts.add(new KeyValueObject(new Integer(1),
getText("weblogEdit.days1")));
- opts.add(new KeyValueObject(new Integer(2),
getText("weblogEdit.days2")));
- opts.add(new KeyValueObject(new Integer(3),
getText("weblogEdit.days3")));
- opts.add(new KeyValueObject(new Integer(4),
getText("weblogEdit.days4")));
- opts.add(new KeyValueObject(new Integer(5),
getText("weblogEdit.days5")));
- opts.add(new KeyValueObject(new Integer(7),
getText("weblogEdit.days7")));
- opts.add(new KeyValueObject(new Integer(10),
getText("weblogEdit.days10")));
- opts.add(new KeyValueObject(new Integer(20),
getText("weblogEdit.days20")));
- opts.add(new KeyValueObject(new Integer(30),
getText("weblogEdit.days30")));
- opts.add(new KeyValueObject(new Integer(60),
getText("weblogEdit.days60")));
- opts.add(new KeyValueObject(new Integer(90),
getText("weblogEdit.days90")));
+ opts.add(new KeyValueObject(0,
getText("weblogEdit.unlimitedCommentDays")));
+ opts.add(new KeyValueObject(1, getText("weblogEdit.days1")));
+ opts.add(new KeyValueObject(2, getText("weblogEdit.days2")));
+ opts.add(new KeyValueObject(3, getText("weblogEdit.days3")));
+ opts.add(new KeyValueObject(4, getText("weblogEdit.days4")));
+ opts.add(new KeyValueObject(5, getText("weblogEdit.days5")));
+ opts.add(new KeyValueObject(7, getText("weblogEdit.days7")));
+ opts.add(new KeyValueObject(10, getText("weblogEdit.days10")));
+ opts.add(new KeyValueObject(20, getText("weblogEdit.days20")));
+ opts.add(new KeyValueObject(30, getText("weblogEdit.days30")));
+ opts.add(new KeyValueObject(60, getText("weblogEdit.days60")));
+ opts.add(new KeyValueObject(90, getText("weblogEdit.days90")));
return opts;
}
- private static Set OPEN_CHARS = new HashSet(Arrays.asList('$', '%'));
+ private static final Set OPEN_CHARS = new HashSet(Arrays.asList('$', '%'));
private static String cleanExpressions(String s) {
StringBuilder cleaned = new StringBuilder(s.length());
@@ -407,24 +407,35 @@ public abstract class UIAction extends A
skipping = skipping || priorIsOpenChar;
break;
case '}':
- if (braceDepth > 0) --braceDepth;
+ if (braceDepth > 0) {
+ --braceDepth;
+ }
break;
default:
}
if (!skipping) {
- if (priorIsOpenChar) cleaned.append(prior);
- if (!OPEN_CHARS.contains(c)) cleaned.append(c);
+ if (priorIsOpenChar) {
+ cleaned.append(prior);
+ }
+ if (!OPEN_CHARS.contains(c)) {
+ cleaned.append(c);
+ }
}
skipping = skipping && (braceDepth > 0);
prior = c;
++p;
}
- if (OPEN_CHARS.contains(prior)) cleaned.append(prior); // string had
final open character held in prior
+ if (OPEN_CHARS.contains(prior)) {
+ // string had final open character held in prior
+ cleaned.append(prior);
+ }
return cleaned.toString();
}
public static String cleanText(String s) {
- if (s == null || s.isEmpty()) return s;
+ if (s == null || s.isEmpty()) {
+ return s;
+ }
// escape HTML
return StringEscapeUtils.escapeHtml(cleanExpressions(s));
}
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=1520867&r1=1520866&r2=1520867&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
Sun Sep 8 14:28:27 2013
@@ -65,7 +65,7 @@ import org.apache.roller.weblogger.util.
public class EntryCollection {
private Weblogger roller;
private User user;
- private final static int MAX_ENTRIES = 20;
+ private static final int MAX_ENTRIES = 20;
private final String atomURL;
private static Log log =
@@ -228,7 +228,9 @@ public class EntryCollection {
prevLink.setHref(url);
links.add(prevLink);
}
- if (links.size() > 0) feed.setOtherLinks(links);
+ if (links.size() > 0) {
+ feed.setOtherLinks(links);
+ }
// Use collection URI as id
feed.setEntries(atomEntries);
@@ -245,8 +247,9 @@ public class EntryCollection {
log.debug("Entering");
String[] pathInfo = StringUtils.split(areq.getPathInfo(),"/");
try {
- if (pathInfo.length == 3) // URI is /blogname/entries/entryid
+ if (pathInfo.length == 3)
{
+ // URI is /blogname/entries/entryid
WeblogEntry rollerEntry =
roller.getWeblogEntryManager().getWeblogEntry(pathInfo[2]);
if (rollerEntry == null) {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java?rev=1520867&r1=1520866&r2=1520867&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
Sun Sep 8 14:28:27 2013
@@ -135,10 +135,14 @@ public class MetaWeblogAPIHandler extend
Hashtable postcontent = struct;
String description = (String)postcontent.get("description");
String title = (String)postcontent.get("title");
- if (title == null) title = "";
+ if (title == null) {
+ title = "";
+ }
Date dateCreated = (Date)postcontent.get("dateCreated");
- if (dateCreated == null) dateCreated =
(Date)postcontent.get("pubDate");
+ if (dateCreated == null) {
+ dateCreated = (Date)postcontent.get("pubDate");
+ }
String cat = null;
if ( postcontent.get("categories") != null ) {
@@ -155,7 +159,9 @@ public class MetaWeblogAPIHandler extend
Timestamp current =
new Timestamp(System.currentTimeMillis());
- if ( !title.equals("") ) entry.setTitle(title);
+ if ( !title.equals("") ) {
+ entry.setTitle(title);
+ }
entry.setText(description);
entry.setUpdateTime(current);
if (Boolean.valueOf(publish).booleanValue()) {
@@ -234,8 +240,12 @@ public class MetaWeblogAPIHandler extend
}
Date dateCreated = (Date)postcontent.get("dateCreated");
- if (dateCreated == null) dateCreated =
(Date)postcontent.get("pubDate");
- if (dateCreated == null) dateCreated = new Date();
+ if (dateCreated == null) {
+ dateCreated = (Date)postcontent.get("pubDate");
+ }
+ if (dateCreated == null) {
+ dateCreated = new Date();
+ }
mLogger.debug(" Title: " + title);
try {
@@ -366,8 +376,6 @@ public class MetaWeblogAPIHandler extend
byte[] bits = (byte[]) struct.get("bits");
- RollerMessages msgs = new RollerMessages();
-
Weblogger roller = WebloggerFactory.getWeblogger();
MediaFileManager fmgr = roller.getMediaFileManager();
MediaFileDirectory root = fmgr.getMediaFileRootDirectory(website);
