Menu
▾
▴
[Openuss-svn-commits] SF.net SVN: openuss:[4815] branches/openuss-plexus-3.1/plexus/plexus-core/ src/main/java/org/openuss
|
From: <id...@us...> - 2008-10-07 17:22:08
|
Revision: 4815
http://openuss.svn.sourceforge.net/openuss/?rev=4815&view=rev
Author: idueppe
Date: 2008-10-07 13:12:46 +0000 (Tue, 07 Oct 2008)
Log Message:
-----------
bug fixing / code polishing
Modified Paths:
--------------
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/desktop/DesktopService2Impl.java
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/discussion/DiscussionSearchQuery.java
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/discussion/DiscussionServiceImpl.java
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/CourseMemberDaoImpl.java
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/CourseTypeServiceMock.java
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/DepartmentServiceImpl.java
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/DepartmentServiceMock.java
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/InstituteServiceImpl.java
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/InstituteServiceMock.java
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/LectureSearchQuery.java
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/OrganisationServiceImpl.java
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/UniversityImpl.java
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/UniversityServiceImpl.java
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/statistics/OnlineStatisticServiceImpl.java
branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/system/SystemServiceImpl.java
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/desktop/DesktopService2Impl.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/desktop/DesktopService2Impl.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/desktop/DesktopService2Impl.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -363,7 +363,6 @@
*/
@SuppressWarnings( { "unchecked" })
protected List handleFindLinkedDepartmentsByUserAndUniversity(Long userId, Long universityId) throws Exception {
-
Validate.notNull(userId, "userId cannot be null!");
Validate.notNull(universityId, "universityId cannot be null!");
@@ -497,7 +496,7 @@
}
- protected Map handleGetMyUniInfo(Long userId) {
+ protected Map<Long, MyUniInfo> handleGetMyUniInfo(Long userId) {
Validate.notNull(userId, "UserId cannot be null!");
User user = this.getUserDao().load(userId);
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/discussion/DiscussionSearchQuery.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/discussion/DiscussionSearchQuery.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/discussion/DiscussionSearchQuery.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -68,6 +68,7 @@
* @param isFuzzy use fuzzy search?
* @param submitter search for author/submitter
*/
+ @SuppressWarnings("unchecked")
public List<DiscussionSearchDomainResult> search(String textToSearch, Long courseId, boolean onlyInTitle, boolean isFuzzy, String submitter) {
StringBuilder queryString = new StringBuilder();
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/discussion/DiscussionServiceImpl.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/discussion/DiscussionServiceImpl.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/discussion/DiscussionServiceImpl.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -67,8 +67,9 @@
}
+
private void sendNotificationsToForumWatchers(final Topic topic, final Forum forum) {
- List<ForumWatch> watches = getForumWatchDao().findByForum(forum);
+ @SuppressWarnings("unchecked") List<ForumWatch> watches = getForumWatchDao().findByForum(forum);
List<User> emails = new ArrayList<User>();
for (ForumWatch watch : watches) {
emails.add(watch.getForumWatchPk().getUser());
@@ -101,6 +102,7 @@
getSecurityService().removeObjectIdentity(topic);
}
+ @SuppressWarnings("unchecked")
private void removeAllDiscussionWatchesOfTopic(final Topic topic) {
getDiscussionWatchDao().remove(getDiscussionWatchDao().findByTopic(topic));
}
@@ -135,13 +137,13 @@
}
private void sendNotifications(final Topic topic, final Forum forum) {
- List<User> emailsByTopic = getTopicDao().findUsersToNotifyByTopic(topic);
- List<User> emailsByForum = getTopicDao().findUsersToNotifyByForum(topic, forum);
- Set<User> emails = new HashSet();
+ @SuppressWarnings("unchecked") List<User> emailsByTopic = getTopicDao().findUsersToNotifyByTopic(topic);
+ @SuppressWarnings("unchecked") List<User> emailsByForum = getTopicDao().findUsersToNotifyByForum(topic, forum);
+ Set<User> emails = new HashSet<User>();
emails.addAll(emailsByTopic);
emails.addAll(emailsByForum);
logEmailAdresses(emails);
- sendNotificationEmail(new ArrayList(emails), topic);
+ sendNotificationEmail(new ArrayList<User>(emails), topic);
logger.debug("got users to notify");
}
@@ -213,7 +215,7 @@
Validate.notNull(post.getId());
PostInfo postInfo = (PostInfo) getPostDao().load(PostDao.TRANSFORM_POSTINFO, post.getId());
if (postInfo != null) {
- List<FileInfo> attachments = getAttachments(postInfo);
+ @SuppressWarnings("unchecked") List<FileInfo> attachments = getAttachments(postInfo);
postInfo.setAttachments(attachments);
postInfo.setUserIsSubmitter(postInfo.getSubmitterId().equals(getSecurityService().getCurrentUser().getId()));
}
@@ -224,18 +226,18 @@
/**
* @see org.openuss.discussion.DiscussionService#getPosts(org.openuss.discussion.TopicInfo)
*/
- protected List handleGetPosts(final TopicInfo topicInfo) {
+ protected List<PostInfo> handleGetPosts(final TopicInfo topicInfo) {
Validate.notNull(topicInfo);
Validate.notNull(topicInfo.getId());
getTrackingService().setRead(topicInfo);
Topic topic = getTopicDao().load(topicInfo.getId());
- List<PostInfo> posts = getPostDao().findByTopic(PostDao.TRANSFORM_POSTINFO, topic);
+ @SuppressWarnings("unchecked") List<PostInfo> posts = getPostDao().findByTopic(PostDao.TRANSFORM_POSTINFO, topic);
Collections.sort(posts, new PostInfoComparator());
for (PostInfo post : posts) {
post.setUserIsSubmitter(post.getSubmitterId().equals(getSecurityService().getCurrentUser().getId()));
- List<FileInfo> attachments = getDocumentService().getFileEntries(post);
+ @SuppressWarnings("unchecked") List<FileInfo> attachments = getDocumentService().getFileEntries(post);
post.setAttachments(attachments);
}
@@ -254,7 +256,8 @@
/**
* @see org.openuss.discussion.DiscussionService#getTopics(java.lang.Long)
*/
- protected List handleGetTopics(final ForumInfo forumInfo) {
+ @SuppressWarnings("unchecked")
+ protected List<TopicInfo> handleGetTopics(final ForumInfo forumInfo) {
Validate.notNull(forumInfo, "Parameter forum must not be null");
Validate.notNull(forumInfo.getId(), "Parameter form must provide an valid id.");
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/CourseMemberDaoImpl.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/CourseMemberDaoImpl.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/CourseMemberDaoImpl.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -80,8 +80,9 @@
* @see org.openuss.lecture.CourseMemberDao#findByUser(int,
* org.openuss.security.User)
*/
+ @SuppressWarnings("unchecked")
@Override
- public List findByUser(final int transform, final User user) {
+ public List<CourseMemberInfo> findByUser(final int transform, final User user) {
return this.findByUser(transform,
"from org.openuss.lecture.CourseMember as courseMember where courseMember.courseMemberPk.user = ?",
user);
@@ -91,6 +92,7 @@
* @see org.openuss.lecture.CourseMemberDao#findByCourse(int,
* org.openuss.lecture.Course)
*/
+ @SuppressWarnings("unchecked")
@Override
public List findByCourse(final int transform, final Course course) {
return this.findByCourse(transform,
@@ -101,6 +103,7 @@
* @see org.openuss.lecture.CourseMemberDao#findByType(int,
* org.openuss.lecture.Course, org.openuss.lecture.CourseMemberType)
*/
+ @SuppressWarnings("unchecked")
@Override
public List findByType(final int transform, final Course course, final CourseMemberType memberType) {
return this
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/CourseTypeServiceMock.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/CourseTypeServiceMock.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/CourseTypeServiceMock.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -14,8 +14,8 @@
return null;
}
- public List findCourseTypesByInstitute(Long instituteId) {
- List courseTypes = new ArrayList();
+ public List<CourseTypeInfo> findCourseTypesByInstitute(Long instituteId) {
+ List<CourseTypeInfo> courseTypes = new ArrayList<CourseTypeInfo>();
if(instituteId.longValue() % 2 == 0){
CourseTypeInfo courseType1 = new CourseTypeInfo();
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/DepartmentServiceImpl.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/DepartmentServiceImpl.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/DepartmentServiceImpl.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -270,7 +270,6 @@
this.getApplicationDao().remove(application);
}
- @SuppressWarnings( { "unchecked" })
@Override
protected void handleSignoffInstitute(Long instituteId) throws Exception {
Validate.notNull(instituteId, "The instituteId cannot be null");
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/DepartmentServiceMock.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/DepartmentServiceMock.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/DepartmentServiceMock.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -21,7 +21,7 @@
}
- public List findDepartmentsByUniversityAndTypeAndEnabled(Long universityId, DepartmentType type, boolean enabled) {
+ public List<Department> findDepartmentsByUniversityAndTypeAndEnabled(Long universityId, DepartmentType type, boolean enabled) {
return null;
}
@@ -195,12 +195,11 @@
return null;
}
- @SuppressWarnings( { "unchecked" })
- public List findDepartmentsByType(DepartmentType type) {
+ public List<Department> findDepartmentsByType(DepartmentType type) {
return null;
}
- public List findDepartmentsByUniversityAndType(Long universityId, DepartmentType departmentType) {
+ public List<Department> findDepartmentsByUniversityAndType(Long universityId, DepartmentType departmentType) {
return null;
}
@@ -211,15 +210,15 @@
public void setDepartmentStatus(Long departmentId, boolean status) {
}
- public List findApplicationsByDepartment(Long departmentId) {
+ public List<Department> findApplicationsByDepartment(Long departmentId) {
return null;
}
- public List findApplicationsByDepartmentAndConfirmed(Long departmentId, boolean confirmed) {
+ public List<Department> findApplicationsByDepartmentAndConfirmed(Long departmentId, boolean confirmed) {
return null;
}
- public List findOpenApplicationsByDepartment(Long departmentId) {
+ public List<Department> findOpenApplicationsByDepartment(Long departmentId) {
return null;
}
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/InstituteServiceImpl.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/InstituteServiceImpl.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/InstituteServiceImpl.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -196,12 +196,13 @@
/**
* @see org.openuss.lecture.InstituteService#findInstitutesByEnabled(java.lang.Boolean)
*/
+ @SuppressWarnings("unchecked")
@Override
- protected List handleFindAllInstitutes(boolean enabledOnly) throws Exception {
+ protected List<InstituteInfo> handleFindAllInstitutes(boolean enabledOnly) throws Exception {
if (enabledOnly) {
return getInstituteDao().findByEnabled(InstituteDao.TRANSFORM_INSTITUTEINFO, enabledOnly);
} else {
- return new ArrayList(getInstituteDao().loadAll(InstituteDao.TRANSFORM_INSTITUTEINFO));
+ return new ArrayList<InstituteInfo>(getInstituteDao().loadAll(InstituteDao.TRANSFORM_INSTITUTEINFO));
}
}
@@ -292,7 +293,7 @@
}
@Override
- protected List handleFindApplicationsByInstitute(Long instituteId) throws Exception {
+ protected List<ApplicationInfo> handleFindApplicationsByInstitute(Long instituteId) throws Exception {
Validate.notNull(instituteId, "InstituteService.findApplicationByInstitute - the instituteId cannot be null.");
// Load institute
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/InstituteServiceMock.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/InstituteServiceMock.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/InstituteServiceMock.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -23,10 +23,10 @@
}
- public List findInstitutesByDepartment(Long departmentId) {
- List institutes = new ArrayList();
+ public List<InstituteInfo> findInstitutesByDepartment(Long departmentId) {
+ List<InstituteInfo> institutes = new ArrayList<InstituteInfo>();
- List validDepartments = new ArrayList();
+ List<Long> validDepartments = new ArrayList<Long>();
validDepartments.add(1101L);
validDepartments.add(1102L);
validDepartments.add(1103L);
@@ -78,6 +78,7 @@
return institutes;
}
+ @SuppressWarnings("unchecked")
public List findInstitutesByDepartmentAndEnabled(Long departmentId,
boolean enabled) {
// for testing purposes: return the same data as method findInstitutesByDepartment
@@ -126,7 +127,7 @@
return null;
}
- public List findApplicationsByInstitute(Long instituteId) {
+ public List<Application> findApplicationsByInstitute(Long instituteId) {
return null;
}
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/LectureSearchQuery.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/LectureSearchQuery.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/LectureSearchQuery.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -67,6 +67,7 @@
* @param fuzzy use fuzzy search
* @return List<DomainResult>
*/
+ @SuppressWarnings("unchecked")
public List<DomainResult> search(String textToSearch, boolean fuzzy) {
StringBuilder queryString = new StringBuilder();
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/OrganisationServiceImpl.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/OrganisationServiceImpl.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/OrganisationServiceImpl.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -235,7 +235,7 @@
/**
* @see org.openuss.lecture.OrganisationService#findGroupsByOrganisation(Long)
*/
- protected List handleFindGroupsByOrganisation(Long organisationId) throws Exception {
+ protected List<GroupItem> handleFindGroupsByOrganisation(Long organisationId) throws Exception {
Validate.notNull(organisationId,
"OrganisationService.handleFindGroupsByOrganisation - organisationId cannot be null.");
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/UniversityImpl.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/UniversityImpl.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/UniversityImpl.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -87,7 +87,7 @@
/**
* @see org.openuss.lecture.University#getActivePeriods()
*/
- public List getActivePeriods() {
+ public List<Period> getActivePeriods() {
List<Period> activePeriods = new ArrayList<Period>();
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/UniversityServiceImpl.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/UniversityServiceImpl.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/lecture/UniversityServiceImpl.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -380,7 +380,8 @@
return periodInfos;
}
- private void sortPeriodsByStartDate(List periodInfos) {
+ @SuppressWarnings("unchecked")
+ private void sortPeriodsByStartDate(List<PeriodInfo> periodInfos) {
Collections.sort(periodInfos, new PropertyComparator("startdate", true, false));
}
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/statistics/OnlineStatisticServiceImpl.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/statistics/OnlineStatisticServiceImpl.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/statistics/OnlineStatisticServiceImpl.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -46,7 +46,7 @@
}
private void closeOtherActiveUserSessions(User user, OnlineSession session) {
- List<OnlineSession> userSessions = getOnlineSessionDao().findActiveSessionByUser(user);
+ @SuppressWarnings("unchecked") List<OnlineSession> userSessions = getOnlineSessionDao().findActiveSessionByUser(user);
Date now = new Date();
for (OnlineSession userSession: userSessions) {
if (!userSession.equals(session)) {
Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/system/SystemServiceImpl.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/system/SystemServiceImpl.java 2008-10-05 12:59:05 UTC (rev 4814)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/main/java/org/openuss/system/SystemServiceImpl.java 2008-10-07 13:12:46 UTC (rev 4815)
@@ -62,7 +62,7 @@
/**
* @see org.openuss.system.SystemService#getProperties()
*/
- protected java.util.Collection handleGetProperties() throws java.lang.Exception {
+ protected java.util.Collection<SystemProperty> handleGetProperties() throws java.lang.Exception {
return getSystemPropertyDao().loadAll();
}
@@ -73,6 +73,7 @@
return getSystemPropertyDao().findByName(name);
}
+ @SuppressWarnings("unchecked")
@Override
protected void handlePersistProperties(Collection properties) throws Exception {
getSystemPropertyDao().update(properties);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
