From: <ha...@us...> - 2010-08-09 05:58:51
|
Revision: 13931 http://jmol.svn.sourceforge.net/jmol/?rev=13931&view=rev Author: hansonr Date: 2010-08-09 05:58:45 +0000 (Mon, 09 Aug 2010) Log Message: ----------- version=12.1.3 # new feature: x = compare({atomset1}, {atomset2}, "ISOMER") # new feature: x = compare(smilesString1, smilesString2, "ISOMER") # bug fix: "CCCC".find("SMILES","CCCC") should return 1 (other returns 0 and -1) # bug fix: "CCCC".find("SMARTS","CCC") should return [1,5,8,11] (other returns [] and "?" # bug fix: SmilesGeneration stereochemistry error # bug fix: "smilesString".find("smarts","pattern") should return "?" upon parsing error # bug fix: proper "false AND"/"true OR" action where second operand is skipped Modified Paths: -------------- trunk/Jmol/src/org/jmol/adapter/readers/xtal/ShelxReader.java trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties Modified: trunk/Jmol/src/org/jmol/adapter/readers/xtal/ShelxReader.java =================================================================== --- trunk/Jmol/src/org/jmol/adapter/readers/xtal/ShelxReader.java 2010-08-09 05:57:31 UTC (rev 13930) +++ trunk/Jmol/src/org/jmol/adapter/readers/xtal/ShelxReader.java 2010-08-09 05:58:45 UTC (rev 13931) @@ -232,7 +232,7 @@ float x = parseFloat(tokens[2]); float y = parseFloat(tokens[3]); float z = parseFloat(tokens[4]); - if (elementIndex == Integer.MAX_VALUE || Float.isNaN(x) || Float.isNaN(y) || Float.isNaN(z)) { + if (Float.isNaN(x) || Float.isNaN(y) || Float.isNaN(z)) { Logger.error("skipping line " + line); return; } Modified: trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java =================================================================== --- trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java 2010-08-09 05:57:31 UTC (rev 13930) +++ trunk/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java 2010-08-09 05:58:45 UTC (rev 13931) @@ -263,6 +263,7 @@ return staticGetAtomSetCollectionOrBufferedReaderFromZip(is, fileName, zipDirectory, htParams, 1, asBufferedReader); } + @SuppressWarnings("unchecked") private static Object staticGetAtomSetCollectionOrBufferedReaderFromZip( InputStream is, String fileName, String[] zipDirectory, Map<String, Object> htParams, Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-08-09 05:57:31 UTC (rev 13930) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-08-09 05:58:45 UTC (rev 13931) @@ -1,7 +1,7 @@ # Developers: to add a description of changes you have made, # add it on a line starting with # below the "version=..." line -version=12.1.3_dev +version=12.1.3 # new feature: x = compare({atomset1}, {atomset2}, "ISOMER") # new feature: x = compare(smilesString1, smilesString2, "ISOMER") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |