ruper2/src/java/core/org/krysalis/ruper2/files DefaultResourceFilenameAnalyzer.java,1.11,1.12

Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/files
In directory sc8-pr-cvs1:/tmp/cvs-serv20837/src/java/core/org/krysalis/ruper2/files

Modified Files:
	DefaultResourceFilenameAnalyzer.java 
Log Message:
Added the avalon repository.

Index: DefaultResourceFilenameAnalyzer.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/files/DefaultResourceFilenameAnalyzer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DefaultResourceFilenameAnalyzer.java	22 Oct 2003 21:53:25 -0000	1.11
--- DefaultResourceFilenameAnalyzer.java	29 Oct 2003 23:09:45 -0000	1.12
***************
*** 63,66 ****
--- 63,67 ----
  		// MD5 locations for resources...
  		private Map m_md5map = new HashMap();
+ 		private Map m_ascmap = new HashMap();
  
  		boolean contains(Resource resource) {
***************
*** 72,76 ****
  
  			//
! 			// Keep .MD5s separate
  			// 
  			String extension = resource.getExtension();
--- 73,77 ----
  
  			//
! 			// Keep .MD5s|.ASCs separate
  			// 
  			String extension = resource.getExtension();
***************
*** 90,93 ****
--- 91,109 ----
  				m_md5map.put(orig, resource.getLocation());
  			}
+ 			else if (
+ 				(null != extension)
+ 					&& (extension.endsWith(RuperConstants.ASC_EXTN))
+ 					&& (extension.length() > RuperConstants.ASC_EXTN.length())) {
+ 
+ 				Resource orig = new Resource(resource);
+ 
+ 				String newExtn =
+ 					extension.substring(
+ 						0,
+ 						extension.length() - RuperConstants.ASC_EXTN.length());
+ 				orig.setExtension(newExtn);
+ 
+ 				m_ascmap.put(orig, resource.getLocation());
+ 			}
  			else {
  				// Meant to look first...
***************
*** 121,124 ****
--- 137,151 ----
  						md5location);
  				}
+ 				else if (m_ascmap.containsKey(resource)) {
+ 					// Store the ASC location for this resource
+ 					VirtualResourceLocator asclocation =
+ 						(VirtualResourceLocator) m_ascmap.get(resource);
+ 
+ 					// Set this as an attribute on the resource,
+ 					// future code could process this (to check)
+ 					resource.setAttribute(
+ 						ResourceAttribute.ASC_LOCATION,
+ 						asclocation);
+ 				}
  			}
  			return m_list;
***************
*** 378,382 ****
  				if (!store.contains(temp)) {
  
! 					Monitor.getMonitor().notify(new FileEvent(FileEvent.PARSED, resourceName));
  
  					store.addResource(temp);
--- 405,410 ----
  				if (!store.contains(temp)) {
  
! 					Monitor.getMonitor().notify(
! 						new FileEvent(FileEvent.PARSED, resourceName));
  
  					store.addResource(temp);
***************
*** 401,408 ****
  					ve);
  
! 				Monitor.getMonitor().notify(new FileEvent(FileEvent.FAILED, resourceName));
  			}
  		else
! 			Monitor.getMonitor().notify(new FileEvent(FileEvent.IGNORED, resourceName));
  
  	}
--- 429,438 ----
  					ve);
  
! 				Monitor.getMonitor().notify(
! 					new FileEvent(FileEvent.FAILED, resourceName));
  			}
  		else
! 			Monitor.getMonitor().notify(
! 				new FileEvent(FileEvent.IGNORED, resourceName));
  
  	}




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?   SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/