From 2adb0ca9c3a9e7e4500b52b52e283ed77429f4d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Mon, 16 Mar 2015 12:41:41 +0100
Subject: [PATCH] alphabeticalSort is prepared to work with both
subjectSortOrder and questionSortOrder
---
.../thm/arsnova/services/QuestionService.java | 26 ++++++++++---------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 53942fc97..d28653870 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -831,17 +831,19 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
}
public SortOrder alphabeticalSort(SortOrder sortOrder){
- Hashtable<String, String> hash = new Hashtable();
- for (String qid : sortOrder.getSortOrder()) {
- Question question = getQuestion(qid);
- hash.put(question.getText(), qid);
- }
- List<String> sortList = new ArrayList();
- List<String> keys = new ArrayList(hash.keySet());
- for (String textKey : keys) {
- sortList.add(hash.get(textKey));
- }
- sortOrder.setSortOrder(sortList);
- return sortOrder;
+ if ("".equals(sortOrder.getSubject())) {
+ Hashtable<String, String> hash = new Hashtable();
+ for (String qid : sortOrder.getSortOrder()) {
+ Question question = getQuestion(qid);
+ hash.put(question.getText(), qid);
+ }
+ List<String> sortList = new ArrayList();
+ List<String> keys = new ArrayList(hash.keySet());
+ for (String textKey : keys) {
+ sortList.add(hash.get(textKey));
+ }
+ sortOrder.setSortOrder(sortList);
+ return sortOrder;
+ }
}
}
--
GitLab