springframework-cvs

[Keith D. <kd...@us...>]

Update of /cvsroot/springframework/spring-projects/spring-webflow/src/java/org/springframework/webflow/builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13376/src/java/org/springframework/webflow/builder

Modified Files:
	DefaultFlowArtifactFactory.java 
Log Message:
polish

Index: DefaultFlowArtifactFactory.java
===================================================================
RCS file: /cvsroot/springframework/spring-projects/spring-webflow/src/java/org/springframework/webflow/builder/DefaultFlowArtifactFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DefaultFlowArtifactFactory.java	19 Apr 2006 15:35:53 -0000	1.10
--- DefaultFlowArtifactFactory.java	19 Apr 2006 16:48:47 -0000	1.11
***************
*** 116,120 ****
  
  	public boolean isMultiAction(String actionId) throws FlowArtifactException {
! 		if (getServiceRegistry().containsBean(actionId)) {
  			return MultiAction.class.isAssignableFrom(getServiceRegistry().getType(actionId));
  		}
--- 116,120 ----
  
  	public boolean isMultiAction(String actionId) throws FlowArtifactException {
! 		if (containsService(actionId)) {
  			return MultiAction.class.isAssignableFrom(getServiceRegistry().getType(actionId));
  		}
***************
*** 125,129 ****
  
  	public boolean isStatefulAction(String actionId) {
! 		if (getServiceRegistry().containsBean(actionId)) {
  			return !getServiceRegistry().isSingleton(actionId);
  		}
--- 125,129 ----
  
  	public boolean isStatefulAction(String actionId) {
! 		if (containsService(actionId)) {
  			return !getServiceRegistry().isSingleton(actionId);
  		}
***************
*** 153,157 ****
  	}
  
! 	private Object getService(String id, Class artifactType, boolean enforceTypeCheck) {
  		try {
  			if (enforceTypeCheck) {
--- 153,161 ----
  	}
  
! 	protected boolean containsService(String id) {
! 		return getServiceRegistry().containsBean(id);
! 	}
! 	
! 	protected Object getService(String id, Class artifactType, boolean enforceTypeCheck) {
  		try {
  			if (enforceTypeCheck) {
***************
*** 167,171 ****
  	}
  	
! 	private Class getServiceType(String id, Class artifactType) {
  		try {
  			return getServiceRegistry().getType(id);
--- 171,175 ----
  	}
  	
! 	protected Class getServiceType(String id, Class artifactType) {
  		try {
  			return getServiceRegistry().getType(id);