Merge branch 'master' of gitorious@scm.thm.de:arsnova/arsnova-war.git

pom.xml

@@ -87,16 +87,18 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
 				<version>2.4</version>
-				<configuration>
-
-				</configuration>
+				<configuration></configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-
-				</configuration>
+				<configuration></configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>findbugs-maven-plugin</artifactId>
+				<version>2.5.2</version>
+				<configuration></configuration>
 			</plugin>
 		</plugins>
 	</reporting>

src/main/java/de/thm/arsnova/dao/CouchDBDao.java

@@ -109,7 +109,7 @@ public class CouchDBDao implements IDatabaseDao {
 	 */
 	@Override
 	public void cleanFeedbackVotes(int cleanupFeedbackDelay) {
-		final long timelimitInMillis = 60000 * cleanupFeedbackDelay;
+		final long timelimitInMillis = 60000 * (long) cleanupFeedbackDelay;
 		final long maxAllowedTimeInMillis = System.currentTimeMillis() - timelimitInMillis;
 		
 		Map<String, Set<String>> affectedUsers = new HashMap<String, Set<String>>();
@@ -537,7 +537,7 @@ public class CouchDBDao implements IDatabaseDao {
 			
 			JSONObject json = JSONObject.fromObject(loggedIn);
 			Document doc = new Document(json);
-			if (doc.getId() == "") {
+			if (doc.getId().isEmpty()) {
 				// If this is a new user without a logged_in document, we have to remove the following
 				// pre-filled fields. Otherwise, CouchDB will take these empty fields as genuine
 				// identifiers, and will throw errors afterwards.

src/main/java/de/thm/arsnova/entities/User.java

@@ -70,6 +70,7 @@ public class User implements Serializable {
 	
 	@Override
 	public boolean equals(Object obj) {
+		if (obj == null || ! obj.getClass().equals(this.getClass())) return false;
 		User other = (User) obj;
 		return this.username.equals(other.username) && this.type.equals(other.type);
 	}

src/site/site.xml

@@ -50,8 +50,8 @@
 			<item name="The Team" href="team-list.html" />
 		</menu>
 		<menu name="Documentation">
-			<item name="Dependencies" href="dependencies.html" />
 			<item name="Installation" href="installation.html" />
+			<item name="Dependencies" href="dependencies.html" />
 			<item name="API Docs" href="apidocs/index.html" />
 		</menu>
 		<menu name="Further Information">