Index: lams_tool_forum/src/java/forumApplicationContext.xml
===================================================================
diff -u -rdc2c4669a29d722cfee09e59636ea9677dcdf64d -r7d76f87c9256aa602c7f30415bb8cab963b07936
--- lams_tool_forum/src/java/forumApplicationContext.xml (.../forumApplicationContext.xml) (revision dc2c4669a29d722cfee09e59636ea9677dcdf64d)
+++ lams_tool_forum/src/java/forumApplicationContext.xml (.../forumApplicationContext.xml) (revision 7d76f87c9256aa602c7f30415bb8cab963b07936)
@@ -56,8 +56,6 @@
-
-
MessageDTO instance from a given Message.
+ * @param msg
+ * @return
+ */
+ public static MessageDTO getMessageDTO(Message msg){
if(msg == null)
return null;
MessageDTO dto = new MessageDTO();
dto.setMessage(msg);
- dto.setAuthor(authorName);
+ dto.setAuthor(msg.getCreatedBy().getFirstName()+" "+msg.getCreatedBy().getLastName());
if(msg.getAttachments() == null || msg.getAttachments().isEmpty())
dto.setHasAttachment(false);
else
dto.setHasAttachment(true);
return dto;
}
-
- public static MessageDTO getMessageDTO(Message msg){
- return getMessageDTO(msg,msg.getCreatedBy().getFirstName()+" "+msg.getCreatedBy().getLastName());
- }
-
+ /**
+ * Get a list of MessageDTO according to given list of Message and author name.
+ * These returned MessageDTO will use same author name with the given author name.
+ * @param msgSet
+ * @param authorName
+ * @return
+ */
public static List getMessageDTO(List msgSet,String authorName){
List retSet = new ArrayList();
if(msgSet == null || msgSet.isEmpty())
@@ -73,6 +79,11 @@
}
return retSet;
}
+ /**
+ * Get a list of MessageDTO according to given list of Message.
+ * @param msgList
+ * @return
+ */
public static List getMessageDTO(List msgList){
List retSet = new ArrayList();
if(msgList == null || msgList.isEmpty())
@@ -92,7 +103,7 @@
}
return retSet;
}
-
+ //-------------------------------DTO get/set method------------------------------
public String getAuthor() {
return author;
}
Fisheye: Tag 7d76f87c9256aa602c7f30415bb8cab963b07936 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/permissions/Permission.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7d76f87c9256aa602c7f30415bb8cab963b07936 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/permissions/PermissionManager.java'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 7d76f87c9256aa602c7f30415bb8cab963b07936 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/permissions/PermissionManagerImpl.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.java
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r7d76f87c9256aa602c7f30415bb8cab963b07936
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.java (.../Attachment.java) (revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.java (.../Attachment.java) (revision 7d76f87c9256aa602c7f30415bb8cab963b07936)
@@ -1,6 +1,5 @@
package org.lamsfoundation.lams.tool.forum.persistence;
-import java.io.InputStream;
import java.util.Date;
import org.apache.commons.lang.builder.EqualsBuilder;
@@ -25,11 +24,8 @@
private String fileType;
private String fileName;
private Date created;
-
- //non-persist fields
- private InputStream inputStream;
- private String contentType;
+
/**
* @hibernate.id column="uid" generator-class="native"
*/
@@ -75,23 +71,6 @@
this.fileName = name;
}
- public InputStream getInputStream() {
- return inputStream;
- }
-
- public void setStream(InputStream inputStream) {
- this.inputStream = inputStream;
- }
-
- public String getContentType() {
- return contentType;
- }
-
- public void setContentType(String contentType) {
- this.contentType = contentType;
- }
-
-
public boolean equals(Object o) {
if (this == o)
return true;
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java
===================================================================
diff -u -r94d998767055fcfbf1a657b792dd19ce1f7edc0b -r7d76f87c9256aa602c7f30415bb8cab963b07936
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java (.../ForumUser.java) (revision 94d998767055fcfbf1a657b792dd19ce1f7edc0b)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java (.../ForumUser.java) (revision 7d76f87c9256aa602c7f30415bb8cab963b07936)
@@ -35,7 +35,6 @@
public class ForumUser implements Serializable,Cloneable{
private static final long serialVersionUID = -7043502180037866257L;
-
private static Logger log = Logger.getLogger(ForumUser.class);
private Long uid;
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -r7d76f87c9256aa602c7f30415bb8cab963b07936
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java (.../Message.java) (revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java (.../Message.java) (revision 7d76f87c9256aa602c7f30415bb8cab963b07936)
@@ -22,19 +22,19 @@
private boolean isAuthored;
private boolean isAnonymous;
- private ForumToolSession toolSession;
- private Message parent;
- private Forum forum;
- private Set attachments;
private Date created;
private Date updated;
- private ForumUser createdBy;
- private ForumUser modifiedBy;
private Date lastReplyDate;
private int replyNumber;
private boolean hideFlag;
+ private ForumToolSession toolSession;
+ private Message parent;
+ private Forum forum;
+ private Set attachments;
+ private ForumUser createdBy;
+ private ForumUser modifiedBy;
/**
* Returns the object's creation date
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/PersistenceException.java
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/PersistenceException.java (revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/PersistenceException.java (revision 7d76f87c9256aa602c7f30415bb8cab963b07936)
@@ -0,0 +1,19 @@
+package org.lamsfoundation.lams.tool.forum.persistence;
+
+/**
+ * User: conradb
+ * Date: 6/06/2005
+ * Time: 10:51:43
+ */
+public class PersistenceException extends RuntimeException {
+
+ private static final long serialVersionUID = 3903937111808861090L;
+
+ public PersistenceException(String message) {
+ super(message);
+ }
+
+ public PersistenceException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -r7d76f87c9256aa602c7f30415bb8cab963b07936
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 7d76f87c9256aa602c7f30415bb8cab963b07936)
@@ -34,7 +34,6 @@
import org.lamsfoundation.lams.tool.exception.DataMissingException;
import org.lamsfoundation.lams.tool.exception.SessionDataExistsException;
import org.lamsfoundation.lams.tool.exception.ToolException;
-import org.lamsfoundation.lams.tool.forum.core.PersistenceException;
import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
import org.lamsfoundation.lams.tool.forum.persistence.AttachmentDao;
@@ -49,9 +48,10 @@
import org.lamsfoundation.lams.tool.forum.persistence.MessageDao;
import org.lamsfoundation.lams.tool.forum.persistence.MessageSeq;
import org.lamsfoundation.lams.tool.forum.persistence.MessageSeqDao;
+import org.lamsfoundation.lams.tool.forum.persistence.PersistenceException;
+import org.lamsfoundation.lams.tool.forum.util.DateComparator;
import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
import org.lamsfoundation.lams.tool.forum.util.ForumToolContentHandler;
-import org.lamsfoundation.lams.tool.forum.util.DateComparator;
import org.lamsfoundation.lams.tool.forum.util.TopicComparator;
import org.lamsfoundation.lams.usermanagement.User;
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -r5cf73c3c3892579e89ad206d4d04c97bda7fd949 -r7d76f87c9256aa602c7f30415bb8cab963b07936
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java (.../IForumService.java) (revision 5cf73c3c3892579e89ad206d4d04c97bda7fd949)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java (.../IForumService.java) (revision 7d76f87c9256aa602c7f30415bb8cab963b07936)
@@ -3,12 +3,12 @@
import java.util.List;
import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.tool.forum.core.PersistenceException;
import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
import org.lamsfoundation.lams.tool.forum.persistence.Forum;
import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
import org.lamsfoundation.lams.tool.forum.persistence.Message;
import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
+import org.lamsfoundation.lams.tool.forum.persistence.PersistenceException;
/**
* Created by IntelliJ IDEA.
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
diff -u -r0eef3496f1da00bff0cba32a35ef61cf9805c0c2 -r7d76f87c9256aa602c7f30415bb8cab963b07936
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 0eef3496f1da00bff0cba32a35ef61cf9805c0c2)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 7d76f87c9256aa602c7f30415bb8cab963b07936)
@@ -44,12 +44,12 @@
import org.apache.struts.action.ActionMapping;
import org.apache.struts.upload.FormFile;
import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.tool.forum.core.PersistenceException;
import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
import org.lamsfoundation.lams.tool.forum.persistence.Forum;
import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
import org.lamsfoundation.lams.tool.forum.persistence.Message;
+import org.lamsfoundation.lams.tool.forum.persistence.PersistenceException;
import org.lamsfoundation.lams.tool.forum.service.IForumService;
import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
import org.lamsfoundation.lams.tool.forum.web.forms.ForumForm;
@@ -73,6 +73,7 @@
HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException, PersistenceException {
String param = mapping.getParameter();
+ //-----------------------Forum Author function ---------------------------
if (param.equals("initPage")) {
return initPage(mapping, form, request, response);
}
@@ -98,18 +99,18 @@
if (param.equals("createTopic")) {
return createTopic(mapping, form, request, response);
}
- if (param.equals("deleteTopic")) {
- return deleteTopic(mapping, form, request, response);
- }
+ if (param.equals("editTopic")) {
+ return editTopic(mapping, form, request, response);
+ }
+ if (param.equals("updateTopic")) {
+ return updateTopic(mapping, form, request, response);
+ }
if (param.equals("viewTopic")) {
return viewTopic(mapping, form, request, response);
}
- if (param.equals("editTopic")) {
- return editTopic(mapping, form, request, response);
+ if (param.equals("deleteTopic")) {
+ return deleteTopic(mapping, form, request, response);
}
- if (param.equals("updateTopic")) {
- return updateTopic(mapping, form, request, response);
- }
if (param.equals("deleteAttachment")) {
return deleteAttachment(mapping, form, request, response);
}
@@ -207,7 +208,7 @@
forumService = getForumManager();
forumService.createRootTopic(forumId,null, message);
- topics.add(MessageDTO.getMessageDTO(message,user.getFirstName()+" "+user.getLastName()));
+ topics.add(MessageDTO.getMessageDTO(message));
request.setAttribute(ForumConstants.SUCCESS_FLAG,"CREATE_SUCCESS");
request.getSession().setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, topics);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -rf9cb968278f75f43535171990713d0012dbc91a3 -r7d76f87c9256aa602c7f30415bb8cab963b07936
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision f9cb968278f75f43535171990713d0012dbc91a3)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision 7d76f87c9256aa602c7f30415bb8cab963b07936)
@@ -17,12 +17,12 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.tool.forum.core.PersistenceException;
import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
import org.lamsfoundation.lams.tool.forum.persistence.Message;
+import org.lamsfoundation.lams.tool.forum.persistence.PersistenceException;
import org.lamsfoundation.lams.tool.forum.service.IForumService;
import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
import org.lamsfoundation.lams.tool.forum.web.forms.MessageForm;
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java
===================================================================
diff -u -rfd1d19665518ba6781ce9e3851889c077e8efff4 -r7d76f87c9256aa602c7f30415bb8cab963b07936
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java (.../ForumForm.java) (revision fd1d19665518ba6781ce9e3851889c077e8efff4)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java (.../ForumForm.java) (revision 7d76f87c9256aa602c7f30415bb8cab963b07936)
@@ -7,9 +7,9 @@
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
import org.apache.struts.upload.FormFile;
import org.apache.struts.validator.ValidatorForm;
import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
@@ -28,6 +28,9 @@
*/
public class ForumForm extends ValidatorForm {
private static final long serialVersionUID = -6054354910960460120L;
+ private static Logger logger = Logger.getLogger(ForumForm.class.getName());
+
+ //Forum fields
private Long toolContentID;
private int currentTab;
private FormFile offlineFile;
@@ -36,15 +39,19 @@
private List offlineFileList;
private Forum forum;
- private static Logger logger = Logger.getLogger(ForumForm.class.getName());
-
+ /**
+ * Empty construction method
+ */
public ForumForm() {
this.toolContentID = new Long(0);
this.forum = new Forum();
this.forum.setTitle("New Forum");
}
-
+ /**
+ * Initialize this form by given Forum instance.
+ * @param forum
+ */
public void setForum(Forum forum) {
this.forum = forum;
//set Form special varaible from given forum
@@ -66,7 +73,35 @@
}
}
+ /**
+ * Forum validation method from STRUCT interface.
+ *
+ */
+ public ActionErrors validate(ActionMapping mapping, javax.servlet.http.HttpServletRequest request) {
+ ActionErrors errors = super.validate(mapping, request);
+ ActionMessage ae;
+ try {
+ if ("".equals(forum.getTitle())) {
+ ActionMessage error = new ActionMessage("error.valueReqd");
+ errors.add("forum.title", error);
+ }
+ if (onlineFile != null && !(onlineFile.getFileName().trim().equals(""))
+ && convertToMeg(onlineFile.getFileSize()) > UploadFileUtil.getMaxFileSize()) {
+ ae = new ActionMessage("error.inputFileTooLarge");
+ errors.add("onlineFile", ae);
+ }
+ if (offlineFile != null && !(offlineFile.getFileName().trim().equals(""))
+ && convertToMeg(offlineFile.getFileSize()) > UploadFileUtil.getMaxFileSize()) {
+ ae = new ActionMessage("error.inputFileTooLarge");
+ errors.add("offlineFile", ae);
+ }
+ } catch (Exception e) {
+ logger.error("", e);
+ }
+ return errors;
+ }
+ //-------------------------get/set methods----------------
public Forum getForum() {
return forum;
}
@@ -92,30 +127,6 @@
return numBytes != 0 ? numBytes / 1024 / 1024 : 0;
}
- public ActionErrors validate(ActionMapping mapping,
- javax.servlet.http.HttpServletRequest request) {
- ActionErrors errors = super.validate(mapping, request);
- ActionError ae;
- try{
- if ("".equals(forum.getTitle())) {
- ActionError error = new ActionError("error.valueReqd");
- errors.add("forum.title", error);
- }
- if (onlineFile != null && !(onlineFile.getFileName().trim().equals("")) &&
- convertToMeg(onlineFile.getFileSize()) > UploadFileUtil.getMaxFileSize()) {
- ae = new ActionError("error.inputFileTooLarge");
- errors.add("onlineFile", ae);
- }
- if (offlineFile != null && !(offlineFile.getFileName().trim().equals("")) &&
- convertToMeg(offlineFile.getFileSize()) > UploadFileUtil.getMaxFileSize()) {
- ae = new ActionError("error.inputFileTooLarge");
- errors.add("offlineFile", ae);
- }
- } catch (Exception e) {
- logger.error("", e);
- }
- return errors;
- }
public int getCurrentTab() {
return currentTab;
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java
===================================================================
diff -u -r24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86 -r7d76f87c9256aa602c7f30415bb8cab963b07936
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java (.../MessageForm.java) (revision 24c0b6a31b3cc9226cf70d4f9f21e8ed45a1ba86)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java (.../MessageForm.java) (revision 7d76f87c9256aa602c7f30415bb8cab963b07936)
@@ -19,19 +19,44 @@
*/
public class MessageForm extends ValidatorForm {
private static final long serialVersionUID = -9054365604649146734L;
-
private static Logger logger = Logger.getLogger(ForumForm.class.getName());
+
protected Message message;
protected Long forumId;
protected Long parentId;
protected Long topicId;
+
+ //attachment file name
private String attachmentName;
+ //Message attachment file
private FormFile attachmentFile;
public MessageForm() {
message = new Message();
}
-
+ /**
+ * MessageForm validation method from STRUCT interface.
+ *
+ */
+ public ActionErrors validate(ActionMapping mapping,
+ javax.servlet.http.HttpServletRequest request) {
+ ActionErrors errors = super.validate(mapping, request);
+ try{
+ if ("".equals(message.getSubject())) {
+ ActionMessage error = new ActionMessage("error.valueReqd");
+ errors.add("message.subject", error);
+ }
+ if ("".equals(message.getBody())) {
+ ActionMessage error = new ActionMessage("error.valueReqd");
+ errors.add("message.body", error);
+ }
+ } catch (Exception e) {
+ logger.error("", e);
+ }
+ return errors;
+ }
+
+ //-------------------------get/set methods----------------
public void setMessage(Message message) {
this.message = message;
}
@@ -64,23 +89,6 @@
return this.topicId;
}
- public ActionErrors validate(ActionMapping mapping,
- javax.servlet.http.HttpServletRequest request) {
- ActionErrors errors = super.validate(mapping, request);
- try{
- if ("".equals(message.getSubject())) {
- ActionMessage error = new ActionMessage("error.valueReqd");
- errors.add("message.subject", error);
- }
- if ("".equals(message.getBody())) {
- ActionMessage error = new ActionMessage("error.valueReqd");
- errors.add("message.body", error);
- }
- } catch (Exception e) {
- logger.error("", e);
- }
- return errors;
- }
public String getAttachmentName() {
return attachmentName;
@@ -97,7 +105,4 @@
public void setAttachmentFile(FormFile attachmentFile) {
this.attachmentFile = attachmentFile;
}
-
-
-
}
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java
===================================================================
diff -u -rcff06c3c3492ed5b4efc013a3e4d8b0f50933b93 -r7d76f87c9256aa602c7f30415bb8cab963b07936
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java (.../ForumManagerImplTest.java) (revision cff06c3c3492ed5b4efc013a3e4d8b0f50933b93)
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java (.../ForumManagerImplTest.java) (revision 7d76f87c9256aa602c7f30415bb8cab963b07936)
@@ -6,10 +6,10 @@
import junit.framework.TestCase;
import org.lamsfoundation.lams.tool.forum.core.GenericObjectFactoryImpl;
-import org.lamsfoundation.lams.tool.forum.core.PersistenceException;
import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
import org.lamsfoundation.lams.tool.forum.persistence.Forum;
import org.lamsfoundation.lams.tool.forum.persistence.Message;
+import org.lamsfoundation.lams.tool.forum.persistence.PersistenceException;
/**
* User: conradb