Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookUserDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookUserDTO.java,v
diff -u -r1.5 -r1.5.10.1
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookUserDTO.java	2 May 2008 07:00:36 -0000	1.5
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookUserDTO.java	9 Nov 2009 04:07:42 -0000	1.5.10.1
@@ -28,104 +28,104 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.notebook.model.NotebookUser;
 
-public class NotebookUserDTO implements Comparable{
-	
-	public Long uid;
-	
-	public String loginName;
-	
-	public String firstName;
-	
-	public String lastName;
-	
-	public boolean finishedActivity;
-	
-	public NotebookEntryDTO entryDTO;
+public class NotebookUserDTO implements Comparable {
 
-	public Long entryUID;
-	
-	public NotebookUserDTO(NotebookUser user, NotebookEntry entry) {
-		this.uid = user.getUid();
-		this.loginName = user.getLoginName();
-		this.firstName = user.getFirstName();
-		this.lastName = user.getLastName();
-		this.finishedActivity = user.isFinishedActivity();
-		this.entryUID = user.getEntryUID();
-		this.entryDTO = new NotebookEntryDTO(entry);
-	}
-	
-	public NotebookUserDTO(NotebookUser user) {
-		this.uid = user.getUid();
-		this.loginName = user.getLoginName();
-		this.firstName = user.getFirstName();
-		this.lastName = user.getLastName();
-		this.finishedActivity = user.isFinishedActivity();
-		this.entryUID = user.getEntryUID();		
-	}
+    public Long uid;
 
-	public int compareTo(Object o) {
-		int returnValue;
-		NotebookUserDTO toUser = (NotebookUserDTO)o;
-		returnValue = this.lastName.compareTo(toUser.lastName);
-		if (returnValue == 0) {
-			returnValue = this.uid.compareTo(toUser.uid);			
-		}
-		return returnValue;		
-	}
+    public String loginName;
 
-	public String getFirstName() {
-		return firstName;
-	}
+    public String firstName;
 
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
+    public String lastName;
 
-	public String getLastName() {
-		return lastName;
-	}
+    public boolean finishedActivity;
 
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
+    public NotebookEntryDTO entryDTO;
 
-	public String getLoginName() {
-		return loginName;
-	}
+    public Long entryUID;
 
-	public void setLoginName(String loginName) {
-		this.loginName = loginName;
-	}
+    public NotebookUserDTO(NotebookUser user, NotebookEntry entry) {
+	this.uid = user.getUid();
+	this.loginName = user.getLoginName();
+	this.firstName = user.getFirstName();
+	this.lastName = user.getLastName();
+	this.finishedActivity = user.isFinishedActivity();
+	this.entryUID = user.getEntryUID();
+	this.entryDTO = new NotebookEntryDTO(entry);
+    }
 
-	public Long getUid() {
-		return uid;
-	}
+    public NotebookUserDTO(NotebookUser user) {
+	this.uid = user.getUid();
+	this.loginName = user.getLoginName();
+	this.firstName = user.getFirstName();
+	this.lastName = user.getLastName();
+	this.finishedActivity = user.isFinishedActivity();
+	this.entryUID = user.getEntryUID();
+    }
 
-	public void setUid(Long uid) {
-		this.uid = uid;
+    public int compareTo(Object o) {
+	int returnValue;
+	NotebookUserDTO toUser = (NotebookUserDTO) o;
+	returnValue = this.lastName.compareTo(toUser.lastName);
+	if (returnValue == 0) {
+	    returnValue = this.uid.compareTo(toUser.uid);
 	}
+	return returnValue;
+    }
 
-	public NotebookEntryDTO getEntryDTO() {
-		return entryDTO;
-	}
+    public String getFirstName() {
+	return firstName;
+    }
 
-	public void setEntryDTO(NotebookEntryDTO entryDTO) {
-		this.entryDTO = entryDTO;
-	}
+    public void setFirstName(String firstName) {
+	this.firstName = firstName;
+    }
 
-	public Long getEntryUID() {
-		return entryUID;
-	}
+    public String getLastName() {
+	return lastName;
+    }
 
-	public void setEntryUID(Long entryUID) {
-		this.entryUID = entryUID;
-	}
+    public void setLastName(String lastName) {
+	this.lastName = lastName;
+    }
 
-	public boolean isFinishedActivity() {
-		return finishedActivity;
-	}
+    public String getLoginName() {
+	return loginName;
+    }
 
-	public void setFinishedActivity(boolean finishedActivity) {
-		this.finishedActivity = finishedActivity;
-	}
+    public void setLoginName(String loginName) {
+	this.loginName = loginName;
+    }
+
+    public Long getUid() {
+	return uid;
+    }
+
+    public void setUid(Long uid) {
+	this.uid = uid;
+    }
+
+    public NotebookEntryDTO getEntryDTO() {
+	return entryDTO;
+    }
+
+    public void setEntryDTO(NotebookEntryDTO entryDTO) {
+	this.entryDTO = entryDTO;
+    }
+
+    public Long getEntryUID() {
+	return entryUID;
+    }
+
+    public void setEntryUID(Long entryUID) {
+	this.entryUID = entryUID;
+    }
+
+    public boolean isFinishedActivity() {
+	return finishedActivity;
+    }
+
+    public void setFinishedActivity(boolean finishedActivity) {
+	this.finishedActivity = finishedActivity;
+    }
 }