diff --git a/src/main/java/de/thm/arsnova/controller/MotdController.java b/src/main/java/de/thm/arsnova/controller/MotdController.java
index 16f81b0273e8ac1a1454c5da762cb9a464493e48..70593858072e9a8e4b6f7c61e60794664c44554c 100644
--- a/src/main/java/de/thm/arsnova/controller/MotdController.java
+++ b/src/main/java/de/thm/arsnova/controller/MotdController.java
@@ -75,12 +75,10 @@ public class MotdController extends AbstractController {
if (adminview) {
if (sessionkey.equals("null")) {
motds = motdService.getAdminMotds();
- }
- else {
+ } else {
motds = motdService.getAllSessionMotds(sessionkey);
}
- }
- else {
+ } else {
motds = motdService.getCurrentMotds(client, audience, sessionkey);
}
return motds;
@@ -101,8 +99,7 @@ public class MotdController extends AbstractController {
Motd newMotd = new Motd();
if (motd.getAudience().equals("session") && motd.getSessionkey() != null) {
newMotd = motdService.saveSessionMotd(motd.getSessionkey(), motd);
- }
- else {
+ } else {
newMotd = motdService.saveMotd(motd);
}
if (newMotd == null) {
@@ -110,8 +107,7 @@ public class MotdController extends AbstractController {
return null;
}
return newMotd;
- }
- else {
+ } else {
response.setStatus(HttpStatus.SERVICE_UNAVAILABLE.value());
return null;
}
@@ -125,8 +121,7 @@ public class MotdController extends AbstractController {
) {
if (motd.getAudience().equals("session") && motd.getSessionkey() != null) {
return motdService.updateSessionMotd(motd.getSessionkey(), motd);
- }
- else {
+ } else {
return motdService.updateMotd(motd);
}
}
@@ -137,8 +132,7 @@ public class MotdController extends AbstractController {
Motd motd = motdService.getMotd(motdkey);
if (motd.getAudience().equals("session")) {
motdService.deleteSessionMotd(motd.getSessionkey(), motd);
- }
- else {
+ } else {
motdService.deleteMotd(motd);
}
}
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 680d870dfb780da965f1e39280f950aac1cf3a25..143b990535def6a103c92159cf1339140fbf7f1e 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -2193,8 +2193,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
String viewString = "";
if ("lecture".equals(questionVariant)) {
viewString = "skill_question/lecture_question_subjects_by_session";
- }
- else {
+ } else {
viewString = "skill_question/preparation_question_subjects_by_session";
}
NovaView view = new NovaView(viewString);
@@ -2221,8 +2220,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
String viewString = "";
if ("lecture".equals(questionVariant)) {
viewString = "skill_question/lecture_question_ids_by_session_and_subject";
- }
- else {
+ } else {
viewString = "skill_question/preparation_question_ids_by_session_and_subject";
}
NovaView view = new NovaView(viewString);
@@ -2249,8 +2247,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
String viewString = "";
if ("preparation".equals(questionVariant)) {
viewString = "sort_order/preparation_question_sort_order_by_sessionid_and_subject";
- }
- else if ("lecture".equals(questionVariant)) {
+ } else if ("lecture".equals(questionVariant)) {
viewString = "sort_order/lecture_question_sort_order_by_sessionid_and_subject";
}
diff --git a/src/main/java/de/thm/arsnova/entities/Answer.java b/src/main/java/de/thm/arsnova/entities/Answer.java
index 5dac4344ff2fa6ded2ed0e11cf0d4e5ae5c6bb77..77d87fbd1ff53ec0fe952a2a8ed1003eba415f8f 100644
--- a/src/main/java/de/thm/arsnova/entities/Answer.java
+++ b/src/main/java/de/thm/arsnova/entities/Answer.java
@@ -250,8 +250,12 @@ public class Answer {
@Override
public boolean equals(Object obj) {
// auto generated!
- if (this == obj) return true;
- if (obj == null) return false;
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
if (getClass() != obj.getClass()) {
return false;
}
diff --git a/src/main/java/de/thm/arsnova/entities/Question.java b/src/main/java/de/thm/arsnova/entities/Question.java
index c13f3d0947db08262e4c9a06ce4e87d821a068c4..923d4984f23ee9a2c80f7c8fcad82f1a4adff4fe 100644
--- a/src/main/java/de/thm/arsnova/entities/Question.java
+++ b/src/main/java/de/thm/arsnova/entities/Question.java
@@ -567,8 +567,12 @@ public class Question implements Serializable {
@Override
public boolean equals(Object obj) {
// auto generated!
- if (this == obj) return true;
- if (obj == null) return false;
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
if (getClass() != obj.getClass()) {
return false;
}
diff --git a/src/main/java/de/thm/arsnova/entities/SessionInfo.java b/src/main/java/de/thm/arsnova/entities/SessionInfo.java
index c28150ba87e122397e910625a9981734c476d02c..94cb08efe20213b368ae8581e14ae34bf4d5403e 100644
--- a/src/main/java/de/thm/arsnova/entities/SessionInfo.java
+++ b/src/main/java/de/thm/arsnova/entities/SessionInfo.java
@@ -206,8 +206,12 @@ public class SessionInfo {
@Override
public boolean equals(Object obj) {
// auto generated!
- if (this == obj) return true;
- if (obj == null) return false;
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
if (getClass() != obj.getClass()) {
return false;
}
diff --git a/src/main/java/de/thm/arsnova/services/MotdService.java b/src/main/java/de/thm/arsnova/services/MotdService.java
index f256b0ea00f6cfd1718b28831ae93c2d0e40cf67..f9d090dd0cca04d009e2c7dbb711e2acf2aaba40 100644
--- a/src/main/java/de/thm/arsnova/services/MotdService.java
+++ b/src/main/java/de/thm/arsnova/services/MotdService.java
@@ -99,16 +99,16 @@ public class MotdService implements IMotdService {
List<Motd> returns = new ArrayList<Motd>();
HashSet<String> keys = new HashSet(500); // Or a more realistic size
StringTokenizer st = new StringTokenizer(motdlist.getMotdkeys(), ",");
- while (st.hasMoreTokens())
- keys.add(st.nextToken());
+ while (st.hasMoreTokens()) {
+ keys.add(st.nextToken());
+ }
for (Motd motd : list) {
if (!keys.contains(motd.getMotdkey())) {
returns.add(motd);
}
}
return returns;
- }
- else {
+ } else {
return list;
}
}
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 6e7981f549526cff73638ef30a53db07fb02bfc2..b2d12d891a282209e56d88fc755c63a1c4f42dc3 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -145,12 +145,10 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
newQSortOrder.setSortOrder(s);
databaseDao.createOrUpdateSortOrder(newQSortOrder);
addToSortOrder(subjectSortOrder, question.getSubject());
- }
- else {
+ } else {
addToSortOrder(questionSortOrder, question.get_id());
}
- }
- else {
+ } else {
createSortOrder(session, question.getQuestionVariant(), "");
}
@@ -1143,12 +1141,10 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
subjectSortOrder.setSortOrder(tempSubSort);
if (subjectSortOrder.getSortOrder().isEmpty()) {
databaseDao.deleteSortOrder(subjectSortOrder);
- }
- else {
+ } else {
databaseDao.createOrUpdateSortOrder(subjectSortOrder);
}
- }
- else {
+ } else {
databaseDao.createOrUpdateSortOrder(sortOrder);
}
}
@@ -1213,8 +1209,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
createSortOrder(session, questionVariant, sub);
}
return databaseDao.createOrUpdateSortOrder(subjectSortOrder);
- }
- else {
+ } else {
SortOrder sortOrder = new SortOrder();
sortOrder.setSessionId(session.get_id());
sortOrder.setSubject(subject);
@@ -1238,8 +1233,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
Collections.sort(subjects);
sortOrder.setSortOrder(subjects);
return sortOrder;
- }
- else {
+ } else {
Hashtable<String, String> hash = new Hashtable<>();
for (String qid : sortOrder.getSortOrder()) {
Question question = getQuestion(qid);