Author: gmazza
Date: Sat Mar 29 03:54:11 2014
New Revision: 1582950
URL: http://svn.apache.org/r1582950
Log:
Fixed various Sonar issues.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/util/RollerConstants.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeResourceFromDir.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/util/RollerConstants.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/util/RollerConstants.java?rev=1582950&r1=1582949&r2=1582950&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/util/RollerConstants.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/util/RollerConstants.java
Sat Mar 29 03:54:11 2014
@@ -26,7 +26,7 @@ public final class RollerConstants {
public static final int EIGHT_KB_IN_BYTES = 8192;
public static final int TWENTYFOUR_KB_IN_BYTES = 24576;
- public static final int ONE_MB_IN_BYTES = ONE_KB_IN_BYTES * 2;
+ public static final int ONE_MB_IN_BYTES = ONE_KB_IN_BYTES *
ONE_KB_IN_BYTES;
public static final int HALF_SEC_IN_MS = 500;
public static final int SEC_IN_MS = 1000;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java?rev=1582950&r1=1582949&r2=1582950&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/FileContentManagerImpl.java
Sat Mar 29 03:54:11 2014
@@ -163,7 +163,7 @@ public class FileContentManagerImpl impl
// maxDirSize in megabytes
BigDecimal maxDirSize = new BigDecimal(maxDir);
- long maxDirBytes = (long)(1024000 * maxDirSize.doubleValue());
+ long maxDirBytes = (long)(RollerConstants.ONE_MB_IN_BYTES *
maxDirSize.doubleValue());
try {
File storageDir = this.getRealFile(weblog, null);
@@ -201,7 +201,7 @@ public class FileContentManagerImpl impl
// second check, does upload exceed max size for file?
BigDecimal maxFileMB = new BigDecimal(
WebloggerRuntimeConfig.getProperty("uploads.file.maxsize"));
- int maxFileBytes = (int)(1024000 * maxFileMB.doubleValue());
+ int maxFileBytes = (int)(RollerConstants.ONE_MB_IN_BYTES *
maxFileMB.doubleValue());
log.debug("max allowed file size = "+maxFileBytes);
log.debug("attempted save file size = "+size);
if (size > maxFileBytes) {
@@ -213,7 +213,7 @@ public class FileContentManagerImpl impl
// third check, does file cause weblog to exceed quota?
BigDecimal maxDirMB = new BigDecimal(
WebloggerRuntimeConfig.getProperty("uploads.dir.maxsize"));
- long maxDirBytes = (long)(1024000 * maxDirMB.doubleValue());
+ long maxDirBytes = (long)(RollerConstants.ONE_MB_IN_BYTES *
maxDirMB.doubleValue());
try {
File storageDir = this.getRealFile(weblog, null);
long userDirSize = getDirSize(storageDir, true);
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java?rev=1582950&r1=1582949&r2=1582950&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/HitCountQueue.java
Sat Mar 29 03:54:11 2014
@@ -58,7 +58,7 @@ public class HitCountQueue {
// non-instantiable because we are a singleton
private HitCountQueue() {
- int sleepTime = 180000;
+ int sleepTime = 3 * RollerConstants.MIN_IN_MS;
String sleep = WebloggerConfig.getProperty("hitcount.queue.sleepTime",
"180");
try {
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java?rev=1582950&r1=1582949&r2=1582950&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeFromDir.java
Sat Mar 29 03:54:11 2014
@@ -131,8 +131,8 @@ public class SharedThemeFromDir extends
*/
public List<ThemeResource> getResources() {
+ List<ThemeResource> myResources = new
ArrayList<ThemeResource>(this.resources.values());
// make sure resources are sorted.
- List myResources = new
ArrayList<ThemeResource>(this.resources.values());
Collections.sort(myResources);
return myResources;
@@ -254,7 +254,7 @@ public class SharedThemeFromDir extends
// here we set content and template language from standard
// template code assuming it is the default
SharedThemeTemplate theme_template = new SharedThemeTemplate(
- this, themeMetadata.getId() + ":"
+ themeMetadata.getId() + ":"
+ stylesheetTmpl.getName(),
WeblogTemplate.ACTION_CUSTOM, stylesheetTmpl.getName(),
stylesheetTmpl.getDescription(), contents,
@@ -354,7 +354,7 @@ public class SharedThemeFromDir extends
}
// construct ThemeTemplate representing this file
- theme_template = new SharedThemeTemplate(this,
+ theme_template = new SharedThemeTemplate(
themeMetadata.getId() + ":" + templateMetadata.getName(),
templateMetadata.getAction(), templateMetadata.getName(),
templateMetadata.getDescription(), contents,
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeResourceFromDir.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeResourceFromDir.java?rev=1582950&r1=1582949&r2=1582950&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeResourceFromDir.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeResourceFromDir.java
Sat Mar 29 03:54:11 2014
@@ -36,7 +36,7 @@ import org.apache.roller.weblogger.pojos
* of this class.
*/
public class SharedThemeResourceFromDir
- implements ThemeResource, Serializable,
Comparable<SharedThemeResourceFromDir> {
+ implements ThemeResource, Serializable {
// the physical java.io.File backing this resource
private File resourceFile = null;
@@ -54,7 +54,7 @@ public class SharedThemeResourceFromDir
/**
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
- public int compareTo(SharedThemeResourceFromDir other) {
+ public int compareTo(ThemeResource other) {
return getPath().compareTo(other.getPath());
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java?rev=1582950&r1=1582949&r2=1582950&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplate.java
Sat Mar 29 03:54:11 2014
@@ -45,7 +45,6 @@ public class SharedThemeTemplate impleme
private boolean navbar = false;
private String outputContentType = null;
private String type = null;
- private SharedTheme myTheme = null;
//hash map to cache template Code objects parsed
private HashMap<String, TemplateCode> templateCodeHashMap = new
HashMap<String, TemplateCode>();
@@ -53,11 +52,10 @@ public class SharedThemeTemplate impleme
public SharedThemeTemplate() {}
- public SharedThemeTemplate(SharedTheme theme, String id, String action,
String name,
+ public SharedThemeTemplate(String id, String action, String name,
String desc, String contents, String link, Date date,
String tempLang, boolean hid, boolean navbar) {
- this.myTheme = theme;
this.id = id;
this.action = action;
this.name = name;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java?rev=1582950&r1=1582949&r2=1582950&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManager.java
Sat Mar 29 03:54:11 2014
@@ -46,8 +46,7 @@ public interface ThemeManager {
* @throws WebloggerException
* If there is some kind of fatal backend error.
**/
- SharedTheme getTheme(String id) throws ThemeNotFoundException,
- WebloggerException;
+ SharedTheme getTheme(String id) throws WebloggerException;
/**
* Get the WeblogTheme for a given weblog.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java?rev=1582950&r1=1582949&r2=1582950&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/StatCountCountComparator.java
Sat Mar 29 03:54:11 2014
@@ -43,7 +43,7 @@ public class StatCountCountComparator im
* @throws ClassCastException if arguments are not instances of
<em>StatCount</em>
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
- public int compare(Object obj1, Object obj2) throws ClassCastException {
+ public int compare(Object obj1, Object obj2) {
StatCount sc1 = (StatCount) obj1;
StatCount sc2 = (StatCount) obj2;
int compVal = sc1.getCount() < sc2.getCount() ? -1 :
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java?rev=1582950&r1=1582949&r2=1582950&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatComparator.java
Sat Mar 29 03:54:11 2014
@@ -36,9 +36,10 @@ public class TagStatComparator implement
}
/* (non-Javadoc)
+ * @throws ClassCastException if arguments are not instances of
<em>TagStat</em>
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
- public int compare(Object obj1, Object obj2) throws ClassCastException {
+ public int compare(Object obj1, Object obj2) {
TagStat st1 = (TagStat) obj1;
TagStat st2 = (TagStat) obj2;
return st1.getName().compareToIgnoreCase(st2.getName());
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java?rev=1582950&r1=1582949&r2=1582950&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TagStatCountComparator.java
Sat Mar 29 03:54:11 2014
@@ -43,7 +43,7 @@ public class TagStatCountComparator impl
* @throws ClassCastException if arguments are not instances of
<em>TagStat</em>
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
- public int compare(Object obj1, Object obj2) throws ClassCastException {
+ public int compare(Object obj1, Object obj2) {
TagStat st1 = (TagStat) obj1;
TagStat st2 = (TagStat) obj2;
int compVal = st1.getCount() < st2.getCount() ? -1 :
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java?rev=1582950&r1=1582949&r2=1582950&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/ThemeResource.java
Sat Mar 29 03:54:11 2014
@@ -22,7 +22,7 @@ package org.apache.roller.weblogger.pojo
/**
* A Resource that is attached to a Theme.
*/
-public interface ThemeResource extends Resource {
+public interface ThemeResource extends Resource, Comparable<ThemeResource> {
/**
* Does this resource represent a directory? True if yes, False otherwise.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java?rev=1582950&r1=1582949&r2=1582950&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntryWrapperComparator.java
Sat Mar 29 03:54:11 2014
@@ -33,25 +33,20 @@ public class WeblogEntryWrapperComparato
{
static final long serialVersionUID = -9067148992322255150L;
- public int compare(Object val1, Object val2)
- throws ClassCastException
- {
+ public int compare(Object val1, Object val2) {
WeblogEntryWrapper entry1 = (WeblogEntryWrapper)val1;
WeblogEntryWrapper entry2 = (WeblogEntryWrapper)val2;
long pubTime1 = entry1.getPubTime().getTime();
long pubTime2 = entry2.getPubTime().getTime();
- if (pubTime1 > pubTime2)
- {
+ if (pubTime1 > pubTime2) {
return -1;
}
- else if (pubTime1 < pubTime2)
- {
+ else if (pubTime1 < pubTime2) {
return 1;
}
- // if pubTimes are the same, return
- // results of String.compareTo() on Title
+ // if pubTimes are the same, return results of String.compareTo() on
Title
return entry1.getTitle().compareTo(entry2.getTitle());
}
}
Modified:
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java?rev=1582950&r1=1582949&r2=1582950&view=diff
==============================================================================
---
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
(original)
+++
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
Sat Mar 29 03:54:11 2014
@@ -316,8 +316,8 @@ public class MediaFileTest extends TestC
* Test deletion of media file
*/
public void testDeleteMediaFile() throws Exception {
- User testUser = null;
- Weblog testWeblog = null;
+ User testUser;
+ Weblog testWeblog;
testUser = TestUtils.setupUser("mediaFileTestUser4");
testWeblog = TestUtils.setupWeblog("mediaFileTestWeblog4", testUser);
