[Mauischeduler-cvs_notes] CVS: mauisched/src/unm/maui/rm BasicMatcher.java,1.10,1.11 NodeSlotMatcher.java,1.5,1.6

[Aaron S. <mau...@us...>]

Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/rm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15802/src/unm/maui/rm

Modified Files:
	BasicMatcher.java NodeSlotMatcher.java 
Log Message:
Java 1.5 tweak


Index: BasicMatcher.java
===================================================================
RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/rm/BasicMatcher.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** BasicMatcher.java	18 Jul 2002 23:33:56 -0000	1.10
--- BasicMatcher.java	8 Feb 2005 06:00:46 -0000	1.11
***************
*** 140,146 ****
  	}
  
! 	Enumeration enum = reqFeatures.keys();
! 	while (enum.hasMoreElements()) {
! 	    key = (String)enum.nextElement();
  	    vec = (Vector)reqFeatures.get(key);
  	    cmp = (String)vec.elementAt(1);
--- 140,146 ----
  	}
  
! 	Enumeration enum_ = reqFeatures.keys();
! 	while (enum_.hasMoreElements()) {
! 	    key = (String)enum_.nextElement();
  	    vec = (Vector)reqFeatures.get(key);
  	    cmp = (String)vec.elementAt(1);

Index: NodeSlotMatcher.java
===================================================================
RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/rm/NodeSlotMatcher.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NodeSlotMatcher.java	23 Jan 2002 06:22:50 -0000	1.5
--- NodeSlotMatcher.java	8 Feb 2005 06:00:46 -0000	1.6
***************
*** 168,174 ****
  
  	// Aggregate disparate slots into the slotHash
! 	Enumeration enum = slotsListHash.keys();
! 	while (enum.hasMoreElements()) {
! 	    node = (Node)enum.nextElement();
  	    hash = (Hashtable)slotsListHash.get(node);
  	    SlotID[] slotIDs = new SlotID[hash.size()];
--- 168,174 ----
  
  	// Aggregate disparate slots into the slotHash
! 	Enumeration enum_ = slotsListHash.keys();
! 	while (enum_.hasMoreElements()) {
! 	    node = (Node)enum_.nextElement();
  	    hash = (Hashtable)slotsListHash.get(node);
  	    SlotID[] slotIDs = new SlotID[hash.size()];