diff --git a/Code/JavaWrappers/FilterCatalog.i b/Code/JavaWrappers/FilterCatalog.i index 69e2148da..d87abce23 100644 --- a/Code/JavaWrappers/FilterCatalog.i +++ b/Code/JavaWrappers/FilterCatalog.i @@ -75,10 +75,14 @@ // dangerous, this can be delete from underneath you return self->getFirstMatch(mol).get(); } + + bool canSerialize() const { + return RDKit::FilterCatalogCanSerialize(); + } } %ignore RDKit::FilterCatalog::getFirstMatch; -%ignore RDKit::FilterCatalogEntry::getPropList; +//%ignore RDKit::FilterCatalogEntry::getPropList; %ignore RDKit::Dict::getPropList; %include diff --git a/Code/JavaWrappers/gmwrapper/src-test/org/RDKit/FilterCatalogTests.java b/Code/JavaWrappers/gmwrapper/src-test/org/RDKit/FilterCatalogTests.java index 7a7f6ffbe..94303455d 100644 --- a/Code/JavaWrappers/gmwrapper/src-test/org/RDKit/FilterCatalogTests.java +++ b/Code/JavaWrappers/gmwrapper/src-test/org/RDKit/FilterCatalogTests.java @@ -58,7 +58,7 @@ public class FilterCatalogTests extends GraphMolTest { mol = RWMol.MolFromSmiles("O=C(Cn1cnc2c1c(=O)n(C)c(=O)n2C)N/N=C/c1c(O)ccc2c1cccc2"); FilterCatalogEntry entry = catalog.getFirstMatch(mol); - //Str_Vect props = entry.getPropList(); + Str_Vect props = entry.getPropList(); //for (int i=0; i< props.size(); ++i) { String ref = entry.getProp("Reference"); @@ -73,14 +73,11 @@ public class FilterCatalogTests extends GraphMolTest { assertEquals(source, "PAINS filters (family A)"); assertEquals(entry.getDescription(),"hzone_phenol_A(479)"); - /* - if (catalog.CanSerialize()) { + if (catalog.canSerialize()) { String pickle = catalog.Serialize(); - FilterCatalog catalog2 = FilterCatalog.FilterCatalog(pickle); + FilterCatalog catalog2 = new FilterCatalog(pickle); assertEquals(16, catalog2.getNumEntries()); } - */ - } public static void main(String args[]) {