From 3e66a161f9a9f650d1de0cbcb28d843a77810a35 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Fri, 5 Feb 2016 23:18:58 +0100
Subject: [PATCH] Fix style of blocks reported by Checkstyle
---
.../thm/arsnova/controller/MotdController.java | 18 ++++++------------
.../java/de/thm/arsnova/dao/CouchDBDao.java | 9 +++------
.../java/de/thm/arsnova/entities/Answer.java | 8 ++++++--
.../java/de/thm/arsnova/entities/Question.java | 8 ++++++--
.../de/thm/arsnova/entities/SessionInfo.java | 8 ++++++--
.../de/thm/arsnova/services/MotdService.java | 8 ++++----
.../thm/arsnova/services/QuestionService.java | 18 ++++++------------
7 files changed, 37 insertions(+), 40 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/MotdController.java b/src/main/java/de/thm/arsnova/controller/MotdController.java
index 16f81b02..70593858 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 680d870d..143b9905 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 5dac4344..77d87fbd 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 c13f3d09..923d4984 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 c28150ba..94cb08ef 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 f256b0ea..f9d090dd 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 6e7981f5..b2d12d89 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);
--
GitLab