[Tinyos-commits] CVS: tinyos-1.x/tools/java/org/python/core InternalTables1.java, 1.1, 1.2

[David Gay]

Update of /cvsroot/tinyos/tinyos-1.x/tools/java/org/python/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21499/python/core

Modified Files:
	InternalTables1.java 
Log Message:
avoid enum keyword


Index: InternalTables1.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/java/org/python/core/InternalTables1.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InternalTables1.java	10 Jan 2004 00:58:23 -0000	1.1
--- InternalTables1.java	23 Sep 2005 16:14:42 -0000	1.2
***************
*** 125,134 ****
      protected Object cur;
  
!     private Enumeration enum;
      private Hashtable enumTable;
  
      public void _beginCanonical() {
          beginStable(JCSTABLE);
!         enum = ((TableProvid1)classes).keys();
          enumTable = (TableProvid1)classes;
          iterType = JCLASS;
--- 125,134 ----
      protected Object cur;
  
!     private Enumeration enumerator;
      private Hashtable enumTable;
  
      public void _beginCanonical() {
          beginStable(JCSTABLE);
!         enumerator = ((TableProvid1)classes).keys();
          enumTable = (TableProvid1)classes;
          iterType = JCLASS;
***************
*** 136,140 ****
  
      public void _beginLazyCanonical() {
!         enum = ((TableProvid1)lazyClasses).keys();
          enumTable = (TableProvid1)lazyClasses;
          iterType = LAZY_JCLASS;
--- 136,140 ----
  
      public void _beginLazyCanonical() {
!         enumerator = ((TableProvid1)lazyClasses).keys();
          enumTable = (TableProvid1)lazyClasses;
          iterType = LAZY_JCLASS;
***************
*** 142,146 ****
  
      public void _beginOverAdapterClasses() {
!         enum = ((TableProvid1)adapterClasses).keys();
          enumTable = (TableProvid1)adapterClasses;
          iterType = ADAPTER_CLASS;
--- 142,146 ----
  
      public void _beginOverAdapterClasses() {
!         enumerator = ((TableProvid1)adapterClasses).keys();
          enumTable = (TableProvid1)adapterClasses;
          iterType = ADAPTER_CLASS;
***************
*** 149,153 ****
  
      public void _beginOverAdapters() {
!         enum = adapters.keys();
          enumTable = adapters;
          iterType = ADAPTER;
--- 149,153 ----
  
      public void _beginOverAdapters() {
!         enumerator = adapters.keys();
          enumTable = adapters;
          iterType = ADAPTER;
***************
*** 155,160 ****
  
      public Object _next() {
!         if(enum.hasMoreElements()) {
!             cur = enum.nextElement();
              switch(iterType) {
              case JCLASS:
--- 155,160 ----
  
      public Object _next() {
!         if(enumerator.hasMoreElements()) {
!             cur = enumerator.nextElement();
              switch(iterType) {
              case JCLASS:
***************
*** 170,174 ****
          }
          cur = null;
!         enum = null;
          endStable();
          return null;
--- 170,174 ----
          }
          cur = null;
!         enumerator = null;
          endStable();
          return null;