Update of /cvsroot/mauischeduler/mauisched/src/unm/maui/res
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15802/src/unm/maui/res
Modified Files:
BasicRes.java BasicSys.java Sys.java SysRes.java
Log Message:
Java 1.5 tweak
Index: BasicRes.java
===================================================================
RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/res/BasicRes.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** BasicRes.java 3 Jan 2003 20:49:58 -0000 1.11
--- BasicRes.java 8 Feb 2005 06:00:46 -0000 1.12
***************
*** 288,292 ****
*/
public void init () {
! Enumeration enum = slotHash.elements();
int len, size=slotHash.size();
SlotID[] slots;
--- 288,292 ----
*/
public void init () {
! Enumeration enum_ = slotHash.elements();
int len, size=slotHash.size();
SlotID[] slots;
***************
*** 294,298 ****
for (int i=0; i<size; i++) {
! slots = (SlotID[])enum.nextElement();
len = slots.length;
slotsCount+=len;
--- 294,298 ----
for (int i=0; i<size; i++) {
! slots = (SlotID[])enum_.nextElement();
len = slots.length;
slotsCount+=len;
***************
*** 307,317 ****
*/
public void shutdown () {
! Enumeration enum = slotHash.keys();
NodeID nodeID;
Node node;
StringBuffer buf = new StringBuffer();
! while (enum.hasMoreElements()) {
! nodeID = (NodeID)enum.nextElement();
node = nodeID.getNode();
node.cancelReservation(this);
--- 307,317 ----
*/
public void shutdown () {
! Enumeration enum_ = slotHash.keys();
NodeID nodeID;
Node node;
StringBuffer buf = new StringBuffer();
! while (enum_.hasMoreElements()) {
! nodeID = (NodeID)enum_.nextElement();
node = nodeID.getNode();
node.cancelReservation(this);
Index: BasicSys.java
===================================================================
RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/res/BasicSys.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BasicSys.java 25 Jan 2002 10:35:57 -0000 1.4
--- BasicSys.java 8 Feb 2005 06:00:46 -0000 1.5
***************
*** 207,211 ****
/**
! * Get columns enumeration of cronline.
* @return Enumeration[]
*/
--- 207,211 ----
/**
! * Get columns enum_eration of cronline.
* @return Enumeration[]
*/
Index: Sys.java
===================================================================
RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/res/Sys.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Sys.java 23 Jan 2002 06:22:50 -0000 1.3
--- Sys.java 8 Feb 2005 06:00:46 -0000 1.4
***************
*** 101,105 ****
/**
! * Get columns enumeration of cronline.
* @return Enumeration[]
*/
--- 101,105 ----
/**
! * Get columns enum_eration of cronline.
* @return Enumeration[]
*/
Index: SysRes.java
===================================================================
RCS file: /cvsroot/mauischeduler/mauisched/src/unm/maui/res/SysRes.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SysRes.java 27 Sep 2002 08:49:02 -0000 1.10
--- SysRes.java 8 Feb 2005 06:00:46 -0000 1.11
***************
*** 323,329 ****
// populate slotIDHash
! Enumeration enum = slotHash.elements();
for (int i=0; i<size; i++) {
! slotIDs = (SlotID[])enum.nextElement();
len = slotIDs.length;
--- 323,329 ----
// populate slotIDHash
! Enumeration enum_ = slotHash.elements();
for (int i=0; i<size; i++) {
! slotIDs = (SlotID[])enum_.nextElement();
len = slotIDs.length;
|