From f0fb2bf5431a8c675ea3bfc5655c9fc65d4a5735 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Mon, 9 Feb 2015 16:57:02 +0100
Subject: [PATCH] Fix white spaces and remove unused imports
---
.../LecturerQuestionController.java | 1 -
.../arsnova/controller/SessionController.java | 1 -
.../java/de/thm/arsnova/dao/CouchDBDao.java | 6 ++--
.../java/de/thm/arsnova/dao/IDatabaseDao.java | 14 ++++----
.../java/de/thm/arsnova/entities/Session.java | 34 +++++++++----------
.../de/thm/arsnova/entities/SessionInfo.java | 18 +++++-----
.../thm/arsnova/entities/VisitedSession.java | 2 +-
.../arsnova/services/IQuestionService.java | 4 +--
.../thm/arsnova/services/ISessionService.java | 2 --
.../thm/arsnova/services/QuestionService.java | 6 ++--
.../thm/arsnova/services/SessionService.java | 4 +--
src/main/resources/log4j-dev.properties | 2 +-
12 files changed, 43 insertions(+), 51 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
index eb656043..558920b9 100644
--- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java
@@ -38,7 +38,6 @@ import org.springframework.web.bind.annotation.RestController;
import de.thm.arsnova.entities.Answer;
import de.thm.arsnova.entities.Question;
import de.thm.arsnova.exceptions.BadRequestException;
-import de.thm.arsnova.exceptions.ForbiddenException;
import de.thm.arsnova.exceptions.NoContentException;
import de.thm.arsnova.exceptions.NotFoundException;
import de.thm.arsnova.services.IQuestionService;
diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java
index 86eebf0d..d6c625a6 100644
--- a/src/main/java/de/thm/arsnova/controller/SessionController.java
+++ b/src/main/java/de/thm/arsnova/controller/SessionController.java
@@ -21,7 +21,6 @@ import java.util.AbstractMap.SimpleEntry;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
import javax.servlet.http.HttpServletResponse;
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 24121046..437d2bbb 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -1599,11 +1599,11 @@ public class CouchDBDao implements IDatabaseDao {
}
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
- public SimpleEntry<Integer,Integer> getMyLearningProgress(final Session session, final User user) {
+ public SimpleEntry<Integer, Integer> getMyLearningProgress(final Session session, final User user) {
final int courseProgress = getLearningProgress(session);
final NovaView maximumValueView = new NovaView("learning_progress_maximum_value/max");
@@ -1625,7 +1625,7 @@ public class CouchDBDao implements IDatabaseDao {
return new AbstractMap.SimpleEntry<Integer, Integer>(0, courseProgress);
}
final double myProgress = userTotalValue / courseMaximumValue;
- final int myLearningProgress = (int)Math.min(100, Math.round(myProgress*100));
+ final int myLearningProgress = (int) Math.min(100, Math.round(myProgress * 100));
return new AbstractMap.SimpleEntry<Integer, Integer>(myLearningProgress, courseProgress);
}
diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
index 8d9b1974..5281bcfc 100644
--- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
+++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
@@ -18,9 +18,7 @@
package de.thm.arsnova.dao;
import java.util.AbstractMap.SimpleEntry;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import de.thm.arsnova.connector.model.Course;
import de.thm.arsnova.entities.Answer;
@@ -39,9 +37,9 @@ public interface IDatabaseDao {
Session getSession(String keyword);
List<Session> getMySessions(User user);
-
+
List<Session> getPublicPoolSessions();
-
+
List<Session> getMyPublicPoolSessions(User user);
Session saveSession(User user, Session session);
@@ -75,7 +73,7 @@ public interface IDatabaseDao {
List<Answer> getAnswers(String questionId, int piRound);
int getAnswerCount(Question question, int piRound);
-
+
int getAbstentionAnswerCount(String questionId);
List<Answer> getFreetextAnswers(String questionId);
@@ -161,7 +159,7 @@ public interface IDatabaseDao {
void deleteAllInterposedQuestions(Session session);
void deleteAllInterposedQuestions(Session session, User user);
-
+
void publishQuestions(Session session, boolean publish, List<Question> questions);
void publishAllQuestions(Session session, boolean publish);
@@ -179,11 +177,11 @@ public interface IDatabaseDao {
SimpleEntry<Integer, Integer> getMyLearningProgress(Session session, User user);
List<SessionInfo> getMySessionsInfo(User user);
-
+
List<SessionInfo> getPublicPoolSessionsInfo();
List<SessionInfo> getMyPublicPoolSessionsInfo(final User user);
-
+
List<SessionInfo> getMyVisitedSessionsInfo(User currentUser);
void deleteAllPreparationAnswers(Session session);
diff --git a/src/main/java/de/thm/arsnova/entities/Session.java b/src/main/java/de/thm/arsnova/entities/Session.java
index 85b80977..c9d12eba 100644
--- a/src/main/java/de/thm/arsnova/entities/Session.java
+++ b/src/main/java/de/thm/arsnova/entities/Session.java
@@ -37,7 +37,7 @@ public class Session implements Serializable {
private String courseId;
private List<String> _conflicts;
private long creationTime;
-
+
private String ppAuthorName;
private String ppAuthorMail;
private String ppUniversity;
@@ -156,7 +156,7 @@ public class Session implements Serializable {
public boolean isCourseSession() {
return getCourseId() != null && !getCourseId().isEmpty();
}
-
+
public long getCreationTime() {
return creationTime;
}
@@ -164,7 +164,7 @@ public class Session implements Serializable {
public void setCreationTime(long creationTime) {
this.creationTime = creationTime;
}
-
+
public String getPpAuthorName() {
return ppAuthorName;
}
@@ -172,7 +172,7 @@ public class Session implements Serializable {
public void setPpAuthorName(final String ppAuthorName) {
this.ppAuthorName = ppAuthorName;
}
-
+
public String getPpAuthorMail() {
return ppAuthorMail;
}
@@ -180,7 +180,7 @@ public class Session implements Serializable {
public void setPpAuthorMail(final String ppAuthorMail) {
this.ppAuthorMail = ppAuthorMail;
}
-
+
public String getPpUniversity() {
return ppUniversity;
}
@@ -188,7 +188,7 @@ public class Session implements Serializable {
public void setPpUniversity(final String ppUniversity) {
this.ppUniversity = ppUniversity;
}
-
+
public String getPpLogo() {
return ppLogo;
}
@@ -196,7 +196,7 @@ public class Session implements Serializable {
public void setPpLogo(final String ppLogo) {
this.ppLogo = ppLogo;
}
-
+
public String getPpSubject() {
return ppSubject;
}
@@ -204,7 +204,7 @@ public class Session implements Serializable {
public void setPpSubject(final String ppSubject) {
this.ppSubject = ppSubject;
}
-
+
public String getPpLicense() {
return ppLicense;
}
@@ -212,42 +212,42 @@ public class Session implements Serializable {
public void setPpLicense(final String ppLicense) {
this.ppLicense = ppLicense;
}
-
+
public String getPpDescription() {
return ppDescription;
}
-
+
public void setPpDescription(final String ppDescription) {
this.ppDescription = ppDescription;
}
-
+
public String getPpFaculty() {
return ppFaculty;
}
-
+
public void setPpFaculty(final String ppFaculty) {
this.ppFaculty = ppFaculty;
}
-
+
public String getPpLevel() {
return ppLevel;
}
-
+
public void setPpLevel(final String ppLevel) {
this.ppLevel = ppLevel;
}
-
+
public String getSessionType() {
return sessionType;
}
-
+
public void setSessionType(final String sessionType) {
this.sessionType = sessionType;
}
@Override
public String toString() {
- return "Session [keyword=" + keyword+ ", type=" + type + ", creator=" + creator + "]";
+ return "Session [keyword=" + keyword + ", type=" + type + ", creator=" + creator + "]";
}
@Override
diff --git a/src/main/java/de/thm/arsnova/entities/SessionInfo.java b/src/main/java/de/thm/arsnova/entities/SessionInfo.java
index ee218748..2ead0b80 100644
--- a/src/main/java/de/thm/arsnova/entities/SessionInfo.java
+++ b/src/main/java/de/thm/arsnova/entities/SessionInfo.java
@@ -31,13 +31,13 @@ public class SessionInfo {
private String sessionType;
private String ppLevel;
private String ppSubject;
-
+
private int numQuestions;
private int numAnswers;
private int numInterposed;
private int numUnredInterposed;
private int numUnanswered;
-
+
public SessionInfo(Session session) {
this.name = session.getName();
this.shortName = session.getShortName();
@@ -97,27 +97,27 @@ public class SessionInfo {
public void setCourseType(String courseType) {
this.courseType = courseType;
}
-
+
public String getSessionType() {
return sessionType;
}
-
+
public void setSessionType(String sessionType) {
this.sessionType = sessionType;
}
-
+
public String getPpLevel() {
return ppLevel;
}
-
+
public void setPpLevel(String ppLevel) {
this.ppLevel = ppLevel;
}
-
+
public String getPpSubject() {
return ppSubject;
}
-
+
public void setPpSubject(String ppSubject) {
this.ppSubject = ppSubject;
}
@@ -153,7 +153,7 @@ public class SessionInfo {
public void setNumUnanswered(int numUnanswered) {
this.numUnanswered = numUnanswered;
}
-
+
public long getCreationTime() {
return creationTime;
}
diff --git a/src/main/java/de/thm/arsnova/entities/VisitedSession.java b/src/main/java/de/thm/arsnova/entities/VisitedSession.java
index a358e078..e5af42df 100644
--- a/src/main/java/de/thm/arsnova/entities/VisitedSession.java
+++ b/src/main/java/de/thm/arsnova/entities/VisitedSession.java
@@ -61,4 +61,4 @@ public class VisitedSession {
return "VisitedSession [_id=" + _id + ", name=" + name + ", keyword="
+ keyword + "]";
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/de/thm/arsnova/services/IQuestionService.java b/src/main/java/de/thm/arsnova/services/IQuestionService.java
index a79438cc..6d9ca061 100644
--- a/src/main/java/de/thm/arsnova/services/IQuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/IQuestionService.java
@@ -90,7 +90,7 @@ public interface IQuestionService {
int getFlashcardCount(String sessionkey);
int getPreparationQuestionCount(String sessionkey);
-
+
SimpleEntry<String, List<Integer>> getAnswerAndAbstentionCountByQuestion(String questionid);
int countLectureQuestionAnswers(String sessionkey);
@@ -118,7 +118,7 @@ public interface IQuestionService {
void deleteAllInterposedQuestions(String sessionKeyword);
void publishAll(String sessionkey, boolean publish);
-
+
void publishQuestions(String sessionkey, boolean publish, List<Question> questions);
void deleteAllQuestionsAnswers(String sessionkey);
diff --git a/src/main/java/de/thm/arsnova/services/ISessionService.java b/src/main/java/de/thm/arsnova/services/ISessionService.java
index de19d60e..7f364b07 100644
--- a/src/main/java/de/thm/arsnova/services/ISessionService.java
+++ b/src/main/java/de/thm/arsnova/services/ISessionService.java
@@ -18,9 +18,7 @@
package de.thm.arsnova.services;
import java.util.AbstractMap.SimpleEntry;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import java.util.UUID;
import de.thm.arsnova.connector.model.Course;
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 66af7839..1f812123 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -111,7 +111,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
}
// base64 adds offset to filesize, formula taken from: http://en.wikipedia.org/wiki/Base64#MIME
- final int fileSize = (int) ((question.getImage().length()-814)/1.37);
+ final int fileSize = (int) ((question.getImage().length() - 814) / 1.37);
if (fileSize > uploadFileSizeByte) {
LOGGER.error("Could not save file. File is too large with " + fileSize + " Byte.");
throw new BadRequestException();
@@ -413,7 +413,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
final Question result = databaseDao.updateQuestion(question);
- if(!oldQuestion.isActive() && question.isActive()) {
+ if (!oldQuestion.isActive() && question.isActive()) {
final NewQuestionEvent event = new NewQuestionEvent(this, result, session);
this.publisher.publishEvent(event);
}
@@ -523,7 +523,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
@Override
@PreAuthorize("isAuthenticated()")
- public SimpleEntry<String,List<Integer>> getAnswerAndAbstentionCountByQuestion(final String questionid) {
+ public SimpleEntry<String, List<Integer>> getAnswerAndAbstentionCountByQuestion(final String questionid) {
final List<Integer> countList = Arrays.asList(
getAnswerCount(questionid),
getAbstentionAnswerCount(questionid)
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index bf43823c..f5147079 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -19,10 +19,8 @@ package de.thm.arsnova.services;
import java.io.Serializable;
import java.util.AbstractMap.SimpleEntry;
-import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
-import java.util.Map;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
@@ -216,7 +214,7 @@ public class SessionService implements ISessionService {
session.setPpLogo(base64ImageString);
}
// base64 adds offset to filesize, formula taken from: http://en.wikipedia.org/wiki/Base64#MIME
- final int fileSize = (int) ((session.getPpLogo().length()-814)/1.37);
+ final int fileSize = (int) ((session.getPpLogo().length() - 814) / 1.37);
if (fileSize > uploadFileSizeByte) {
LOGGER.error("Could not save file. File is too large with " + fileSize + " Byte.");
throw new RequestEntityTooLargeException();
diff --git a/src/main/resources/log4j-dev.properties b/src/main/resources/log4j-dev.properties
index c8a5268a..f947a78d 100644
--- a/src/main/resources/log4j-dev.properties
+++ b/src/main/resources/log4j-dev.properties
@@ -9,4 +9,4 @@ log4j.category.org.springframework=INFO
log4j.category.com.corundumstudio.socketio=INFO
log4j.category.com.corundumstudio.socketio.handler.AuthorizeHandler=ERROR
log4j.category.com.fourspaces.couchdb=OFF
-log4j.category.net.sf.json=WARN
\ No newline at end of file
+log4j.category.net.sf.json=WARN
--
GitLab