Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/IChatUserDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/IChatUserDAO.java (.../IChatUserDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/IChatUserDAO.java (.../IChatUserDAO.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -24,10 +24,7 @@ package org.lamsfoundation.lams.tool.chat.dao; -import java.util.List; - import org.lamsfoundation.lams.dao.IBaseDAO; -import org.lamsfoundation.lams.tool.chat.model.ChatSession; import org.lamsfoundation.lams.tool.chat.model.ChatUser; /** Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatUserDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatUserDAO.java (.../ChatUserDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatUserDAO.java (.../ChatUserDAO.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -28,7 +28,6 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.chat.dao.IChatUserDAO; -import org.lamsfoundation.lams.tool.chat.model.ChatSession; import org.lamsfoundation.lams.tool.chat.model.ChatUser; /** Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatSessionDTO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatSessionDTO.java (.../ChatSessionDTO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatSessionDTO.java (.../ChatSessionDTO.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -32,7 +32,6 @@ import org.lamsfoundation.lams.tool.chat.model.ChatMessage; import org.lamsfoundation.lams.tool.chat.model.ChatSession; -import org.lamsfoundation.lams.tool.chat.model.ChatUser; public class ChatSessionDTO implements Comparable { Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java =================================================================== diff -u -ra96c5d0aeb2e25ac3d9241c5b8ce836eb6248355 -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java (.../Chat.java) (revision a96c5d0aeb2e25ac3d9241c5b8ce836eb6248355) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java (.../Chat.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -29,12 +29,7 @@ import java.util.Iterator; import java.util.Set; -import middlegen.Column; - import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; -import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.tool.chat.service.ChatService; Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java (.../ChatConstants.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java (.../ChatConstants.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -24,10 +24,7 @@ package org.lamsfoundation.lams.tool.chat.util; -import java.util.LinkedList; -import org.lamsfoundation.lams.tool.chat.model.ChatAttachment; - public interface ChatConstants { public static final String TOOL_SIGNATURE = "lachat11"; Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java =================================================================== diff -u -r15e9d26c38d7f65fa9a6a465e068255e5d44cd11 -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 15e9d26c38d7f65fa9a6a465e068255e5d44cd11) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -47,11 +47,8 @@ import org.lamsfoundation.lams.tool.chat.service.ChatServiceProxy; import org.lamsfoundation.lams.tool.chat.service.IChatService; import org.lamsfoundation.lams.tool.chat.util.ChatConstants; -import org.lamsfoundation.lams.tool.chat.util.ChatException; import org.lamsfoundation.lams.tool.chat.web.forms.MonitoringForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.session.SessionManager; Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/servlets/ExportServlet.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -25,7 +25,6 @@ package org.lamsfoundation.lams.tool.chat.web.servlets; -import java.util.ArrayList; import java.util.Iterator; import java.util.List; Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookUserDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookUserDAO.java (.../INotebookUserDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookUserDAO.java (.../INotebookUserDAO.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -24,10 +24,7 @@ package org.lamsfoundation.lams.tool.notebook.dao; -import java.util.List; - import org.lamsfoundation.lams.dao.IBaseDAO; -import org.lamsfoundation.lams.tool.notebook.model.NotebookSession; import org.lamsfoundation.lams.tool.notebook.model.NotebookUser; /** Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java (.../NotebookUserDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java (.../NotebookUserDAO.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -28,7 +28,6 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.notebook.dao.INotebookUserDAO; -import org.lamsfoundation.lams.tool.notebook.model.NotebookSession; import org.lamsfoundation.lams.tool.notebook.model.NotebookUser; /** Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookSessionDTO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookSessionDTO.java (.../NotebookSessionDTO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookSessionDTO.java (.../NotebookSessionDTO.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -26,7 +26,6 @@ package org.lamsfoundation.lams.tool.notebook.dto; import java.util.Iterator; -import java.util.List; import java.util.Set; import java.util.TreeSet; Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookUserDTO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookUserDTO.java (.../NotebookUserDTO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookUserDTO.java (.../NotebookUserDTO.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -27,8 +27,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.notebook.model.NotebookUser; -import org.lamsfoundation.lams.tool.notebook.service.INotebookService; -import org.lamsfoundation.lams.tool.notebook.service.NotebookServiceProxy; public class NotebookUserDTO implements Comparable{ Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java =================================================================== diff -u -r6469a3c8ad3e545e2f1929947d3c46b040896632 -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java (.../Notebook.java) (revision 6469a3c8ad3e545e2f1929947d3c46b040896632) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java (.../Notebook.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -30,9 +30,6 @@ import java.util.Set; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; -import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.tool.notebook.service.NotebookService; Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java (.../INotebookService.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java (.../INotebookService.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -24,8 +24,6 @@ package org.lamsfoundation.lams.tool.notebook.service; -import java.util.List; - import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.notebook.model.Notebook; Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java =================================================================== diff -u -r15e9d26c38d7f65fa9a6a465e068255e5d44cd11 -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 15e9d26c38d7f65fa9a6a465e068255e5d44cd11) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -38,7 +38,6 @@ import org.lamsfoundation.lams.tool.notebook.model.NotebookUser; import org.lamsfoundation.lams.tool.notebook.service.INotebookService; import org.lamsfoundation.lams.tool.notebook.service.NotebookServiceProxy; -import org.lamsfoundation.lams.tool.notebook.web.forms.MonitoringForm; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.util.AttributeNames; Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeHeadingDAO.java =================================================================== diff -u -r51cd744e821c2602f453bedcd22f89887f92d468 -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeHeadingDAO.java (.../IScribeHeadingDAO.java) (revision 51cd744e821c2602f453bedcd22f89887f92d468) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeHeadingDAO.java (.../IScribeHeadingDAO.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -25,7 +25,6 @@ package org.lamsfoundation.lams.tool.scribe.dao; import org.lamsfoundation.lams.dao.IBaseDAO; -import org.lamsfoundation.lams.tool.scribe.model.ScribeHeading; /** * DAO for accessing the ScribeHeading objects - interface defining Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeUserDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeUserDAO.java (.../IScribeUserDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/IScribeUserDAO.java (.../IScribeUserDAO.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -24,10 +24,7 @@ package org.lamsfoundation.lams.tool.scribe.dao; -import java.util.List; - import org.lamsfoundation.lams.dao.IBaseDAO; -import org.lamsfoundation.lams.tool.scribe.model.ScribeSession; import org.lamsfoundation.lams.tool.scribe.model.ScribeUser; /** Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeUserDAO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeUserDAO.java (.../ScribeUserDAO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dao/hibernate/ScribeUserDAO.java (.../ScribeUserDAO.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -28,7 +28,6 @@ import org.lamsfoundation.lams.dao.hibernate.BaseDAO; import org.lamsfoundation.lams.tool.scribe.dao.IScribeUserDAO; -import org.lamsfoundation.lams.tool.scribe.model.ScribeSession; import org.lamsfoundation.lams.tool.scribe.model.ScribeUser; /** Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java =================================================================== diff -u -r51cd744e821c2602f453bedcd22f89887f92d468 -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java (.../IScribeService.java) (revision 51cd744e821c2602f453bedcd22f89887f92d468) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java (.../IScribeService.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -28,7 +28,6 @@ import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.scribe.model.Scribe; import org.lamsfoundation.lams.tool.scribe.model.ScribeAttachment; -import org.lamsfoundation.lams.tool.scribe.model.ScribeHeading; import org.lamsfoundation.lams.tool.scribe.model.ScribeSession; import org.lamsfoundation.lams.tool.scribe.model.ScribeUser; import org.lamsfoundation.lams.tool.scribe.util.ScribeException; Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java =================================================================== diff -u -r51cd744e821c2602f453bedcd22f89887f92d468 -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java (.../ScribeService.java) (revision 51cd744e821c2602f453bedcd22f89887f92d468) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java (.../ScribeService.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -81,7 +81,6 @@ import org.lamsfoundation.lams.util.audit.IAuditService; import org.lamsfoundation.lams.util.wddx.WDDXProcessor; import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; -import org.springframework.orm.ObjectOptimisticLockingFailureException; /** * An implementation of the IScribeService interface. Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java =================================================================== diff -u -r51cd744e821c2602f453bedcd22f89887f92d468 -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java (.../LearningAction.java) (revision 51cd744e821c2602f453bedcd22f89887f92d468) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java (.../LearningAction.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -25,9 +25,7 @@ package org.lamsfoundation.lams.tool.scribe.web.actions; import java.io.IOException; -import java.util.HashMap; import java.util.Iterator; -import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java =================================================================== diff -u -r7ba5395e1098e79e17ee4e6f60a565b6eaed1103 -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 7ba5395e1098e79e17ee4e6f60a565b6eaed1103) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -45,7 +45,6 @@ import org.lamsfoundation.lams.tool.scribe.service.ScribeServiceProxy; import org.lamsfoundation.lams.tool.scribe.util.ScribeConstants; import org.lamsfoundation.lams.tool.scribe.util.ScribeUtils; -import org.lamsfoundation.lams.tool.scribe.web.forms.LearningForm; import org.lamsfoundation.lams.tool.scribe.web.forms.MonitoringForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.WebUtil; Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java =================================================================== diff -u -r4e453bd4d3c0e279ce9669e33996945bddb9dfb7 -r9e446244a7245a4e8893e4673a801c56e4a35334 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 4e453bd4d3c0e279ce9669e33996945bddb9dfb7) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334) @@ -52,8 +52,6 @@ import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; -import com.sun.java_cup.internal.internal_error; - public class ExportServlet extends AbstractExportPortfolioServlet { private static final long serialVersionUID = -2829707715037631881L;