From b5e7ed981dda677ab36f9409618e524546616ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Wed, 18 Mar 2015 18:30:49 +0100
Subject: [PATCH] first remove of whitespaces
---
.../LecturerQuestionController.java | 10 ++++-----
.../arsnova/services/IQuestionService.java | 8 +++----
.../thm/arsnova/services/QuestionService.java | 22 +++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index 1a476d2d..e2903e16 100644
--- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -445,7 +445,7 @@ public class LecturerQuestionController extends AbstractController {
@RequestMapping(value = "/getsubjectsort", method = RequestMethod.GET)
public String getSubjectSortType(
@RequestParam(required = true) final String sessionkey,
- @RequestParam(required = true) final String ispreparation
+ @RequestParam(required = true) final String ispreparation
) {
return questionService.getSubjectSortType(sessionkey, ispreparation);
}
@@ -453,9 +453,9 @@ public class LecturerQuestionController extends AbstractController {
@RequestMapping(value = "/setquestionsort", method = RequestMethod.POST)
public void setQuestionSortOrder(
@RequestParam(required = true) final String sessionkey,
- @RequestParam(required = true) final String subject,
- @RequestParam(required = true) final String sorttype,
- @RequestParam(required = true) final String ispreparation,
+ @RequestParam(required = true) final String subject,
+ @RequestParam(required = true) final String sorttype,
+ @RequestParam(required = true) final String ispreparation,
@RequestBody String[] sortOrder
) {
try {
@@ -469,7 +469,7 @@ public class LecturerQuestionController extends AbstractController {
public String getQuestionSortType(
@RequestParam(required = true) final String sessionkey,
@RequestParam(required = true) final String subject,
- @RequestParam(required = true) final String ispreparation
+ @RequestParam(required = true) final String ispreparation
) {
return questionService.getQuestionSortType(sessionkey, ispreparation, subject);
}
diff --git a/src/main/java/de/thm/arsnova/services/IQuestionService.java b/src/main/java/de/thm/arsnova/services/IQuestionService.java
index 17a46300..e9abb942 100644
--- a/src/main/java/de/thm/arsnova/services/IQuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/IQuestionService.java
@@ -138,9 +138,9 @@ public interface IQuestionService {
int getAbstentionAnswerCount(String questionId);
- String getSubjectSortType(String sessionkey, String isPreparation);
+ String getSubjectSortType(String sessionkey, String isPreparation);
+
+ SortOrder setSort(String sessionkey, String subject, String sortType, String isPreparation, String[] sortOrder);
- SortOrder setSort(String sessionkey, String subject, String sortType, String isPreparation, String[] sortOrder);
-
- String getQuestionSortType(String sessionkey, String isPreparation, String subject);
+ String getQuestionSortType(String sessionkey, String isPreparation, String subject);
}
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index a44acfb7..dd37b0da 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -156,10 +156,10 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
addToSortOrder(subjectSortOrder, question.getSubject());
}
else {
- addToSortOrder(questionSortOrder, question.get_id());
+ addToSortOrder(questionSortOrder, question.get_id());
}
- }
-
+ }
+
final NewQuestionEvent event = new NewQuestionEvent(this, session, result);
this.publisher.publishEvent(event);
@@ -918,14 +918,14 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
Question question = getQuestion(qid);
hash.put(question.getText(), qid);
}
- List<String> sortList = new ArrayList();
- List<String> keys = new ArrayList(hash.keySet());
+ List<String> sortList = new ArrayList();
+ List<String> keys = new ArrayList(hash.keySet());
Collections.sort(keys);
- for (String textKey : keys) {
- sortList.add(hash.get(textKey));
- }
- sortOrder.setSortOrder(sortList);
- return sortOrder;
+ for (String textKey : keys) {
+ sortList.add(hash.get(textKey));
+ }
+ sortOrder.setSortOrder(sortList);
+ return sortOrder;
}
- }
+ }
}
--
GitLab