[Lipog-commit] net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/controllerchange TheExport.java, NONE, 1.1 ThePreferences.java, 1.1, 1.2 TheMain.java, 1.1, 1.2 TheSession.java, 1.1, 1.2

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

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

Modified Files:
	ThePreferences.java TheMain.java TheSession.java 
Added Files:
	TheExport.java 
Log Message:
easier controller changing: @ChangeControllers annotation

Index: TheMain.java
===================================================================
RCS file: /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/controllerchange/TheMain.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TheMain.java	1 May 2009 13:42:47 -0000	1.1
--- TheMain.java	10 May 2009 19:51:40 -0000	1.2
***************
*** 12,19 ****
  package net.heilancoo.portal.examples.controllerchange;
  
- import org.apache.http.HttpRequest;
- import org.apache.http.HttpResponse;
- import org.apache.http.protocol.HttpContext;
- 
  import net.heilancoo.portal.freemarker.FreeMarkerModel;
  import net.heilancoo.portal.htmlforms.FormFieldContainer;
--- 12,15 ----
***************
*** 21,25 ****
  import net.heilancoo.portal.responses.RequestTarget;
  import net.heilancoo.portal.responses.ValidResponseFormats;
! import net.heilancoo.portal.session.ChangeController;
  
  /**
--- 17,25 ----
  import net.heilancoo.portal.responses.RequestTarget;
  import net.heilancoo.portal.responses.ValidResponseFormats;
! import net.heilancoo.portal.session.ChangeControllers;
! 
! import org.apache.http.HttpRequest;
! import org.apache.http.HttpResponse;
! import org.apache.http.protocol.HttpContext;
  
  /**
***************
*** 27,30 ****
--- 27,31 ----
   *
   */
+ @ChangeControllers({ TheExport.class, ThePreferences.class })
  public class TheMain implements RequestTarget {
  
***************
*** 51,58 ****
  		model.put("s", s);
  	}
- 	
- 	@ChangeController
- 	public ThePreferences prefs(TheSession s, FormFieldContainer fields) {
- 		return new ThePreferences(s);
- 	}
  }
--- 52,54 ----

--- NEW FILE: TheExport.java ---
/*
 * Copyright (c) 2009 Heilan' Coo -- Joerg Bullmann
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which is available at http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Joerg Bullmann <jb...@he...>
 */

package net.heilancoo.portal.examples.controllerchange;

import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.protocol.HttpContext;

import net.heilancoo.portal.freemarker.FreeMarkerModel;
import net.heilancoo.portal.htmlforms.FormFieldContainer;
import net.heilancoo.portal.responses.EntryPoint;
import net.heilancoo.portal.responses.Request;
import net.heilancoo.portal.responses.RequestTarget;
import net.heilancoo.portal.session.ChangeController;
import net.heilancoo.portal.session.ChangeControllers;

/**
 * @author joerg
 *
 */
@EntryPoint("export")
@ChangeControllers({ TheMain.class, ThePreferences.class })
public class TheExport implements RequestTarget {

	private TheSession s;
	
	public TheExport(TheSession s) {
		this.s = s;
	}

	@Request
	public void export(HttpRequest request, FormFieldContainer fields,
			HttpResponse response, HttpContext context, FreeMarkerModel model) {
		
		s.access();
		model.put("s", s);
	}
	
	@ChangeController
	public TheMain main(TheSession s, FormFieldContainer fields) {
		return new TheMain(s);
	}
}

Index: ThePreferences.java
===================================================================
RCS file: /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/controllerchange/ThePreferences.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ThePreferences.java	1 May 2009 13:42:47 -0000	1.1
--- ThePreferences.java	10 May 2009 19:51:40 -0000	1.2
***************
*** 46,50 ****
  	@ChangeController
  	public TheMain main(TheSession s, FormFieldContainer fields) {
! 		return new TheMain(s);
  	}
  }
--- 46,55 ----
  	@ChangeController
  	public TheMain main(TheSession s, FormFieldContainer fields) {
! 		return null;
! 	}
! 	
! 	@ChangeController
! 	public TheExport export(TheSession s, FormFieldContainer fields) {
! 		return null;
  	}
  }

Index: TheSession.java
===================================================================
RCS file: /cvsroot/lipog/net.heilancoo.portal.examples/src/net/heilancoo/portal/examples/controllerchange/TheSession.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TheSession.java	1 May 2009 13:42:47 -0000	1.1
--- TheSession.java	10 May 2009 19:51:40 -0000	1.2
***************
*** 22,26 ****
   *
   */
! @ValidControllers({ TheMain.class, ThePreferences.class })
  public class TheSession implements Session {
  
--- 22,26 ----
   *
   */
! @ValidControllers({ TheMain.class, ThePreferences.class, TheExport.class })
  public class TheSession implements Session {