[Lipog-commit] net.heilancoo.portal/src/net/heilancoo/portal/application ApplicationRequestHandler.java, 1.8, 1.9

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

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

Modified Files:
	ApplicationRequestHandler.java 
Log Message:
easier controller changing: @ChangeControllers annotation

Index: ApplicationRequestHandler.java
===================================================================
RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/application/ApplicationRequestHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ApplicationRequestHandler.java	4 May 2009 22:06:00 -0000	1.8
--- ApplicationRequestHandler.java	10 May 2009 19:51:37 -0000	1.9
***************
*** 179,189 ****
  				ValidControllers vc = sessionClass.getAnnotation(ValidControllers.class);
  				
! 				if(vc != null) {
! 					for(Class<?> controllerClass : vc.value())
! 						if(!initialiseSession(controllerClass, bundle))
! 							stateOk = false;
! 				}
  				else
! 					if(!initialiseSession(sessionClass, bundle))
  						stateOk = false;
  			}
--- 179,193 ----
  				ValidControllers vc = sessionClass.getAnnotation(ValidControllers.class);
  				
! 				if(vc == null)
! 					initialiseController(sessionClass, "session", bundle);
  				else
! 					for(Class<?> controllerClass : vc.value())
! 						initialiseController(controllerClass, "controller", bundle);
! 				
! 				for(RequestTargetManager tm : targetManagerMap.values())
! 					tm.initialiseChangers("controller", sessionClass, targetManagerMap);
! 				
! 				for(RequestTargetManager tm : targetManagerMap.values())
! 					if(!tm.wrapUpInitialisations("controller"))
  						stateOk = false;
  			}
***************
*** 208,215 ****
  		});
  		
! 		return tm.initialise(bundle, "application", mimeMapper);
  	}
  	
! 	private boolean initialiseSession(Class<?> sessionClass, Bundle bundle) {
  		RequestTargetManager tm = new RequestTargetManager(sessionClass, "main", "logout");
  		
--- 212,220 ----
  		});
  		
! 		tm.initialiseMethods(bundle, "application", mimeMapper);
! 		return tm.wrapUpInitialisations("application");
  	}
  	
! 	private void initialiseController(Class<?> sessionClass, String logTag, Bundle bundle) {
  		RequestTargetManager tm = new RequestTargetManager(sessionClass, "main", "logout");
  		
***************
*** 226,230 ****
  		});
  		
! 		return tm.initialise(bundle, "session", mimeMapper);
  	}
  
--- 231,235 ----
  		});
  		
! 		tm.initialiseMethods(bundle, logTag, mimeMapper);
  	}
  
***************
*** 316,320 ****
  						logger.info("Controller change " + method + ", application " + getUriPrefix()
  								+ ", session " + targetKey + ", " + c.getControllerClassName());
- 					
  						dispatchSessionMethod(method, presentation, targetKey, request, fields, response, context);
  					}
--- 321,324 ----