From: Egon W. <eg...@us...> - 2002-08-24 19:03:49
|
Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/applications In directory usw-pr-cvs1:/tmp/cvs-serv7980/src/org/openscience/cdk/applications Modified Files: FileConvertor.java Log Message: Fixes for bugs #599536 and #599539. Index: FileConvertor.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/applications/FileConvertor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** FileConvertor.java 4 Aug 2002 12:25:46 -0000 1.2 --- FileConvertor.java 24 Aug 2002 19:03:45 -0000 1.3 *************** *** 67,80 **** if (cor == null) { System.err.println("Unsupported input format!"); ! return false; } ChemObjectWriter cow = getChemObjectWriter(this.oformat, fw); if (cow == null) { System.err.println("Unsupported output format!"); ! return false; } ChemFile content = (ChemFile)cor.read((ChemObject)new ChemFile()); fr.close(); cow.write(content.getChemSequence(0).getChemModel(0).getSetOfMolecules()); fw.flush(); --- 67,83 ---- if (cor == null) { System.err.println("Unsupported input format!"); ! return false; } ChemObjectWriter cow = getChemObjectWriter(this.oformat, fw); if (cow == null) { System.err.println("Unsupported output format!"); ! return false; } ChemFile content = (ChemFile)cor.read((ChemObject)new ChemFile()); fr.close(); + if (content == null) { + return false; + } cow.write(content.getChemSequence(0).getChemModel(0).getSetOfMolecules()); fw.flush(); *************** *** 107,114 **** // do conversion FileConvertor fc = new FileConvertor(input_format, output_format); ! if (fc.convert(input, output)) { System.out.println("Conversion succeeded!"); } else { System.out.println("Converstion failed!"); } } else { --- 110,119 ---- // do conversion FileConvertor fc = new FileConvertor(input_format, output_format); ! boolean success = fc.convert(input, output); ! if (success) { System.out.println("Conversion succeeded!"); } else { System.out.println("Converstion failed!"); + System.exit(1); } } else { *************** *** 116,120 **** System.exit(1); } - } --- 121,124 ---- |