[Mauischeduler-cvs_notes] CVS: mauisched/src/unm/maui/wiki Wiki.java,1.29,1.30 WikiNode.java,1.4,1.5

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

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

Modified Files:
	Wiki.java WikiNode.java 
Log Message:
Java 1.5 tweak


Index: Wiki.java
===================================================================
RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/wiki/Wiki.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Wiki.java	29 Mar 2004 22:25:07 -0000	1.29
--- Wiki.java	8 Feb 2005 06:00:46 -0000	1.30
***************
*** 560,566 ****
  	Hashtable hash = new Hashtable();
  	int size=wikiNodesHash.size();
! 	Enumeration enum = wikiNodesHash.keys();
  	for (int i=0; i<size; i++) {
! 	    Object key = enum.nextElement();
  	    hash.put(key, wikiNodesHash.get(key));
  	}
--- 560,566 ----
  	Hashtable hash = new Hashtable();
  	int size=wikiNodesHash.size();
! 	Enumeration enum_ = wikiNodesHash.keys();
  	for (int i=0; i<size; i++) {
! 	    Object key = enum_.nextElement();
  	    hash.put(key, wikiNodesHash.get(key));
  	}
***************
*** 754,761 ****
  	    // put nodes in alphabetical order in array (ugly)
  	    int len = wikiNodesHash.size();
! 	    Enumeration enum = wikiNodesHash.keys();
  	    Map tree = Collections.synchronizedMap(new TreeMap());
  	    for (int i=0; i<len; i++) {
! 		nodeID = (NodeID)enum.nextElement();
  		tree.put(nodeID.toString(), nodeID);
  	    }
--- 754,761 ----
  	    // put nodes in alphabetical order in array (ugly)
  	    int len = wikiNodesHash.size();
! 	    Enumeration enum_ = wikiNodesHash.keys();
  	    Map tree = Collections.synchronizedMap(new TreeMap());
  	    for (int i=0; i<len; i++) {
! 		nodeID = (NodeID)enum_.nextElement();
  		tree.put(nodeID.toString(), nodeID);
  	    }
***************
*** 1246,1252 ****
  
  	// make sure responses are OK
! 	Enumeration enum = responseHash.keys();
  	for (int i=0; i<size; i++) {
! 	    WikiResponse update = (WikiResponse)responseHash.get(enum.nextElement());
  
  	    // parse update information
--- 1246,1252 ----
  
  	// make sure responses are OK
! 	Enumeration enum_ = responseHash.keys();
  	for (int i=0; i<size; i++) {
! 	    WikiResponse update = (WikiResponse)responseHash.get(enum_.nextElement());
  
  	    // parse update information
***************
*** 1294,1302 ****
  	int len = jobRes.getNodesCount();
  	Hashtable slothash = jobRes.getSlotHash();
! 	Enumeration enum = slothash.keys();
  	Map tree = Collections.synchronizedMap(new TreeMap());
  	NodeID local;
  	for (int i=0; i<len; i++) {
! 	    local = (NodeID)enum.nextElement();
  	    tree.put(local.toString(), local);
  	}
--- 1294,1302 ----
  	int len = jobRes.getNodesCount();
  	Hashtable slothash = jobRes.getSlotHash();
! 	Enumeration enum_ = slothash.keys();
  	Map tree = Collections.synchronizedMap(new TreeMap());
  	NodeID local;
  	for (int i=0; i<len; i++) {
! 	    local = (NodeID)enum_.nextElement();
  	    tree.put(local.toString(), local);
  	}
***************
*** 1352,1360 ****
  	int len = jobRes.getNodesCount();
  	Hashtable slothash = jobRes.getSlotHash();
! 	Enumeration enum = slothash.keys();
  	Map tree = Collections.synchronizedMap(new TreeMap());
  	NodeID nodeID;
  	for (int i=0; i<len; i++) {
! 	    nodeID = (NodeID)enum.nextElement();
  	    tree.put(nodeID.toString(), nodeID);
  	}
--- 1352,1360 ----
  	int len = jobRes.getNodesCount();
  	Hashtable slothash = jobRes.getSlotHash();
! 	Enumeration enum_ = slothash.keys();
  	Map tree = Collections.synchronizedMap(new TreeMap());
  	NodeID nodeID;
  	for (int i=0; i<len; i++) {
! 	    nodeID = (NodeID)enum_.nextElement();
  	    tree.put(nodeID.toString(), nodeID);
  	}

Index: WikiNode.java
===================================================================
RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/wiki/WikiNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WikiNode.java	11 Feb 2002 09:24:51 -0000	1.4
--- WikiNode.java	8 Feb 2005 06:00:47 -0000	1.5
***************
*** 152,158 ****
  	// Only overwrite/remove values contained in the node's Hash
  	Hashtable f = node.getFeatureHash();
! 	Enumeration enum = f.keys();
! 	while (enum.hasMoreElements()) {
! 	    Object key = enum.nextElement();
  	    Object val = f.get(key);
  	    if (val.toString().equals("REMOVE")) {
--- 152,158 ----
  	// Only overwrite/remove values contained in the node's Hash
  	Hashtable f = node.getFeatureHash();
! 	Enumeration enum_ = f.keys();
! 	while (enum_.hasMoreElements()) {
! 	    Object key = enum_.nextElement();
  	    Object val = f.get(key);
  	    if (val.toString().equals("REMOVE")) {