[Lipog-commit] net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/redirect ToDoSession.java, 1.1, 1.2

[Joerg B. <jb...@us...>]

Update of /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/redirect
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv672/src/net/heilancoo/portal/examples/redirect

Modified Files:
	ToDoSession.java 
Log Message:
names straightened out and added details page

Index: ToDoSession.java
===================================================================
RCS file: /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/redirect/ToDoSession.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ToDoSession.java	24 Jul 2009 06:40:36 -0000	1.1
--- ToDoSession.java	3 Aug 2009 17:08:44 -0000	1.2
***************
*** 32,36 ****
   *
   */
! @EntryPoint("listItems")
  @ResponseTemplateFolder("redirect/templates")
  public class ToDoSession implements Session {
--- 32,36 ----
   *
   */
! @EntryPoint("list")
  @ResponseTemplateFolder("redirect/templates")
  public class ToDoSession implements Session {
***************
*** 59,63 ****
  	
  	@Request
! 	public void listItems(HttpRequest request, FormFieldContainer fields,
  			HttpResponse response, HttpContext context, FreeMarkerModel model) {
  		model.put("items", items);
--- 59,63 ----
  	
  	@Request
! 	public void list(HttpRequest request, FormFieldContainer fields,
  			HttpResponse response, HttpContext context, FreeMarkerModel model) {
  		model.put("items", items);
***************
*** 74,80 ****
  	public Object addSubmit(HttpRequest request, FormFieldContainer fields,
  			HttpResponse response, HttpContext context) throws FormFieldAccessException {
! 		String text = fields.getStringValue("text");
! 		items.add(new Item(text, nextId++));
! 		return "listItems";
  	}
  	
--- 74,87 ----
  	public Object addSubmit(HttpRequest request, FormFieldContainer fields,
  			HttpResponse response, HttpContext context) throws FormFieldAccessException {
! 		items.add(new Item(fields.getStringValue("text"), nextId++));
! 		return "list";
! 	}
! 	
! 	public Item findItemForId(int id) {
! 		for(Item i : items)
! 			if(i.getId() == id)
! 				return i;
! 		
! 		return null;
  	}
  	
***************
*** 82,120 ****
  	public Object editSubmit(HttpRequest request, FormFieldContainer fields,
  			HttpResponse response, HttpContext context) throws FormFieldAccessException {
! 		String text = fields.getStringValue("text");
! 		int id = fields.getIntValue("id");
! 
! 		if(fields.hasFieldName("edit"))
! 			for(Item i : items)
! 				if(i.getId() == id) {
! 					i.setText(text);
! 					break;
! 				}
  
! 		return "listItems";
  	}
  	
  	@Request
! 	public Object delEdit(HttpRequest request, FormFieldContainer fields,
  			HttpResponse response, HttpContext context, FreeMarkerModel model) throws FormFieldAccessException {
  		int id = fields.getIntValue("id");
  		
! 		if(fields.hasFieldName("del")) {
! 			for(Item i : items)
! 				if(i.getId() == id) {
! 					items.remove(i);
! 					break;
! 				}
  			
! 			return "listItems";
  		}
! 
! 		for(Item i : items)
! 			if(i.getId() == id) {
! 				model.put("user", user);
! 				model.put("id", id);
! 				model.put("text", i.getText());
! 				break;
! 			}
  		
  		return null;
--- 89,136 ----
  	public Object editSubmit(HttpRequest request, FormFieldContainer fields,
  			HttpResponse response, HttpContext context) throws FormFieldAccessException {
! 		Item i = findItemForId(fields.getIntValue("id"));
! 		
! 		if(i != null && fields.hasFieldName("edit"))
! 			i.setText(fields.getStringValue("text"));
  
! 		return "list";
  	}
  	
  	@Request
! 	public Object edit(HttpRequest request, FormFieldContainer fields,
  			HttpResponse response, HttpContext context, FreeMarkerModel model) throws FormFieldAccessException {
  		int id = fields.getIntValue("id");
+ 		Item i = findItemForId(id);
+ 
+ 		if(i == null)
+ 			return "list";
  		
! 		if(fields.hasFieldName("delete")) {
! 			items.remove(i);
  			
! 			return "list";
  		}
! 		else if(fields.hasFieldName("details"))
! 			return "details?id=" + id;
! 		
! 		model.put("user", user);
! 		model.put("id", id);
! 		model.put("text", i.getText());
! 		
! 		return null;
! 	}
! 	
! 	@Request
! 	public String details(HttpRequest request, FormFieldContainer fields,
! 			HttpResponse response, HttpContext context, FreeMarkerModel model) throws FormFieldAccessException {
! 		int id = fields.getIntValue("id");
! 		Item i = findItemForId(id);
! 		
! 		if(i == null)
! 			return "list";
! 		
! 		model.put("user", user);
! 		model.put("id", id);
! 		model.put("text", i.getText());
  		
  		return null;