From ab215208560ad8b4222b1cb7446cb0ba827fe7f8 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Fri, 5 Feb 2016 23:03:20 +0100
Subject: [PATCH] Fix whitespace errors reported by Checkstyle
---
.../de/thm/arsnova/cache/CacheBuster.java | 60 +++++++++----------
.../de/thm/arsnova/cache/ICacheBuster.java | 2 +-
.../de/thm/arsnova/cache/package-info.java | 2 +-
.../AudienceQuestionController.java | 8 +--
.../arsnova/controller/CourseController.java | 2 +-
.../LecturerQuestionController.java | 4 +-
.../SecurityExceptionControllerAdvice.java | 2 +-
.../arsnova/controller/SessionController.java | 10 ++--
.../arsnova/controller/SocketController.java | 2 +-
.../arsnova/controller/WelcomeController.java | 2 +-
.../java/de/thm/arsnova/dao/CouchDBDao.java | 12 ++--
.../domain/LearningProgressFactory.java | 34 +++++------
.../domain/PointBasedLearningProgress.java | 6 +-
.../domain/QuestionBasedLearningProgress.java | 10 ++--
.../de/thm/arsnova/domain/package-info.java | 2 +-
.../entities/LearningProgressOptions.java | 2 +-
.../java/de/thm/arsnova/entities/Motd.java | 4 +-
.../de/thm/arsnova/entities/Question.java | 4 +-
.../thm/arsnova/entities/SessionFeature.java | 2 +-
.../de/thm/arsnova/entities/SessionInfo.java | 2 +-
.../transport/InterposedQuestion.java | 2 +-
.../de/thm/arsnova/services/MotdService.java | 2 +-
.../thm/arsnova/services/QuestionService.java | 12 ++--
.../arsnova/socket/ARSnovaSocketIOServer.java | 4 +-
.../java/de/thm/arsnova/web/CorsFilter.java | 2 +-
25 files changed, 97 insertions(+), 97 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/cache/CacheBuster.java b/src/main/java/de/thm/arsnova/cache/CacheBuster.java
index 5d1b1ccc..06c38305 100644
--- a/src/main/java/de/thm/arsnova/cache/CacheBuster.java
+++ b/src/main/java/de/thm/arsnova/cache/CacheBuster.java
@@ -30,98 +30,98 @@ public class CacheBuster implements ICacheBuster, NovaEventVisitor {
@CacheEvict(value = "statistics", allEntries = true)
@Override
- public void visit(NewInterposedQuestionEvent event) {}
+ public void visit(NewInterposedQuestionEvent event) { }
@CacheEvict(value = "statistics", allEntries = true)
@Override
- public void visit(DeleteInterposedQuestionEvent event) {}
+ public void visit(DeleteInterposedQuestionEvent event) { }
@Override
- public void visit(NewQuestionEvent event) {}
+ public void visit(NewQuestionEvent event) { }
@Override
- public void visit(UnlockQuestionEvent event) {}
+ public void visit(UnlockQuestionEvent event) { }
@Override
- public void visit(UnlockQuestionsEvent newQuestionsEvent) {}
+ public void visit(UnlockQuestionsEvent newQuestionsEvent) { }
@Override
- public void visit(LockQuestionEvent lockQuestionEvent) {}
+ public void visit(LockQuestionEvent lockQuestionEvent) { }
@Override
- public void visit(LockQuestionsEvent lockQuestionsEvent) {}
+ public void visit(LockQuestionsEvent lockQuestionsEvent) { }
@CacheEvict(value = "answers", key = "#event.Question")
@Override
- public void visit(NewAnswerEvent event) {}
+ public void visit(NewAnswerEvent event) { }
@Override
- public void visit(DeleteAnswerEvent event) {}
+ public void visit(DeleteAnswerEvent event) { }
@Override
- public void visit(DeleteQuestionEvent event) {}
+ public void visit(DeleteQuestionEvent event) { }
@Override
- public void visit(DeleteAllQuestionsEvent event) {}
+ public void visit(DeleteAllQuestionsEvent event) { }
@Override
- public void visit(DeleteAllQuestionsAnswersEvent event) {}
+ public void visit(DeleteAllQuestionsAnswersEvent event) { }
@Override
- public void visit(DeleteAllPreparationAnswersEvent event) {}
+ public void visit(DeleteAllPreparationAnswersEvent event) { }
@Override
- public void visit(DeleteAllLectureAnswersEvent event) {}
+ public void visit(DeleteAllLectureAnswersEvent event) { }
@Override
- public void visit(NewFeedbackEvent event) {}
+ public void visit(NewFeedbackEvent event) { }
@Override
- public void visit(DeleteFeedbackForSessionsEvent event) {}
+ public void visit(DeleteFeedbackForSessionsEvent event) { }
@Override
- public void visit(StatusSessionEvent event) {}
+ public void visit(StatusSessionEvent event) { }
@CacheEvict(value = "statistics", allEntries = true)
@Override
- public void visit(ChangeLearningProgressEvent changeLearningProgress) {}
+ public void visit(ChangeLearningProgressEvent changeLearningProgress) { }
@Override
- public void visit(PiRoundDelayedStartEvent piRoundDelayedStartEvent) {}
+ public void visit(PiRoundDelayedStartEvent piRoundDelayedStartEvent) { }
@Override
- public void visit(PiRoundEndEvent piRoundEndEvent) {}
+ public void visit(PiRoundEndEvent piRoundEndEvent) { }
@Override
- public void visit(PiRoundCancelEvent piRoundCancelEvent) {}
+ public void visit(PiRoundCancelEvent piRoundCancelEvent) { }
@Override
- public void visit(PiRoundResetEvent piRoundResetEvent) {}
+ public void visit(PiRoundResetEvent piRoundResetEvent) { }
@CacheEvict(value = "statistics", allEntries = true)
@Override
- public void visit(NewSessionEvent newSessionEvent) {}
+ public void visit(NewSessionEvent newSessionEvent) { }
@CacheEvict(value = "statistics", allEntries = true)
@Override
- public void visit(DeleteSessionEvent deleteSessionEvent) {}
+ public void visit(DeleteSessionEvent deleteSessionEvent) { }
@Override
- public void visit(LockVoteEvent lockVoteEvent) {}
+ public void visit(LockVoteEvent lockVoteEvent) { }
@Override
- public void visit(LockVotesEvent lockVotesEvent) {}
+ public void visit(LockVotesEvent lockVotesEvent) { }
@Override
- public void visit(UnlockVoteEvent unlockVoteEvent) {}
+ public void visit(UnlockVoteEvent unlockVoteEvent) { }
@Override
- public void visit(UnlockVotesEvent unlockVotesEvent) {}
+ public void visit(UnlockVotesEvent unlockVotesEvent) { }
@Override
- public void visit(FeatureChangeEvent featureChangeEvent) {}
+ public void visit(FeatureChangeEvent featureChangeEvent) { }
@Override
- public void visit(LockFeedbackEvent lockFeedbackEvent) {}
+ public void visit(LockFeedbackEvent lockFeedbackEvent) { }
}
diff --git a/src/main/java/de/thm/arsnova/cache/ICacheBuster.java b/src/main/java/de/thm/arsnova/cache/ICacheBuster.java
index 9800991c..a428fc71 100644
--- a/src/main/java/de/thm/arsnova/cache/ICacheBuster.java
+++ b/src/main/java/de/thm/arsnova/cache/ICacheBuster.java
@@ -20,4 +20,4 @@ package de.thm.arsnova.cache;
/**
* This interface is used as a tag to make Spring dependency injection happy...
*/
-public interface ICacheBuster {}
+public interface ICacheBuster { }
diff --git a/src/main/java/de/thm/arsnova/cache/package-info.java b/src/main/java/de/thm/arsnova/cache/package-info.java
index 4bf08792..af908a39 100644
--- a/src/main/java/de/thm/arsnova/cache/package-info.java
+++ b/src/main/java/de/thm/arsnova/cache/package-info.java
@@ -1,4 +1,4 @@
/**
* Classes and interfaces related to caching
*/
-package de.thm.arsnova.cache;
\ No newline at end of file
+package de.thm.arsnova.cache;
diff --git a/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java b/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
index 49472664..6a9f611f 100644
--- a/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java
@@ -60,7 +60,7 @@ public class AudienceQuestionController extends PaginationController {
@RequestMapping(value = "/count", method = RequestMethod.GET)
@DeprecatedApi
@Deprecated
- public int getInterposedCount(@ApiParam(value="Session-Key from current session", required=true) @RequestParam final String sessionkey) {
+ public int getInterposedCount(@ApiParam(value = "Session-Key from current session", required = true) @RequestParam final String sessionkey) {
return questionService.getInterposedCount(sessionkey);
}
@@ -96,8 +96,8 @@ public class AudienceQuestionController extends PaginationController {
@RequestMapping(value = "/", method = RequestMethod.POST)
@ResponseStatus(HttpStatus.CREATED)
public void postInterposedQuestion(
- @ApiParam(value="Session-Key from current session", required=true) @RequestParam final String sessionkey,
- @ApiParam(value="the body from the new question", required=true) @RequestBody final de.thm.arsnova.entities.InterposedQuestion question
+ @ApiParam(value = "Session-Key from current session", required = true) @RequestParam final String sessionkey,
+ @ApiParam(value = "the body from the new question", required = true) @RequestBody final de.thm.arsnova.entities.InterposedQuestion question
) {
if (questionService.saveQuestion(question)) {
return;
@@ -109,7 +109,7 @@ public class AudienceQuestionController extends PaginationController {
@ApiOperation(value = "Deletes an InterposedQuestion",
nickname = "deleteInterposedQuestion")
@RequestMapping(value = "/{questionId}", method = RequestMethod.DELETE)
- public void deleteInterposedQuestion(@ApiParam(value = "ID of the question that needs to be deleted", required=true) @PathVariable final String questionId) {
+ public void deleteInterposedQuestion(@ApiParam(value = "ID of the question that needs to be deleted", required = true) @PathVariable final String questionId) {
questionService.deleteInterposedQuestion(questionId);
}
}
diff --git a/src/main/java/de/thm/arsnova/controller/CourseController.java b/src/main/java/de/thm/arsnova/controller/CourseController.java
index f27d1779..3c7847a8 100644
--- a/src/main/java/de/thm/arsnova/controller/CourseController.java
+++ b/src/main/java/de/thm/arsnova/controller/CourseController.java
@@ -55,7 +55,7 @@ public class CourseController extends AbstractController {
@RequestMapping(value = "/mycourses", method = RequestMethod.GET)
public List<Course> myCourses(
- @ApiParam(value="sort my courses by name", required=true)
+ @ApiParam(value = "sort my courses by name", required = true)
@RequestParam(value = "sortby", defaultValue = "name") final String sortby
) {
diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index 94556576..6abc6591 100644
--- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -128,7 +128,7 @@ public class LecturerQuestionController extends PaginationController {
@RequestParam(value = "time", defaultValue = "0", required = false) final int time
) {
- if(time == 0) {
+ if (time == 0) {
questionService.startNewPiRound(questionId, null);
} else {
questionService.startNewPiRoundDelayed(questionId, time);
@@ -621,7 +621,7 @@ public class LecturerQuestionController extends PaginationController {
@RequestBody String[] sortOrder
) {
try {
- questionService.setSort(sessionkey, "", sorttype, ispreparation, sortOrder) ;
+ questionService.setSort(sessionkey, "", sorttype, ispreparation, sortOrder);
} catch (final Exception e) {
throw new BadRequestException();
}
diff --git a/src/main/java/de/thm/arsnova/controller/SecurityExceptionControllerAdvice.java b/src/main/java/de/thm/arsnova/controller/SecurityExceptionControllerAdvice.java
index 8b7f0907..9be2d966 100644
--- a/src/main/java/de/thm/arsnova/controller/SecurityExceptionControllerAdvice.java
+++ b/src/main/java/de/thm/arsnova/controller/SecurityExceptionControllerAdvice.java
@@ -48,7 +48,7 @@ public class SecurityExceptionControllerAdvice {
@ExceptionHandler
@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
- public Map<String,String> defaultExceptionHandler(
+ public Map<String, String> defaultExceptionHandler(
final Exception e,
final HttpServletRequest req
) {
diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java
index 9d94ffc5..dd62c315 100644
--- a/src/main/java/de/thm/arsnova/controller/SessionController.java
+++ b/src/main/java/de/thm/arsnova/controller/SessionController.java
@@ -147,9 +147,9 @@ public class SessionController extends PaginationController {
@RequestMapping(value = "/", method = RequestMethod.GET)
@Pagination
public List<Session> getSessions(
- @ApiParam(value="ownedOnly", required=true) @RequestParam(value = "ownedonly", defaultValue = "false") final boolean ownedOnly,
- @ApiParam(value="visitedOnly", required=true) @RequestParam(value = "visitedonly", defaultValue = "false") final boolean visitedOnly,
- @ApiParam(value="sortby", required=true) @RequestParam(value = "sortby", defaultValue = "name") final String sortby,
+ @ApiParam(value = "ownedOnly", required = true) @RequestParam(value = "ownedonly", defaultValue = "false") final boolean ownedOnly,
+ @ApiParam(value = "visitedOnly", required = true) @RequestParam(value = "visitedonly", defaultValue = "false") final boolean visitedOnly,
+ @ApiParam(value = "sortby", required = true) @RequestParam(value = "sortby", defaultValue = "name") final String sortby,
final HttpServletResponse response
) {
List<Session> sessions = null;
@@ -276,7 +276,7 @@ public class SessionController extends PaginationController {
@RequestMapping(value = "/{sessionkey}/lock", method = RequestMethod.POST)
public Session lockSession(
@ApiParam(value = "session-key from current session", required = true) @PathVariable final String sessionkey,
- @ApiParam(value="lock", required=true) @RequestParam(required = false) final Boolean lock,
+ @ApiParam(value = "lock", required = true) @RequestParam(required = false) final Boolean lock,
@ApiParam(value = "http servlet response", required = true) final HttpServletResponse response
) {
if (lock != null) {
@@ -336,7 +336,7 @@ public class SessionController extends PaginationController {
nickname = "lockFeedbackInput")
public boolean lockFeedbackInput(
@ApiParam(value = "session-key from current session", required = true) @PathVariable final String sessionkey,
- @ApiParam(value="lock", required=true) @RequestParam(required = true) final Boolean lock,
+ @ApiParam(value = "lock", required = true) @RequestParam(required = true) final Boolean lock,
@ApiParam(value = "http servlet response", required = true) final HttpServletResponse response
) {
return sessionService.lockFeedbackInput(sessionkey, lock);
diff --git a/src/main/java/de/thm/arsnova/controller/SocketController.java b/src/main/java/de/thm/arsnova/controller/SocketController.java
index 9dce5f7c..5862e85e 100644
--- a/src/main/java/de/thm/arsnova/controller/SocketController.java
+++ b/src/main/java/de/thm/arsnova/controller/SocketController.java
@@ -67,7 +67,7 @@ public class SocketController extends AbstractController {
@ApiResponse(code = 403, message = HTML_STATUS_403)
})
@RequestMapping(method = RequestMethod.POST, value = "/assign")
- public void authorize(@ApiParam(value="sessionMap", required=true) @RequestBody final Map<String, String> sessionMap, @ApiParam(value="response", required=true) final HttpServletResponse response) {
+ public void authorize(@ApiParam(value = "sessionMap", required = true) @RequestBody final Map < String, String> sessionMap, @ApiParam(value = "response", required = true) final HttpServletResponse response) {
String socketid = sessionMap.get("session");
if (null == socketid) {
LOGGER.debug("Expected property 'session' missing", socketid);
diff --git a/src/main/java/de/thm/arsnova/controller/WelcomeController.java b/src/main/java/de/thm/arsnova/controller/WelcomeController.java
index cabe824f..54f88fd2 100644
--- a/src/main/java/de/thm/arsnova/controller/WelcomeController.java
+++ b/src/main/java/de/thm/arsnova/controller/WelcomeController.java
@@ -53,7 +53,7 @@ public class WelcomeController extends AbstractController {
@Value("${mobile.path}")
private String mobileContextPath;
- @Resource(name="versionInfoProperties")
+ @Resource(name = "versionInfoProperties")
private Properties versionInfoProperties;
@RequestMapping(value = "/", method = RequestMethod.GET)
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index c4432847..680d870d 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -1773,8 +1773,8 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
final List<String> unanswered = new ArrayList<String>();
for (final Question question : questions) {
- if (!answered.containsKey(question.get_id()) ||
- (answered.containsKey(question.get_id()) && answered.get(question.get_id()) != question.getPiRound())) {
+ if (!answered.containsKey(question.get_id())
+ || (answered.containsKey(question.get_id()) && answered.get(question.get_id()) != question.getPiRound())) {
unanswered.add(question.get_id());
}
}
@@ -2275,7 +2275,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
List<String> sort = new ArrayList<String>();
JSONArray json = d.getJSONObject("value").getJSONArray("sortOrder");
int len = json.size();
- for (int i=0; i<len; i++) {
+ for (int i = 0; i < len; i++) {
sort.add(json.getString(i));
}
sortOrder.setSortOrder(sort);
@@ -2284,7 +2284,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
return sortOrder;
}
- @CachePut(value = "sortorder", key ="#sortOrder.sessionId.concat('-').concat(#sortOrder.questionVariant).concat('-').concat(#sortOrder.subject)")
+ @CachePut(value = "sortorder", key = "#sortOrder.sessionId.concat('-').concat(#sortOrder.questionVariant).concat('-').concat(#sortOrder.subject)")
@Override
public SortOrder createOrUpdateSortOrder(SortOrder sortOrder) {
try {
@@ -2317,7 +2317,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
return null;
}
- @CacheEvict(value = "sortorder", key ="#sortOrder.sessionId.concat('-').concat(#sortOrder.questionVariant).concat('-').concat(#sortOrder.subject)")
+ @CacheEvict(value = "sortorder", key = "#sortOrder.sessionId.concat('-').concat(#sortOrder.questionVariant).concat('-').concat(#sortOrder.subject)")
@Override
public void deleteSortOrder(SortOrder sortOrder) {
try {
@@ -2534,7 +2534,7 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
if (null != id) {
d = database.getDocument(id, rev);
}
- d.put("type","motdlist");
+ d.put("type", "motdlist");
d.put("username", motdlist.getUsername());
d.put("motdkeys", motdlist.getMotdkeys());
diff --git a/src/main/java/de/thm/arsnova/domain/LearningProgressFactory.java b/src/main/java/de/thm/arsnova/domain/LearningProgressFactory.java
index 8e50d4a5..9eb5d233 100644
--- a/src/main/java/de/thm/arsnova/domain/LearningProgressFactory.java
+++ b/src/main/java/de/thm/arsnova/domain/LearningProgressFactory.java
@@ -51,10 +51,10 @@ public class LearningProgressFactory implements NovaEventVisitor, ILearningProgr
}
@Override
- public void visit(NewInterposedQuestionEvent event) {}
+ public void visit(NewInterposedQuestionEvent event) { }
@Override
- public void visit(DeleteInterposedQuestionEvent deleteInterposedQuestionEvent) {}
+ public void visit(DeleteInterposedQuestionEvent deleteInterposedQuestionEvent) { }
@CacheEvict(value = "learningprogress", key = "#event.Session")
@Override
@@ -135,31 +135,31 @@ public class LearningProgressFactory implements NovaEventVisitor, ILearningProgr
}
@Override
- public void visit(NewFeedbackEvent newFeedbackEvent) {}
+ public void visit(NewFeedbackEvent newFeedbackEvent) { }
@Override
- public void visit(DeleteFeedbackForSessionsEvent deleteFeedbackEvent) {}
+ public void visit(DeleteFeedbackForSessionsEvent deleteFeedbackEvent) { }
@Override
- public void visit(StatusSessionEvent statusSessionEvent) {}
+ public void visit(StatusSessionEvent statusSessionEvent) { }
@Override
- public void visit(ChangeLearningProgressEvent changeLearningProgress) {}
+ public void visit(ChangeLearningProgressEvent changeLearningProgress) { }
@Override
- public void visit(PiRoundDelayedStartEvent piRoundDelayedStartEvent) {}
+ public void visit(PiRoundDelayedStartEvent piRoundDelayedStartEvent) { }
@Override
- public void visit(PiRoundEndEvent piRoundEndEvent) {}
+ public void visit(PiRoundEndEvent piRoundEndEvent) { }
@Override
- public void visit(PiRoundCancelEvent piRoundCancelEvent) {}
+ public void visit(PiRoundCancelEvent piRoundCancelEvent) { }
@Override
- public void visit(NewSessionEvent event) {}
+ public void visit(NewSessionEvent event) { }
@Override
- public void visit(DeleteSessionEvent event) {}
+ public void visit(DeleteSessionEvent event) { }
@Override
public void setApplicationEventPublisher(ApplicationEventPublisher publisher) {
@@ -167,21 +167,21 @@ public class LearningProgressFactory implements NovaEventVisitor, ILearningProgr
}
@Override
- public void visit(LockVoteEvent lockVoteEvent) {}
+ public void visit(LockVoteEvent lockVoteEvent) { }
@Override
- public void visit(LockVotesEvent lockVotesEvent) {}
+ public void visit(LockVotesEvent lockVotesEvent) { }
@Override
- public void visit(UnlockVoteEvent unlockVoteEvent) {}
+ public void visit(UnlockVoteEvent unlockVoteEvent) { }
@Override
- public void visit(UnlockVotesEvent unlockVotesEvent) {}
+ public void visit(UnlockVotesEvent unlockVotesEvent) { }
@Override
- public void visit(FeatureChangeEvent featureChangeEvent) {}
+ public void visit(FeatureChangeEvent featureChangeEvent) { }
@Override
- public void visit(LockFeedbackEvent lockFeedbackEvent) {}
+ public void visit(LockFeedbackEvent lockFeedbackEvent) { }
}
diff --git a/src/main/java/de/thm/arsnova/domain/PointBasedLearningProgress.java b/src/main/java/de/thm/arsnova/domain/PointBasedLearningProgress.java
index dfef1d34..a4314c51 100644
--- a/src/main/java/de/thm/arsnova/domain/PointBasedLearningProgress.java
+++ b/src/main/java/de/thm/arsnova/domain/PointBasedLearningProgress.java
@@ -36,7 +36,7 @@ public class PointBasedLearningProgress extends VariantLearningProgress {
lpv.setCourseProgress(coursePercentage());
lpv.setNumQuestions(courseScore.getQuestionCount());
lpv.setNumUsers(courseScore.getTotalUserCount());
- lpv.setNumerator(courseScore.getTotalUserScore()/courseScore.getTotalUserCount());
+ lpv.setNumerator(courseScore.getTotalUserScore() / courseScore.getTotalUserCount());
lpv.setDenominator(courseScore.getMaximumScore());
return lpv;
}
@@ -50,7 +50,7 @@ public class PointBasedLearningProgress extends VariantLearningProgress {
}
final double courseAverageValue = userTotalValue / numUsers;
final double courseProgress = courseAverageValue / courseMaximumValue;
- return (int)Math.min(100, Math.round(courseProgress * 100));
+ return (int) Math.min(100, Math.round(courseProgress * 100));
}
@Override
@@ -72,6 +72,6 @@ public class PointBasedLearningProgress extends VariantLearningProgress {
return 0;
}
final double myProgress = userTotalValue / courseMaximumValue;
- return (int)Math.min(100, Math.round(myProgress*100));
+ return (int) Math.min(100, Math.round(myProgress * 100));
}
}
diff --git a/src/main/java/de/thm/arsnova/domain/QuestionBasedLearningProgress.java b/src/main/java/de/thm/arsnova/domain/QuestionBasedLearningProgress.java
index 200df8fc..93991710 100644
--- a/src/main/java/de/thm/arsnova/domain/QuestionBasedLearningProgress.java
+++ b/src/main/java/de/thm/arsnova/domain/QuestionBasedLearningProgress.java
@@ -34,7 +34,7 @@ public class QuestionBasedLearningProgress extends VariantLearningProgress {
@Override
protected LearningProgressValues createCourseProgress() {
final int courseProgress = calculateCourseProgress();
- final int numerator = courseScore.getQuestionCount()*courseProgress/100;
+ final int numerator = courseScore.getQuestionCount() * courseProgress / 100;
final int denominator = courseScore.getQuestionCount();
LearningProgressValues lpv = new LearningProgressValues();
lpv.setCourseProgress(courseProgress);
@@ -53,10 +53,10 @@ public class QuestionBasedLearningProgress extends VariantLearningProgress {
}
int numAnswers = questionScore.getUserCount();
if (numAnswers != 0) {
- ratio += (double)countCorrectAnswers(questionScore) / (numAnswers * courseScore.getQuestionCount());
+ ratio += (double) countCorrectAnswers(questionScore) / (numAnswers * courseScore.getQuestionCount());
}
}
- return (int) Math.min(100, Math.round(ratio*100));
+ return (int) Math.min(100, Math.round(ratio * 100));
}
private int countCorrectAnswers(QuestionScore questionScore) {
@@ -107,8 +107,8 @@ public class QuestionBasedLearningProgress extends VariantLearningProgress {
}
private int myPercentage(int numQuestionsCorrect, int questionCount) {
- final double myLearningProgress = numQuestionsCorrect / (double)questionCount;
- return (int) Math.min(100, Math.round(myLearningProgress*100));
+ final double myLearningProgress = numQuestionsCorrect / (double) questionCount;
+ return (int) Math.min(100, Math.round(myLearningProgress * 100));
}
diff --git a/src/main/java/de/thm/arsnova/domain/package-info.java b/src/main/java/de/thm/arsnova/domain/package-info.java
index 0733c68f..4995c742 100644
--- a/src/main/java/de/thm/arsnova/domain/package-info.java
+++ b/src/main/java/de/thm/arsnova/domain/package-info.java
@@ -1,4 +1,4 @@
/**
* The 'M' in MVC
*/
-package de.thm.arsnova.domain;
\ No newline at end of file
+package de.thm.arsnova.domain;
diff --git a/src/main/java/de/thm/arsnova/entities/LearningProgressOptions.java b/src/main/java/de/thm/arsnova/entities/LearningProgressOptions.java
index 4667dae8..e29f9a43 100644
--- a/src/main/java/de/thm/arsnova/entities/LearningProgressOptions.java
+++ b/src/main/java/de/thm/arsnova/entities/LearningProgressOptions.java
@@ -35,7 +35,7 @@ public class LearningProgressOptions {
this.questionVariant = learningProgressOptions.getQuestionVariant();
}
- public LearningProgressOptions() {}
+ public LearningProgressOptions() { }
@ApiModelProperty(required = true, value = "the type")
public String getType() {
diff --git a/src/main/java/de/thm/arsnova/entities/Motd.java b/src/main/java/de/thm/arsnova/entities/Motd.java
index 439f75db..c9748b29 100644
--- a/src/main/java/de/thm/arsnova/entities/Motd.java
+++ b/src/main/java/de/thm/arsnova/entities/Motd.java
@@ -88,7 +88,7 @@ public class Motd {
return audience;
}
- public void setAudience(String a){
+ public void setAudience(String a) {
audience = a;
}
@@ -97,7 +97,7 @@ public class Motd {
return sessionkey;
}
- public void setSessionkey(String a){
+ public void setSessionkey(String a) {
sessionkey = a;
}
diff --git a/src/main/java/de/thm/arsnova/entities/Question.java b/src/main/java/de/thm/arsnova/entities/Question.java
index f73d0bf9..c13f3d09 100644
--- a/src/main/java/de/thm/arsnova/entities/Question.java
+++ b/src/main/java/de/thm/arsnova/entities/Question.java
@@ -596,7 +596,7 @@ public class Question implements Serializable {
}
public void updateRoundStartVariables(Date start, Date end) {
- if(this.getPiRound() == 1 && this.isPiRoundFinished()) {
+ if (this.getPiRound() == 1 && this.isPiRoundFinished()) {
this.setPiRound(2);
}
@@ -613,7 +613,7 @@ public class Question implements Serializable {
public void updateRoundManagementState() {
final long time = new Date().getTime();
- if(time > this.getPiRoundEndTime() && this.isPiRoundActive()) {
+ if (time > this.getPiRoundEndTime() && this.isPiRoundActive()) {
this.setPiRoundEndTime(0);
this.setPiRoundStartTime(0);
this.setPiRoundActive(false);
diff --git a/src/main/java/de/thm/arsnova/entities/SessionFeature.java b/src/main/java/de/thm/arsnova/entities/SessionFeature.java
index 4cbfbcd4..37686978 100644
--- a/src/main/java/de/thm/arsnova/entities/SessionFeature.java
+++ b/src/main/java/de/thm/arsnova/entities/SessionFeature.java
@@ -59,7 +59,7 @@ public class SessionFeature {
}
}
- public SessionFeature() {}
+ public SessionFeature() { }
public boolean isLecture() {
return lecture;
diff --git a/src/main/java/de/thm/arsnova/entities/SessionInfo.java b/src/main/java/de/thm/arsnova/entities/SessionInfo.java
index 18f2e5e2..c28150ba 100644
--- a/src/main/java/de/thm/arsnova/entities/SessionInfo.java
+++ b/src/main/java/de/thm/arsnova/entities/SessionInfo.java
@@ -58,7 +58,7 @@ public class SessionInfo {
this.ppSubject = session.getPpSubject();
}
- public SessionInfo() {}
+ public SessionInfo() { }
public static List<SessionInfo> fromSessionList(List<Session> sessions) {
List<SessionInfo> infos = new ArrayList<SessionInfo>();
diff --git a/src/main/java/de/thm/arsnova/entities/transport/InterposedQuestion.java b/src/main/java/de/thm/arsnova/entities/transport/InterposedQuestion.java
index d950790c..ce8b668d 100644
--- a/src/main/java/de/thm/arsnova/entities/transport/InterposedQuestion.java
+++ b/src/main/java/de/thm/arsnova/entities/transport/InterposedQuestion.java
@@ -51,7 +51,7 @@ public class InterposedQuestion {
this.read = question.isRead();
}
- public InterposedQuestion() {}
+ public InterposedQuestion() { }
@ApiModelProperty(required = true, value = "used to display Id")
public String getId() {
diff --git a/src/main/java/de/thm/arsnova/services/MotdService.java b/src/main/java/de/thm/arsnova/services/MotdService.java
index beeb901a..f256b0ea 100644
--- a/src/main/java/de/thm/arsnova/services/MotdService.java
+++ b/src/main/java/de/thm/arsnova/services/MotdService.java
@@ -99,7 +99,7 @@ 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())
+ while (st.hasMoreTokens())
keys.add(st.nextToken());
for (Motd motd : list) {
if (!keys.contains(motd.getMotdkey())) {
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index b8e46713..6e7981f5 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -224,7 +224,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
final Question question = databaseDao.getQuestion(questionId);
final Session session = databaseDao.getSessionFromKeyword(question.getSessionKeyword());
- if(null == user) {
+ if (null == user) {
user = userService.getCurrentUser();
}
@@ -272,7 +272,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
cancelDelayedPiRoundChange(questionId);
question.resetRoundManagementState();
- if(question.getPiRound() == 1) {
+ if (question.getPiRound() == 1) {
question.setPiRoundFinished(false);
} else {
question.setPiRound(1);
@@ -287,7 +287,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
public void cancelDelayedPiRoundChange(final String questionId) {
Timer timer = timerList.get(questionId);
- if(null != timer) {
+ if (null != timer) {
timer.cancel();
timerList.remove(questionId);
timer.purge();
@@ -1123,13 +1123,13 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
List<String> tmpList = sortOrder.getSortOrder();
tmpList.add(toBeAdded);
sortOrder.setSortOrder(tmpList);
- if("alphabet".equals(sortOrder.getSortType())) {
+ if ("alphabet".equals(sortOrder.getSortType())) {
sortOrder = alphabeticalSort(sortOrder);
}
return databaseDao.createOrUpdateSortOrder(sortOrder);
}
- public void deleteQuestionFromSortOrder(Question question){
+ public void deleteQuestionFromSortOrder(Question question) {
SortOrder sortOrder = databaseDao.getSortOrder(question.getSessionId(), question.getQuestionVariant(), question.getSubject());
if (sortOrder != null) {
List<String> tempSortOrder = sortOrder.getSortOrder();
@@ -1226,7 +1226,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
}
}
- public SortOrder alphabeticalSort(SortOrder sortOrder){
+ public SortOrder alphabeticalSort(SortOrder sortOrder) {
if (sortOrder.getSortOrder() == null) {
return null;
}
diff --git a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
index 0ae3d430..b274390b 100644
--- a/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
+++ b/src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
@@ -646,8 +646,8 @@ public class ARSnovaSocketIOServer implements ARSnovaSocket, NovaEventVisitor {
}
@Override
- public void visit(NewSessionEvent event) {}
+ public void visit(NewSessionEvent event) { }
@Override
- public void visit(DeleteSessionEvent event) {}
+ public void visit(DeleteSessionEvent event) { }
}
diff --git a/src/main/java/de/thm/arsnova/web/CorsFilter.java b/src/main/java/de/thm/arsnova/web/CorsFilter.java
index 1b18de70..0a7f0031 100644
--- a/src/main/java/de/thm/arsnova/web/CorsFilter.java
+++ b/src/main/java/de/thm/arsnova/web/CorsFilter.java
@@ -47,6 +47,6 @@ public class CorsFilter extends OncePerRequestFilter {
}
private String sanitizeOriginUrl(String originUrl) {
- return originUrl.replaceAll("[\n\r]+"," ");
+ return originUrl.replaceAll("[\n\r]+", " ");
}
}
--
GitLab