Index: Lib/jxxload_help/DiscardHelp.java
===================================================================
RCS file: /cvsroot/jython/jython/Lib/jxxload_help/DiscardHelp.java,v
retrieving revision 1.1
diff -u -r1.1 DiscardHelp.java
--- Lib/jxxload_help/DiscardHelp.java	15 Jan 2001 04:51:57 -0000	1.1
+++ Lib/jxxload_help/DiscardHelp.java	18 Jul 2004 05:53:17 -0000
@@ -16,12 +16,12 @@
             if (s.getClassLoader() == loader) return true;
             s = s.getSuperclass();
         } while (s != null);
-        
-        for(java.util.Enumeration enum=interfaces.elements(); enum.hasMoreElements();) {
-            Class intf = (Class)enum.nextElement();
+
+        for(java.util.Enumeration enm=interfaces.elements(); enm.hasMoreElements();) {
+            Class intf = (Class)enm.nextElement();
             if (intf.isAssignableFrom(c)) return true;
         }
-        
+
     } catch(SecurityException e) {
     }
     return false;
@@ -29,31 +29,31 @@
 
   // clearly not thread safe
   public static void discard(ClassLoader loader,java.util.Vector interfaces) {
-    
+
     org.python.core.InternalTables tbl = PyJavaClass.getInternalTables();
-    
+
     tbl._beginCanonical();
-    
+
     PyJavaClass jc;
     while ((jc = (PyJavaClass)tbl._next()) != null ) {
         Class c = (Class)jc.__tojava__(Class.class);
-        if(check(c,loader,interfaces)) tbl._flushCurrent();    
+        if(check(c,loader,interfaces)) tbl._flushCurrent();
     }
-    
+
     tbl._beginOverAdapterClasses();
-    
+
     Class c;
-    
+
     while ((c = (Class)tbl._next()) != null) {
         if(interfaces.contains(c)) tbl._flushCurrent();
     }
-    
+
     tbl._beginOverAdapters();
-    
+
     while ((c = (Class)tbl._next()) != null) {
         if(interfaces.contains(c)) tbl._flushCurrent();
     }
-    
+
   }
 
 }
\ No newline at end of file
Index: Lib/jxxload_help/PathVFS.java
===================================================================
RCS file: /cvsroot/jython/jython/Lib/jxxload_help/PathVFS.java,v
retrieving revision 1.1
diff -u -r1.1 PathVFS.java
--- Lib/jxxload_help/PathVFS.java	15 Jan 2001 04:51:57 -0000	1.1
+++ Lib/jxxload_help/PathVFS.java	18 Jul 2004 05:53:37 -0000
@@ -10,20 +10,20 @@
 import java.io.*;
 
 public class PathVFS extends Object {
-    
+
     public interface VFS {
-        
+
        public InputStream open(String id);
-        
+
     }
-        
+
     public static class JarVFS implements VFS {
         private ZipFile zipfile;
-        
+
         public JarVFS(String fname) throws IOException {
             zipfile = new ZipFile(fname);
         }
-        
+
         public InputStream open(String id) {
             ZipEntry ent = zipfile.getEntry(id);
             if (ent == null) return null;
@@ -33,19 +33,19 @@
                 return null;
             }
         }
-        
+
     }
-    
+
     public static class DirVFS implements VFS {
         private String prefix;
-        
+
         public DirVFS(String dir) {
             if (dir.length() == 0)
                 prefix = null;
             else
                 prefix = dir;
         }
-        
+
         public InputStream open(String id) {
             File file = new File(prefix,id.replace('/',File.separatorChar));
             if (file.isFile()) {
@@ -54,16 +54,16 @@
                 } catch(IOException e) {
                     return null;
                 }
-            }           
+            }
             return null;
         }
     }
-    
+
     private Vector vfs = new Vector();
     private Hashtable once = new Hashtable();
-    
+
     private final static Object PRESENT = new Object();
-    
+
     public void addVFS(String fname) {
         if (fname.length() == 0) {
             if (!once.containsKey("")) {
@@ -82,17 +82,17 @@
                     vfs.addElement(new JarVFS(fname));
                 }
             }
-            
+
         } catch(IOException e) {}
     }
-    
+
     public InputStream open(String id) {
-        for(Enumeration enum = vfs.elements(); enum.hasMoreElements();) {
-            VFS v = (VFS)enum.nextElement();
+        for(Enumeration enm = vfs.elements(); enm.hasMoreElements();) {
+            VFS v = (VFS)enm.nextElement();
             InputStream stream = v.open(id);
             if (stream != null) return stream;
         }
         return null;
     }
-      
+
 }
\ No newline at end of file
Index: com/ziclix/python/sql/handler/RowIdHandler.java
===================================================================
RCS file: /cvsroot/jython/jython/com/ziclix/python/sql/handler/RowIdHandler.java,v
retrieving revision 1.2
diff -u -r1.2 RowIdHandler.java
--- com/ziclix/python/sql/handler/RowIdHandler.java	3 Jul 2003 20:06:47 -0000	1.2
+++ com/ziclix/python/sql/handler/RowIdHandler.java	18 Jul 2004 05:49:29 -0000
@@ -58,7 +58,7 @@
     if (o == null) {
       synchronized (ROWIDS) {
         try {
-          o = c.getMethod(getRowIdMethodName(), null);
+          o = c.getMethod(getRowIdMethodName(), (Class[])null);
           ROWIDS.put(c, o);
         } catch (Throwable t) {
           ROWIDS.put(c, CHECKED);
@@ -68,7 +68,7 @@
 
     if (!(o == null || o == CHECKED)) {
       try {
-        return Py.java2py(((Method) o).invoke(stmt, null));
+        return Py.java2py(((Method) o).invoke(stmt, (Object[])null));
       } catch (Throwable t) {}
     }
 
Index: org/python/core/InternalTables1.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/InternalTables1.java,v
retrieving revision 2.4
diff -u -r2.4 InternalTables1.java
--- org/python/core/InternalTables1.java	1 Feb 2001 16:41:10 -0000	2.4
+++ org/python/core/InternalTables1.java	18 Jul 2004 05:44:59 -0000
@@ -124,38 +124,38 @@
     protected short iterType;
     protected Object cur;
 
-    private Enumeration enum;
+    private Enumeration enm;
     private Hashtable enumTable;
 
     public void _beginCanonical() {
         beginStable(JCSTABLE);
-        enum = ((TableProvid1)classes).keys();
+        enm = ((TableProvid1)classes).keys();
         enumTable = (TableProvid1)classes;
         iterType = JCLASS;
     }
 
     public void _beginLazyCanonical() {
-        enum = ((TableProvid1)lazyClasses).keys();
+        enm = ((TableProvid1)lazyClasses).keys();
         enumTable = (TableProvid1)lazyClasses;
         iterType = LAZY_JCLASS;
     }
 
     public void _beginOverAdapterClasses() {
-        enum = ((TableProvid1)adapterClasses).keys();
+        enm = ((TableProvid1)adapterClasses).keys();
         enumTable = (TableProvid1)adapterClasses;
         iterType = ADAPTER_CLASS;
 
     }
 
     public void _beginOverAdapters() {
-        enum = adapters.keys();
+        enm = adapters.keys();
         enumTable = adapters;
         iterType = ADAPTER;
     }
 
     public Object _next() {
-        if(enum.hasMoreElements()) {
-            cur = enum.nextElement();
+        if(enm.hasMoreElements()) {
+            cur = enm.nextElement();
             switch(iterType) {
             case JCLASS:
                 return (PyJavaClass)classes.get(cur);
@@ -169,7 +169,7 @@
             }
         }
         cur = null;
-        enum = null;
+        enm = null;
         endStable();
         return null;
     }
Index: org/python/core/PyBeanProperty.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyBeanProperty.java,v
retrieving revision 2.5
diff -u -r2.5 PyBeanProperty.java
--- org/python/core/PyBeanProperty.java	6 Aug 2003 11:46:26 -0000	2.5
+++ org/python/core/PyBeanProperty.java	18 Jul 2004 05:48:01 -0000
@@ -33,7 +33,7 @@
         Object iself = Py.tojava(self, getMethod.getDeclaringClass());
 
         try {
-            Object value = getMethod.invoke(iself, Py.EmptyObjects);
+            Object value = getMethod.invoke(iself, (Object[])Py.EmptyObjects);
             return Py.java2py(value);
         } catch (Exception e) {
             throw Py.JavaError(e);
Index: org/python/modules/time.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/modules/time.java,v
retrieving revision 2.20
diff -u -r2.20 time.java
--- org/python/modules/time.java	27 Nov 2001 19:07:22 -0000	2.20
+++ org/python/modules/time.java	18 Jul 2004 05:52:29 -0000
@@ -604,8 +604,8 @@
         String version = System.getProperty("java.version");
         if (version.compareTo("1.2") >= 0) {
             try {
-                Method m = tz.getClass().getMethod("getDSTSavings", null);
-                return ((Integer) m.invoke(tz, null)).intValue();
+                Method m = tz.getClass().getMethod("getDSTSavings", (Class[])null);
+                return ((Integer) m.invoke(tz, (Object[])null)).intValue();
              } catch (Exception exc) { }
         }
         return 0;
Index: org/python/parser/PythonGrammar.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammar.java,v
retrieving revision 2.21
diff -u -r2.21 PythonGrammar.java
--- org/python/parser/PythonGrammar.java	25 Aug 2003 12:24:14 -0000	2.21
+++ org/python/parser/PythonGrammar.java	18 Jul 2004 05:46:13 -0000
@@ -70,7 +70,7 @@
         }
     }
 
-    // ! maximal currently used LOOKAHEAD is 3    
+    // ! maximal currently used LOOKAHEAD is 3
     private static final int MAX_LOOKAHEAD = 3;
 
     public boolean partial_valid_sentence(Throwable t) {
@@ -147,7 +147,7 @@
         hostLiteralMkr = host;
         }
 
-//single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE 
+//single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
 // apparently CPython coalesces newlines, we don't
   final public modType single_input() throws ParseException {
                          /*@bgen(jjtree) single_input */
@@ -4572,7 +4572,7 @@
     }
   }
 
-//arglist: (argument ',')* 
+//arglist: (argument ',')*
 //              (argument [',']| '*' test [',' '**' test] | '**' test)
   final public void arglist() throws ParseException {
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -7131,8 +7131,8 @@
         jj_expentry[i] = jj_lasttokens[i];
       }
       boolean exists = false;
-      for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
-        int[] oldentry = (int[])(enum.nextElement());
+      for (java.util.Enumeration enm = jj_expentries.elements(); enm.hasMoreElements();) {
+        int[] oldentry = (int[])(enm.nextElement());
         if (oldentry.length == jj_expentry.length) {
           exists = true;
           for (int i = 0; i < jj_expentry.length; i++) {