From: <ha...@us...> - 2014-07-24 05:10:17
|
Revision: 19880 http://sourceforge.net/p/jmol/code/19880 Author: hansonr Date: 2014-07-24 05:10:04 +0000 (Thu, 24 Jul 2014) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/modelset/AtomCollection.java trunk/Jmol/src/org/jmol/script/T.java trunk/Jmol/src/org/jmol/scriptext/CmdExt.java trunk/Jmol/src/org/jmol/util/GenericApplet.java trunk/Jmol/src/org/jmol/viewer/ActionManager.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties Modified: trunk/Jmol/src/org/jmol/modelset/AtomCollection.java =================================================================== --- trunk/Jmol/src/org/jmol/modelset/AtomCollection.java 2014-07-23 14:42:48 UTC (rev 19879) +++ trunk/Jmol/src/org/jmol/modelset/AtomCollection.java 2014-07-24 05:10:04 UTC (rev 19880) @@ -991,7 +991,7 @@ public static String[] userSettableValues; static { // this allows the Google Closure compiler to skip all the TAINTED defs in Clazz.defineStatics - userSettableValues = PT.split("atomName atomType coord element formalCharge hydrophobicity ionic occupany partialCharge temperature valence vanderWaals vibrationVector atomNo seqID", " "); + userSettableValues = "atomName atomType coord element formalCharge hydrophobicity ionic occupany partialCharge temperature valence vanderWaals vibrationVector atomNo seqID".split(" "); } public BS[] tainted; // not final -- can be set to null Modified: trunk/Jmol/src/org/jmol/script/T.java =================================================================== --- trunk/Jmol/src/org/jmol/script/T.java 2014-07-23 14:42:48 UTC (rev 19879) +++ trunk/Jmol/src/org/jmol/script/T.java 2014-07-24 05:10:04 UTC (rev 19880) @@ -31,7 +31,6 @@ import javajs.util.AU; import javajs.util.Lst; -import javajs.util.PT; import org.jmol.util.Logger; @@ -79,7 +78,7 @@ public final static String[] astrType; static { - astrType = PT.split("nada identifier integer decimal string seqcode hash array point point4 bitset matrix3f matrix4f array hash bytearray keyword"," "); + astrType = "nada identifier integer decimal string seqcode hash array point point4 bitset matrix3f matrix4f array hash bytearray keyword".split(" "); } public final static int nada = 0; Modified: trunk/Jmol/src/org/jmol/scriptext/CmdExt.java =================================================================== --- trunk/Jmol/src/org/jmol/scriptext/CmdExt.java 2014-07-23 14:42:48 UTC (rev 19879) +++ trunk/Jmol/src/org/jmol/scriptext/CmdExt.java 2014-07-24 05:10:04 UTC (rev 19880) @@ -5916,7 +5916,8 @@ if (t != null) { type = SV.sValue(t).toUpperCase(); isCoord = (t.tok == T.coord); - pt++; + if (isCoord) + pt++; } if (PT.isOneOf(type, driverList.toUpperCase())) { // povray, maya, vrml, idtf Modified: trunk/Jmol/src/org/jmol/util/GenericApplet.java =================================================================== --- trunk/Jmol/src/org/jmol/util/GenericApplet.java 2014-07-23 14:42:48 UTC (rev 19879) +++ trunk/Jmol/src/org/jmol/util/GenericApplet.java 2014-07-24 05:10:04 UTC (rev 19880) @@ -92,7 +92,7 @@ protected void init(Object applet) { appletObject = applet; - htmlName = getJmolParameter("name"); + htmlName = PT.split(getJmolParameter("name"), "_object")[0]; syncId = getJmolParameter("syncId"); fullName = htmlName + "__" + syncId + "__"; System.out.println("Jmol JavaScript applet " + fullName + " initializing"); Modified: trunk/Jmol/src/org/jmol/viewer/ActionManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/ActionManager.java 2014-07-23 14:42:48 UTC (rev 19879) +++ trunk/Jmol/src/org/jmol/viewer/ActionManager.java 2014-07-24 05:10:04 UTC (rev 19880) @@ -534,7 +534,7 @@ private final static String[] pickingModeNames; static { - pickingModeNames = PT.split("off identify label center draw spin symmetry deleteatom deletebond atom group chain molecule polymer structure site model element measure distance angle torsion sequence navigate connect struts dragselected dragmolecule dragatom dragminimize dragminimizemolecule invertstereo assignatom assignbond rotatebond identifybond dragligand"," "); + pickingModeNames = "off identify label center draw spin symmetry deleteatom deletebond atom group chain molecule polymer structure site model element measure distance angle torsion sequence navigate connect struts dragselected dragmolecule dragatom dragminimize dragminimizemolecule invertstereo assignatom assignbond rotatebond identifybond dragligand".split(" "); } public final static String getPickingModeName(int pickingMode) { @@ -552,7 +552,7 @@ private final static String[] pickingStyleNames; static { - pickingStyleNames = PT.split("toggle selectOrToggle extendedSelect drag measure measureoff"," "); + pickingStyleNames = "toggle selectOrToggle extendedSelect drag measure measureoff".split(" "); } public final static String getPickingStyleName(int pickingStyle) { Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2014-07-23 14:42:48 UTC (rev 19879) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2014-07-24 05:10:04 UTC (rev 19880) @@ -14,8 +14,12 @@ TODO: select BONDS and select MEASURES not documented TODO: design and implement sidechain mutation -- MUTATE command ? -___JmolVersion="14.3.3_2014.07.20" +___JmolVersion="14.2.3_2014.07.23" +bug fix: write PDB fails + +JmolVersion="14.3.3_2014.07.22" + new feature: getProperty(x,"[select a,b,c .... - selection of specific keys to report in getProperty command - does not require star-slash, which could mark end-of-comment This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |