[Jmol-commits] SF.net SVN: jmol:[13882] trunk/Jmol/src/org/jmol/adapter/smarter/ SmarterJmolAdapter.java

[<ni...@us...>]

Revision: 13882
          http://jmol.svn.sourceforge.net/jmol/?rev=13882&view=rev
Author:   nicove
Date:     2010-08-06 23:37:56 +0000 (Fri, 06 Aug 2010)

Log Message:
-----------
Java 1.5 : Generics

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java

Modified: trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java	2010-08-06 23:36:38 UTC (rev 13881)
+++ trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java	2010-08-06 23:37:56 UTC (rev 13882)
@@ -263,7 +263,6 @@
     return staticGetAtomSetCollectionOrBufferedReaderFromZip(is, fileName, zipDirectory, htParams, 1, asBufferedReader);
   }
 
-  @SuppressWarnings("unchecked")
   private static Object staticGetAtomSetCollectionOrBufferedReaderFromZip(
                                     InputStream is, String fileName,
                                     String[] zipDirectory, Map<String, Object> htParams,
@@ -306,7 +305,7 @@
     boolean exceptFiles = (manifest.indexOf("EXCEPT_FILES") >= 0);
     if (selectAll || subFileName != null)
       haveManifest = false;
-    List vCollections = new ArrayList();
+    List<Object> vCollections = new ArrayList<Object>();
     Map<String, Object> htCollections = (haveManifest ? new Hashtable<String, Object>() : null);
     int nFiles = 0;
     // 0 entry is manifest


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