lipog-commit

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

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

Modified Files:
	PortalPlugin.java 
Log Message:
tidy up of response generators

Index: PortalPlugin.java
===================================================================
RCS file: /cvsroot/lipog/net.heilancoo.portal/src/net/heilancoo/portal/PortalPlugin.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** PortalPlugin.java	28 Jul 2009 16:40:50 -0000	1.25
--- PortalPlugin.java	20 Aug 2009 20:46:56 -0000	1.26
***************
*** 16,22 ****
  import java.io.IOException;
  import java.lang.reflect.Method;
- import java.util.ArrayList;
  import java.util.HashMap;
- import java.util.List;
  import java.util.Map;
  import java.util.Properties;
--- 16,20 ----
***************
*** 70,74 ****
  	private Map<String, ApplicationRequestHandler> webAppMap;
  	
! 	private List<ResponderFactory> responseGeneratorFactories;
  	
  	private Thread httpServiceThread;
--- 68,72 ----
  	private Map<String, ApplicationRequestHandler> webAppMap;
  	
! 	private ResponderFactory responseGeneratorFactory;
  	
  	private Thread httpServiceThread;
***************
*** 86,90 ****
  		this.webAppMap          = new TreeMap<String, ApplicationRequestHandler>();
  		this.requestHandlerMap  = new HashMap<String, HttpRequestHandler>();
! 		this.responseGeneratorFactories = new ArrayList<ResponderFactory>();
  	}
  
--- 84,88 ----
  		this.webAppMap          = new TreeMap<String, ApplicationRequestHandler>();
  		this.requestHandlerMap  = new HashMap<String, HttpRequestHandler>();
! 		this.responseGeneratorFactory = new ResponderFactory();
  	}
  
***************
*** 117,127 ****
  	
  	public Responder findResponseGeneratorFor(Method method, Bundle bundle, MimeTypeMapper mimeMapper) {
! 		for(ResponderFactory factory : responseGeneratorFactories) {
! 			Responder g = factory.tryMakingResponderFor(method, bundle, mimeMapper);
! 			if(g != null)
! 				return g;
! 		}
! 		
! 		return null;
  	}
  	
--- 115,119 ----
  	
  	public Responder findResponseGeneratorFor(Method method, Bundle bundle, MimeTypeMapper mimeMapper) {
! 		return responseGeneratorFactory.tryMakingResponderFor(method, bundle, mimeMapper);
  	}
  	
***************
*** 135,145 ****
  		for(IExtension ex : point.getExtensions()) {
  			for(IConfigurationElement ce : ex.getConfigurationElements()) {
! 				logger.info("Response generator factory " + ce.getAttribute("generator-factory") + ".");
  				
  				try {
! 					ResponderFactory gen = (ResponderFactory) ce.createExecutableExtension("generator-factory");
! 					responseGeneratorFactories.add(gen);
  				}
! 				catch (CoreException e) {
  					logger.error(e, e);
  					initialisationOk = false;
--- 127,137 ----
  		for(IExtension ex : point.getExtensions()) {
  			for(IConfigurationElement ce : ex.getConfigurationElements()) {
! 				logger.info("Response generator " + ce.getAttribute("generator") + ".");
  				
  				try {
! 					Responder resp = (Responder) ce.createExecutableExtension("generator");
! 					responseGeneratorFactory.addResponder(resp.getClass());
  				}
! 				catch (Exception e) {
  					logger.error(e, e);
  					initialisationOk = false;