From c61060e07af2a50b9fe97de8b3d0b3770498dc97 Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Mon, 17 Feb 2014 15:00:56 +0100
Subject: [PATCH] Fixed some minor code style warnings
---
src/main/java/de/thm/arsnova/FeedbackStorage.java | 2 +-
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 3 +--
src/main/java/de/thm/arsnova/entities/LoggedIn.java | 4 ++--
src/main/java/de/thm/arsnova/events/Publisher.java | 3 +--
src/main/java/de/thm/arsnova/services/UserSessionService.java | 2 +-
.../java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java | 2 +-
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/FeedbackStorage.java b/src/main/java/de/thm/arsnova/FeedbackStorage.java
index dd46e15e..dcdd11b8 100644
--- a/src/main/java/de/thm/arsnova/FeedbackStorage.java
+++ b/src/main/java/de/thm/arsnova/FeedbackStorage.java
@@ -40,7 +40,7 @@ public class FeedbackStorage {
private IDatabaseDao dao;
public FeedbackStorage(IDatabaseDao newDao) {
- this.data = new ConcurrentHashMap<String, Map<String,FeedbackStorageObject>>();
+ this.data = new ConcurrentHashMap<String, Map<String, FeedbackStorageObject>>();
this.dao = newDao;
}
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 8c215c59..fa3b627f 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -1023,8 +1023,7 @@ public class CouchDBDao implements IDatabaseDao {
sb.append("]");
try {
this.setKeys(URLEncoder.encode(sb.toString(), "UTF-8"));
- }
- catch (UnsupportedEncodingException e) {
+ } catch (UnsupportedEncodingException e) {
LOGGER.error("Error while encoding course ID keys", e);
}
}
diff --git a/src/main/java/de/thm/arsnova/entities/LoggedIn.java b/src/main/java/de/thm/arsnova/entities/LoggedIn.java
index f4465043..1c4b9171 100644
--- a/src/main/java/de/thm/arsnova/entities/LoggedIn.java
+++ b/src/main/java/de/thm/arsnova/entities/LoggedIn.java
@@ -122,7 +122,7 @@ public class LoggedIn {
}
public boolean hasConflicts() {
- return ! (_conflicts == null || _conflicts.isEmpty());
+ return !(_conflicts == null || _conflicts.isEmpty());
}
@Override
@@ -132,4 +132,4 @@ public class LoggedIn {
+ ", timestamp=" + timestamp + ", visitedSessions="
+ visitedSessions + "]";
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/de/thm/arsnova/events/Publisher.java b/src/main/java/de/thm/arsnova/events/Publisher.java
index c8906725..ac5b64fa 100644
--- a/src/main/java/de/thm/arsnova/events/Publisher.java
+++ b/src/main/java/de/thm/arsnova/events/Publisher.java
@@ -1,6 +1,5 @@
package de.thm.arsnova.events;
-import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -13,7 +12,7 @@ public class Publisher implements ApplicationContextAware {
private ApplicationContext context;
@Override
- public void setApplicationContext(ApplicationContext c) throws BeansException {
+ public void setApplicationContext(ApplicationContext c) {
this.context = c;
}
diff --git a/src/main/java/de/thm/arsnova/services/UserSessionService.java b/src/main/java/de/thm/arsnova/services/UserSessionService.java
index df3110cd..170030f6 100644
--- a/src/main/java/de/thm/arsnova/services/UserSessionService.java
+++ b/src/main/java/de/thm/arsnova/services/UserSessionService.java
@@ -30,4 +30,4 @@ public interface UserSessionService {
boolean isAuthenticated();
void sendEventViaWebSocket(ARSnovaSocketIOServer server, ARSnovaEvent event);
-}
\ No newline at end of file
+}
diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index f9d41fcd..aba71f92 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -109,7 +109,7 @@ public class ARSnovaSocketIOServer {
* a feedback
*/
User u = userService.getUser2SocketId(client.getSessionId());
- if (u == null || ! userService.isUserInSession(u, data.getSessionkey())) {
+ if (u == null || !userService.isUserInSession(u, data.getSessionkey())) {
return;
}
feedbackService.saveFeedback(data.getSessionkey(), data.getValue(), u);
--
GitLab