Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Proper typing of the DefaultIteratingChemObjectReader, so that other …
…classes can safely extend it (thanx to Nina)

Signed-off-by: ngn <jeliazkova.nina@gmail.com>
Signed-off-by: Rajarshi Guha <rajarshi.guha@gmail.com>
  • Loading branch information
egonw committed Dec 11, 2011
1 parent 44b7e76 commit 6de90d3
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
Expand Up @@ -23,8 +23,8 @@
import java.util.List;

import org.openscience.cdk.exception.CDKException;
import org.openscience.cdk.interfaces.IChemObject;
import org.openscience.cdk.io.IChemObjectReader;
import org.openscience.cdk.io.IChemObjectReader.Mode;
import org.openscience.cdk.io.IChemObjectReaderErrorHandler;
import org.openscience.cdk.io.ISimpleChemObjectReader;
import org.openscience.cdk.io.listener.IChemObjectIOListener;
Expand All @@ -37,7 +37,8 @@
* @cdk.module io
* @cdk.githash
*/
public abstract class DefaultIteratingChemObjectReader {
public abstract class DefaultIteratingChemObjectReader<T extends IChemObject>
implements IIteratingChemObjectReader<T> {

protected IChemObjectReader.Mode mode = IChemObjectReader.Mode.RELAXED;
protected IChemObjectReaderErrorHandler errorHandler = null;
Expand Down
Expand Up @@ -81,8 +81,8 @@
* @cdk.keyword file format, MDL molfile
* @cdk.keyword file format, SDF
*/
public class IteratingMDLReader extends DefaultIteratingChemObjectReader
implements IChemObjectIOListener, IIteratingChemObjectReader<IAtomContainer> {
public class IteratingMDLReader extends DefaultIteratingChemObjectReader<IAtomContainer>
implements IChemObjectIOListener {

private BufferedReader input;
private static ILoggingTool logger =
Expand Down
Expand Up @@ -35,7 +35,6 @@
import org.openscience.cdk.annotations.TestMethod;
import org.openscience.cdk.interfaces.IAtomContainer;
import org.openscience.cdk.interfaces.IChemFile;
import org.openscience.cdk.interfaces.IChemObject;
import org.openscience.cdk.interfaces.IMolecule;
import org.openscience.cdk.interfaces.IChemObjectBuilder;
import org.openscience.cdk.io.PCCompoundASNReader;
Expand All @@ -59,8 +58,8 @@
* @cdk.keyword file format, ASN
* @cdk.keyword PubChem
*/
public class IteratingPCCompoundASNReader extends DefaultIteratingChemObjectReader
implements IIteratingChemObjectReader<IAtomContainer> {
public class IteratingPCCompoundASNReader
extends DefaultIteratingChemObjectReader<IAtomContainer> {

private BufferedReader input;
private static ILoggingTool logger =
Expand Down
Expand Up @@ -55,8 +55,8 @@
* @cdk.keyword file format, ASN
* @cdk.keyword PubChem
*/
public class IteratingPCCompoundXMLReader extends DefaultIteratingChemObjectReader
implements IIteratingChemObjectReader<IAtomContainer> {
public class IteratingPCCompoundXMLReader
extends DefaultIteratingChemObjectReader<IAtomContainer> {

private Reader primarySource;
private XmlPullParser parser;
Expand Down
Expand Up @@ -54,8 +54,8 @@
* @cdk.keyword file format, ASN
* @cdk.keyword PubChem
*/
public class IteratingPCSubstancesXMLReader extends DefaultIteratingChemObjectReader
implements IIteratingChemObjectReader<IChemModel> {
public class IteratingPCSubstancesXMLReader
extends DefaultIteratingChemObjectReader<IChemModel> {

private Reader primarySource;
private XmlPullParser parser;
Expand Down
Expand Up @@ -66,8 +66,8 @@
* @cdk.keyword file format, SMILES
*/
@TestClass("org.openscience.cdk.io.iterator.IteratingSMILESReaderTest")
public class IteratingSMILESReader extends DefaultIteratingChemObjectReader
implements IIteratingChemObjectReader<IAtomContainer> {
public class IteratingSMILESReader
extends DefaultIteratingChemObjectReader<IAtomContainer> {

private BufferedReader input;
private static ILoggingTool logger =
Expand Down

0 comments on commit 6de90d3

Please sign in to comment.