[Jython-checkins] SF.net SVN: jython:[5527] trunk/jython/src/org/python

[<pj...@us...>]

Revision: 5527
          http://jython.svn.sourceforge.net/jython/?rev=5527&view=rev
Author:   pjenvey
Date:     2008-10-30 02:49:44 +0000 (Thu, 30 Oct 2008)

Log Message:
-----------
small cleanup

Modified Paths:
--------------
    trunk/jython/src/org/python/core/PyFile.java
    trunk/jython/src/org/python/modules/zipimport/zipimporter.java

Modified: trunk/jython/src/org/python/core/PyFile.java
===================================================================
--- trunk/jython/src/org/python/core/PyFile.java	2008-10-30 02:48:30 UTC (rev 5526)
+++ trunk/jython/src/org/python/core/PyFile.java	2008-10-30 02:49:44 UTC (rev 5527)
@@ -19,7 +19,6 @@
 import org.python.core.io.TextIOBase;
 import org.python.core.io.TextIOWrapper;
 import org.python.core.io.UniversalIOWrapper;
-import org.python.core.util.FileUtil;
 import org.python.expose.ExposedDelete;
 import org.python.expose.ExposedGet;
 import org.python.expose.ExposedMethod;
@@ -529,7 +528,7 @@
         throw Py.TypeError("can't delete numeric/char attribute");
     }
 
-    public Object __tojava__(Class cls) {
+    public Object __tojava__(Class<?> cls) {
         Object o = file.__tojava__(cls);
         if (o == null) {
             o = super.__tojava__(cls);

Modified: trunk/jython/src/org/python/modules/zipimport/zipimporter.java
===================================================================
--- trunk/jython/src/org/python/modules/zipimport/zipimporter.java	2008-10-30 02:48:30 UTC (rev 5526)
+++ trunk/jython/src/org/python/modules/zipimport/zipimporter.java	2008-10-30 02:49:44 UTC (rev 5527)
@@ -498,8 +498,9 @@
         }
 
         PyObject files = new PyDictionary();
-        for (Enumeration zipEntries = zipFile.entries(); zipEntries.hasMoreElements();) {
-            ZipEntry zipEntry = (ZipEntry)zipEntries.nextElement();
+        for (Enumeration<? extends ZipEntry> zipEntries = zipFile.entries();
+             zipEntries.hasMoreElements();) {
+            ZipEntry zipEntry = zipEntries.nextElement();
             String name = zipEntry.getName().replace('/', File.separatorChar);
 
             PyObject __file__ = new PyString(archive + File.separator + name);
@@ -664,9 +665,9 @@
      */
     protected static class SearchOrderEntry {
         public String suffix;
-        public EnumSet type;
+        public EnumSet<EntryType> type;
 
-        public SearchOrderEntry(String suffix, EnumSet type) {
+        public SearchOrderEntry(String suffix, EnumSet<EntryType> type) {
             this.suffix = suffix;
             this.type = type;
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.