Skip to content

Commit

Permalink
Fixeda bug which was causing various parts of the DescriptorEngine to…
Browse files Browse the repository at this point in the history
… fail - it was trying to instantiate a non-descriptor class which happens to reside in the descriptor package directory. This fix is a bit kludgy - ideally only descriptors should be in that directory
  • Loading branch information
rajarshi committed Oct 31, 2009
1 parent 6f3e848 commit 0242d9a
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions src/main/org/openscience/cdk/qsar/DescriptorEngine.java
Expand Up @@ -37,7 +37,13 @@
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Modifier;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;

Expand Down Expand Up @@ -163,7 +169,7 @@ public DescriptorEngine(int type, String[] jarFileNames) {
descriptors = instantiateDescriptors(classNames);
speclist = initializeSpecifications(descriptors);
logger.debug("Found #descriptors: ", classNames.size());

// get the dictionary for the descriptors
DictionaryDatabase dictDB = new DictionaryDatabase();
dict = dictDB.getDictionary("descriptor-algorithms");
Expand Down Expand Up @@ -659,6 +665,7 @@ public static List<String> getDescriptorClassNameByPackage(String packageName, S
if (!(tmp.indexOf(packageName) != -1)) continue;
if (tmp.indexOf('$') != -1) continue;
if (tmp.indexOf("Test") != -1) continue;
if (tmp.indexOf("ChiIndexUtils") != -1) continue;
if (!classlist.contains(tmp)) classlist.add(tmp);
}
}
Expand Down

0 comments on commit 0242d9a

Please sign in to comment.