[Cdk-commits] SF.net SVN: cdk: [9781] trunk/cdk/src/org/openscience/cdk/qsar/ DescriptorEngine.java

[<eg...@us...>]

Revision: 9781
          http://cdk.svn.sourceforge.net/cdk/?rev=9781&view=rev
Author:   egonw
Date:     2008-01-01 15:47:09 -0800 (Tue, 01 Jan 2008)

Log Message:
-----------
Parameterized types

Modified Paths:
--------------
    trunk/cdk/src/org/openscience/cdk/qsar/DescriptorEngine.java

Modified: trunk/cdk/src/org/openscience/cdk/qsar/DescriptorEngine.java
===================================================================
--- trunk/cdk/src/org/openscience/cdk/qsar/DescriptorEngine.java	2008-01-01 23:38:10 UTC (rev 9780)
+++ trunk/cdk/src/org/openscience/cdk/qsar/DescriptorEngine.java	2008-01-01 23:47:09 UTC (rev 9781)
@@ -324,7 +324,7 @@
             logger.error("Cannot determine specification for id: ", identifier);
             return new String[0];
         }
-        List dictClasses = new ArrayList();
+        List<String> dictClasses = new ArrayList<String>();
 
         for (int j = 0; j < dictEntries.length; j++) {
             if (!dictEntries[j].getClassName().equals("Descriptor")) continue;
@@ -464,7 +464,7 @@
      * @param specs A list of specification objects
      * @see #getDescriptorSpecifications
      */
-    public void setDescriptorSpecifications(List specs) {
+    public void setDescriptorSpecifications(List<DescriptorSpecification> specs) {
         speclist = specs;
     }
 
@@ -492,7 +492,7 @@
      * @param descriptors A List of descriptor objects
      * @see #getDescriptorInstances()
      */
-    public void setDescriptorInstances(List descriptors) {
+    public void setDescriptorInstances(List<IDescriptor> descriptors) {
         this.descriptors = descriptors;
     }
 
@@ -502,13 +502,13 @@
      * @return An array containing the unique dictionary classes.
      */
     public String[] getAvailableDictionaryClasses() {
-        List classList = new ArrayList();
+        List<String> classList = new ArrayList<String>();
         for (Iterator iter = speclist.iterator(); iter.hasNext();) {
             DescriptorSpecification spec = (DescriptorSpecification) iter.next();
             String[] tmp = getDictionaryClass(spec);
             if (tmp != null) classList.addAll(Arrays.asList(tmp));
         }
-        Set uniqueClasses = new HashSet(classList);
+        Set<String> uniqueClasses = new HashSet<String>(classList);
         return (String[]) uniqueClasses.toArray(new String[]{});
     }
 
@@ -551,7 +551,7 @@
             jars = jarFileNames;
         }
 
-        ArrayList classlist = new ArrayList();
+        List<String> classlist = new ArrayList<String>();
         for (int i = 0; i < jars.length; i++) {
             logger.debug("Looking in " + jars[i]);
             JarFile jarFile;


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