[Mauischeduler-cvs_notes] CVS: mauisched/src/unm/maui/server CheckJob.java,1.13,1.14 CheckRes.java,1.11,1.12 CheckUser.java,1.1,1.2 ShowQ.java,1.9,1.10

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

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

Modified Files:
	CheckJob.java CheckRes.java CheckUser.java ShowQ.java 
Log Message:
Java 1.5 tweak


Index: CheckJob.java
===================================================================
RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/server/CheckJob.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CheckJob.java	29 Mar 2004 22:25:06 -0000	1.13
--- CheckJob.java	8 Feb 2005 06:00:46 -0000	1.14
***************
*** 119,127 ****
  	    Hashtable slotHash = res.getSlotHash();
  	    buf.append("<nodes>\n");
! 	    Enumeration enum = slotHash.keys();
  	    Map tree = Collections.synchronizedMap(new TreeMap());
  	    NodeID nodeID;
! 	    while (enum.hasMoreElements()) {
! 		nodeID = (NodeID)enum.nextElement();
  		tree.put(nodeID.toString(), nodeID);
  	    }
--- 119,127 ----
  	    Hashtable slotHash = res.getSlotHash();
  	    buf.append("<nodes>\n");
! 	    Enumeration enum_ = slotHash.keys();
  	    Map tree = Collections.synchronizedMap(new TreeMap());
  	    NodeID nodeID;
! 	    while (enum_.hasMoreElements()) {
! 		nodeID = (NodeID)enum_.nextElement();
  		tree.put(nodeID.toString(), nodeID);
  	    }
