You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2013/07/26 13:52:38 UTC
svn commit: r1507273 - in
/roller/trunk/app/src/main/java/org/apache/roller/weblogger:
business/startup/DatabaseInstaller.java
webservices/adminprotocol/sdk/EntrySet.java
webservices/adminprotocol/sdk/MemberEntrySet.java
Author: gmazza
Date: Fri Jul 26 11:52:38 2013
New Revision: 1507273
URL: http://svn.apache.org/r1507273
Log:
A few Sonar complaints fixed.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/EntrySet.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntrySet.java
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java?rev=1507273&r1=1507272&r2=1507273&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/startup/DatabaseInstaller.java Fri Jul 26 11:52:38 2013
@@ -25,13 +25,11 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.business.DatabaseProvider;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
/**
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/EntrySet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/EntrySet.java?rev=1507273&r1=1507272&r2=1507273&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/EntrySet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/EntrySet.java Fri Jul 26 11:52:38 2013
@@ -19,6 +19,8 @@ package org.apache.roller.weblogger.webs
import java.util.Arrays;
import java.util.List;
+
+import org.apache.commons.lang.builder.HashCodeBuilder;
import org.jdom.Document;
import org.jdom.Element;
@@ -81,8 +83,9 @@ public abstract class EntrySet extends E
public boolean isEmpty() {
return entries == null || entries.size() == 0;
}
-
+
/** This object as a JDOM Document */
+
public Document toDocument() {
Element e = new Element(getType(), NAMESPACE);
Document doc = new Document(e);
@@ -111,10 +114,13 @@ public abstract class EntrySet extends E
if (!areEqual(getType(), other.getType())) {
return false;
}
- if (!areEqual(getEntries(), other.getEntries())) {
- return false;
- }
-
- return true;
- }
+ return areEqual(getEntries(), other.getEntries());
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder().append(getHref())
+ .append(getType()).append(entries).toHashCode();
+ }
+
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntrySet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntrySet.java?rev=1507273&r1=1507272&r2=1507273&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntrySet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/MemberEntrySet.java Fri Jul 26 11:52:38 2013
@@ -40,8 +40,8 @@ import org.jdom.input.SAXBuilder;
* @author jtb
*/
public class MemberEntrySet extends EntrySet {
- static interface Tags {
- public static final String MEMBERS = "members";
+ interface Tags {
+ String MEMBERS = "members";
}
public MemberEntrySet(String urlPrefix) {