ruper2/src/java/core/org/krysalis/ruper2/files DefaultResourceFilenameAnalyzer.java,1.8,1.9 DefaultResourceGroupFilenameAnalyzer.java,1.5,1.6

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

Modified Files:
	DefaultResourceFilenameAnalyzer.java 
	DefaultResourceGroupFilenameAnalyzer.java 
Log Message:
1) Moved IMonitor -> IFileMonitor (to allow others)
2) GroupBy now works (iterated unsorted list be accindent)
3) Started on 'clean' (remove old versions from a repo)

Index: DefaultResourceFilenameAnalyzer.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/files/DefaultResourceFilenameAnalyzer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DefaultResourceFilenameAnalyzer.java	9 Oct 2003 21:15:01 -0000	1.8
--- DefaultResourceFilenameAnalyzer.java	12 Oct 2003 18:12:07 -0000	1.9
***************
*** 18,21 ****
--- 18,22 ----
  import org.krysalis.ruper2.monitor.Monitor;
  import org.krysalis.ruper2.resource.Resource;
+ import org.krysalis.ruper2.resource.ResourceAttribute;
  import org.krysalis.ruper2.resource.ResourceGroup;
  import org.krysalis.ruper2.resource.ResourceType;
***************
*** 113,119 ****
  						(VirtualResourceLocator) m_md5map.get(resource);
  
! 					//:TODO: set attribute...
! 					//System.out.println(
! 					//	"MD5 for [" + resource + "] is @ " + md5location);
  				}
  			}
--- 114,122 ----
  						(VirtualResourceLocator) m_md5map.get(resource);
  
! 					// Set this as an attribute on the resource,
! 					// future code could process this (to check)
! 					resource.setAttribute(
! 						ResourceAttribute.MD5_LOCATION,
! 						md5location);
  				}
  			}
***************
*** 351,355 ****
  		//
  		boolean ignore =
! 			(null == name) || (0 == name.length()) || (name.startsWith("."));
  
  		if (!ignore)
--- 354,361 ----
  		//
  		boolean ignore =
! 			(null == name)
! 				|| (0 == name.length())
! 				|| name.startsWith(".")
! 				|| (name.equals("CVS"));
  
  		if (!ignore)
***************
*** 370,373 ****
--- 376,382 ----
  				//:TODO: Could be written better
  				if (!store.contains(temp)) {
+ 
+ 					Monitor.getMonitor().ignored(resourceName);
+ 
  					store.addResource(temp);
  				}
***************
*** 390,394 ****
  							ve.getLocalizedMessage()}),
  					ve);
! 					
  				Monitor.getMonitor().failed(resourceName);
  			}
--- 399,403 ----
  							ve.getLocalizedMessage()}),
  					ve);
! 
  				Monitor.getMonitor().failed(resourceName);
  			}
***************
*** 524,527 ****
  		m_base = locator;
  	}
- 
  }
--- 533,535 ----

Index: DefaultResourceGroupFilenameAnalyzer.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/files/DefaultResourceGroupFilenameAnalyzer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DefaultResourceGroupFilenameAnalyzer.java	9 Oct 2003 21:15:01 -0000	1.5
--- DefaultResourceGroupFilenameAnalyzer.java	12 Oct 2003 18:12:07 -0000	1.6
***************
*** 153,157 ****
  			(null == groupName)
  				|| (0 == groupName.length())
! 				|| (groupName.startsWith("."));
  
  		if (!ignore) {
--- 153,157 ----
  			(null == groupName)
  				|| (0 == groupName.length())
! 				|| (groupName.startsWith(".") || (groupName.equals(("CVS"))));
  
  		if (!ignore) {
***************
*** 162,166 ****
  		}
  		else {
! 		
  			Logger.getLog().debug(
  				Messages.getString(MessageConstants.IGNORE, groupName));
--- 162,166 ----
  		}
  		else {
! 
  			Logger.getLog().debug(
  				Messages.getString(MessageConstants.IGNORE, groupName));




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php