***************
*** 144,150 ****
  	Hashtable reqFeatures = job.getReqFeatures();
  	if (reqFeatures != null) {
! 	    Enumeration enum = reqFeatures.keys();
! 	    while (enum.hasMoreElements()) {
! 		String str = (String)enum.nextElement();
  		Vector vec = (Vector)reqFeatures.get(str);
  		buf.append("<feature key='"+vec.elementAt(0)+"' cmp='");
--- 144,150 ----
  	Hashtable reqFeatures = job.getReqFeatures();
  	if (reqFeatures != null) {
! 	    Enumeration enum_ = reqFeatures.keys();
! 	    while (enum_.hasMoreElements()) {
! 		String str = (String)enum_.nextElement();
  		Vector vec = (Vector)reqFeatures.get(str);
  		buf.append("<feature key='"+vec.elementAt(0)+"' cmp='");

Index: CheckRes.java
===================================================================
RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/server/CheckRes.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CheckRes.java	29 Mar 2004 22:25:06 -0000	1.11
--- CheckRes.java	8 Feb 2005 06:00:46 -0000	1.12
***************
*** 101,107 ****
  	    buf.append("<reslimits>\n");
  	    Hashtable limits = cres.getLimits();
! 	    Enumeration enum = limits.keys();
! 	    while (enum.hasMoreElements()) {
! 		String key = (String)enum.nextElement();
  		String val = (String)limits.get(key);
  		buf.append("<reslimit key='"+key+"' val='"+val+"'/>\n");
--- 101,107 ----
  	    buf.append("<reslimits>\n");
  	    Hashtable limits = cres.getLimits();
! 	    Enumeration enum_ = limits.keys();
! 	    while (enum_.hasMoreElements()) {
! 		String key = (String)enum_.nextElement();
  		String val = (String)limits.get(key);
  		buf.append("<reslimit key='"+key+"' val='"+val+"'/>\n");
***************
*** 113,121 ****
  	buf.append("<nodes nodescount='"+res.getNodesCount()
  		+"' slotscount='"+res.getSlotsCount()+"'>\n");
! 	Enumeration enum = slotHash.keys();
  	Map tree = Collections.synchronizedMap(new TreeMap());
  	NodeID nodeID;
! 	while (enum.hasMoreElements()) {
! 	    nodeID = (NodeID)enum.nextElement();
  	    tree.put(nodeID.toString(), nodeID);
  	}
--- 113,121 ----
  	buf.append("<nodes nodescount='"+res.getNodesCount()
  		+"' slotscount='"+res.getSlotsCount()+"'>\n");
! 	Enumeration enum_ = slotHash.keys();
  	Map tree = Collections.synchronizedMap(new TreeMap());
  	NodeID nodeID;
! 	while (enum_.hasMoreElements()) {
! 	    nodeID = (NodeID)enum_.nextElement();
  	    tree.put(nodeID.toString(), nodeID);
  	}

Index: CheckUser.java
===================================================================
RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/server/CheckUser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CheckUser.java	17 Jan 2004 09:49:42 -0000	1.1
--- CheckUser.java	8 Feb 2005 06:00:46 -0000	1.2
***************
*** 70,82 ****
  	Hashtable globalJobMap = new Hashtable();
  	Hashtable runHash = scheduler.getRunHash();
! 	Enumeration enum = runHash.keys();
! 	while (enum.hasMoreElements()) {
! 	    String jobid = (String)enum.nextElement();
  	    Job job = (Job)runHash.get(jobid);
  	    Reservation res = job.getReservation();
  	    Hashtable slothash = res.getSlotHash();
! 	    Enumeration enum2 = slothash.elements();
! 	    while (enum2.hasMoreElements()) {
! 		SlotID[] slotids = (SlotID[])enum2.nextElement();
  		int lenj = slotids.length;
  		for (int j=0; j<lenj; j++) {
--- 70,82 ----
  	Hashtable globalJobMap = new Hashtable();
  	Hashtable runHash = scheduler.getRunHash();
! 	Enumeration enum_ = runHash.keys();
! 	while (enum_.hasMoreElements()) {
! 	    String jobid = (String)enum_.nextElement();
  	    Job job = (Job)runHash.get(jobid);
  	    Reservation res = job.getReservation();
  	    Hashtable slothash = res.getSlotHash();
! 	    Enumeration enum_2 = slothash.elements();
! 	    while (enum_2.hasMoreElements()) {
! 		SlotID[] slotids = (SlotID[])enum_2.nextElement();
  		int lenj = slotids.length;
  		for (int j=0; j<lenj; j++) {
***************
*** 100,106 ****
  	    if (res instanceof SysReservation) {
  		Hashtable slothash = res.getSlotHash();
! 		Enumeration enum2 = slothash.elements();
! 		while (enum2.hasMoreElements()) {
! 		    SlotID[] slotids = (SlotID[])enum2.nextElement();
  		    int lenj = slotids.length;
  		    for (int j=0; j<lenj; j++) {
--- 100,106 ----
  	    if (res instanceof SysReservation) {
  		Hashtable slothash = res.getSlotHash();
! 		Enumeration enum_2 = slothash.elements();
! 		while (enum_2.hasMoreElements()) {
! 		    SlotID[] slotids = (SlotID[])enum_2.nextElement();
  		    int lenj = slotids.length;
  		    for (int j=0; j<lenj; j++) {

Index: ShowQ.java
===================================================================
RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/server/ShowQ.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ShowQ.java	14 Apr 2002 01:49:05 -0000	1.9
--- ShowQ.java	8 Feb 2005 06:00:46 -0000	1.10
***************
*** 122,128 ****
  	    // print everything
  	    buf.append("<activejobs val='").append(runHash.size()).append("'>\n");
! 	    Enumeration enum = runHash.keys();
! 	    while (enum.hasMoreElements()) {
! 		id = (String)enum.nextElement();
  		job = (Job)runHash.get(id);
  		JobReservation res = (JobReservation)job.getReservation();
--- 122,128 ----
  	    // print everything
  	    buf.append("<activejobs val='").append(runHash.size()).append("'>\n");
! 	    Enumeration enum_ = runHash.keys();
! 	    while (enum_.hasMoreElements()) {
! 		id = (String)enum_.nextElement();
  		job = (Job)runHash.get(id);
  		JobReservation res = (JobReservation)job.getReservation();
***************
*** 171,177 ****
  	    Hashtable holdHash = scheduler.getHoldHash();
  	    buf.append("<heldjobs val='").append(holdHash.size()).append("'>\n");
! 	    Enumeration enum = holdHash.keys();
! 	    while (enum.hasMoreElements()) {
! 		id = (String)enum.nextElement();
  		job = (Job)holdHash.get(id);
  
--- 171,177 ----
  	    Hashtable holdHash = scheduler.getHoldHash();
  	    buf.append("<heldjobs val='").append(holdHash.size()).append("'>\n");
! 	    Enumeration enum_ = holdHash.keys();
! 	    while (enum_.hasMoreElements()) {
! 		id = (String)enum_.nextElement();
  		job = (Job)holdHash.get(id);
  
***************
*** 186,192 ****
  	    Hashtable deferredHash = scheduler.getDeferredHash();
  	    buf.append("<deferredjobs val='").append(deferredHash.size()).append("'>\n");
! 	    Enumeration enum = deferredHash.keys();
! 	    while (enum.hasMoreElements()) {
! 		id = (String)enum.nextElement();
  		job = (Job)deferredHash.get(id);
  
--- 186,192 ----
  	    Hashtable deferredHash = scheduler.getDeferredHash();
  	    buf.append("<deferredjobs val='").append(deferredHash.size()).append("'>\n");
! 	    Enumeration enum_ = deferredHash.keys();
! 	    while (enum_.hasMoreElements()) {
! 		id = (String)enum_.nextElement();
  		job = (Job)deferredHash.get(id);