Revision: 20370
http://sourceforge.net/p/jmol/code/20370
Author: hansonr
Date: 2015-03-09 01:38:45 +0000 (Mon, 09 Mar 2015)
Log Message:
-----------
refactoring -- removing JmolCmdExtension interface
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/script/ScriptEval.java
trunk/Jmol/src/org/jmol/script/ScriptExpr.java
trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java
Removed Paths:
-------------
trunk/Jmol/src/org/jmol/script/JmolCmdExtension.java
trunk/Jmol/src/org/jmol/script/JmolMathExtension.java
trunk/Jmol/src/org/jmol/script/JmolSmilesExtension.java
Deleted: trunk/Jmol/src/org/jmol/script/JmolCmdExtension.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/JmolCmdExtension.java 2015-03-09
01:37:22 UTC (rev 20369)
+++ trunk/Jmol/src/org/jmol/script/JmolCmdExtension.java 2015-03-09
01:38:45 UTC (rev 20370)
@@ -1,19 +0,0 @@
-package org.jmol.script;
-
-import org.jmol.java.BS;
-import org.jmol.viewer.ShapeManager;
-
-public interface JmolCmdExtension {
-
- public JmolCmdExtension init(Object eval);
-
- public String dispatch(int iShape, boolean b, T[] st) throws ScriptException;
-
- public Object getBitsetIdent(BS bs, String label, Object tokenValue,
- boolean useAtomMap, int index,
- boolean isExplicitlyAll);
-
- public boolean evalParallel(ScriptContext context,
- ShapeManager shapeManager);
-
-}
Deleted: trunk/Jmol/src/org/jmol/script/JmolMathExtension.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/JmolMathExtension.java 2015-03-09
01:37:22 UTC (rev 20369)
+++ trunk/Jmol/src/org/jmol/script/JmolMathExtension.java 2015-03-09
01:38:45 UTC (rev 20370)
@@ -1,20 +0,0 @@
-package org.jmol.script;
-
-import org.jmol.atomdata.RadiusData;
-import org.jmol.java.BS;
-
-public interface JmolMathExtension {
-
- public JmolMathExtension init(Object eval);
-
- public boolean evaluate(ScriptMathProcessor mp, T op, SV[] args, int tok)
- throws ScriptException;
-
- public Object getMinMax(Object floatOrSVArray, int intValue);
-
- BS setContactBitSets(BS bsA, BS bsB, boolean localOnly, float distance,
- RadiusData rd, boolean warnMultiModel);
-
-
-
-}
Deleted: trunk/Jmol/src/org/jmol/script/JmolSmilesExtension.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/JmolSmilesExtension.java 2015-03-09
01:37:22 UTC (rev 20369)
+++ trunk/Jmol/src/org/jmol/script/JmolSmilesExtension.java 2015-03-09
01:38:45 UTC (rev 20370)
@@ -1,26 +0,0 @@
-package org.jmol.script;
-
-import javajs.util.Lst;
-import javajs.util.M4;
-import javajs.util.P3;
-
-import org.jmol.java.BS;
-
-public interface JmolSmilesExtension {
-
- JmolSmilesExtension init(Object se);
-
- float getSmilesCorrelation(BS bsA, BS bsB, String smiles, Lst<P3> ptsA,
- Lst<P3> ptsB, M4 m4, Lst<BS> vReturn,
- boolean isSmarts, boolean asMap, int[][] mapSet,
- P3 center, boolean firstMatchOnly, boolean
bestMap)
- throws ScriptException;
-
- Object getSmilesMatches(String pattern, String smiles, BS bsSelected,
- BS bsMatch3D, boolean isSmarts, boolean asOneBitset)
- throws ScriptException;
-
- float[] getFlexFitList(BS bs1, BS bs2, String smiles1, boolean isSmarts)
- throws ScriptException;
-
-}
Modified: trunk/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEval.java 2015-03-09 01:37:22 UTC
(rev 20369)
+++ trunk/Jmol/src/org/jmol/script/ScriptEval.java 2015-03-09 01:38:45 UTC
(rev 20370)
@@ -230,21 +230,6 @@
private static int iProcess;
- private JmolMathExtension mathExt;
- public JmolMathExtension getMathExt() {
- return (mathExt == null ? (mathExt = (JmolMathExtension)
getExt("Math")).init(this) : mathExt);
- }
-
- private JmolSmilesExtension smilesExt;
- public JmolSmilesExtension getSmilesExt() {
- return (smilesExt == null ? (smilesExt = (JmolSmilesExtension)
getExt("Smiles")).init(this) : smilesExt);
- }
-
- private JmolCmdExtension cmdIso;
- public JmolCmdExtension getIsoExt() {
- return (cmdIso == null ? (cmdIso = (JmolCmdExtension)
getExt("Iso")).init(this) : cmdIso);
- }
-
public ShapeManager sm;
public boolean isJS;
Modified: trunk/Jmol/src/org/jmol/script/ScriptExpr.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptExpr.java 2015-03-09 01:37:22 UTC
(rev 20369)
+++ trunk/Jmol/src/org/jmol/script/ScriptExpr.java 2015-03-09 01:38:45 UTC
(rev 20370)
@@ -23,6 +23,9 @@
import org.jmol.modelset.BondSet;
import org.jmol.modelset.Group;
import org.jmol.modelset.ModelSet;
+import org.jmol.scriptext.CmdExt;
+import org.jmol.scriptext.MathExt;
+import org.jmol.scriptext.SmilesExt;
import org.jmol.util.BSUtil;
import org.jmol.util.Elements;
import org.jmol.util.Escape;
@@ -49,11 +52,26 @@
public boolean debugHigh;
- private JmolCmdExtension cmdExt;
- public JmolCmdExtension getCmdExt() {
- return (cmdExt == null ? (cmdExt = (JmolCmdExtension)
getExt("Cmd")).init(this) : cmdExt);
+ private CmdExt cmdExt;
+ public CmdExt getCmdExt() {
+ return (cmdExt == null ? (cmdExt = (CmdExt) getExt("Cmd")).init(this) :
cmdExt);
}
+ private CmdExt isoExt;
+ public CmdExt getIsoExt() {
+ return (isoExt == null ? (isoExt = (CmdExt) getExt("Iso")).init(this) :
isoExt);
+ }
+
+ private MathExt mathExt;
+ public MathExt getMathExt() {
+ return (mathExt == null ? (mathExt = (MathExt) getExt("Math")).init(this)
: mathExt);
+ }
+
+ private SmilesExt smilesExt;
+ public SmilesExt getSmilesExt() {
+ return (smilesExt == null ? (smilesExt = (SmilesExt)
getExt("Smiles")).init(this) : smilesExt);
+ }
+
public Object getExt(String type) {
return Interface.getInterface("org.jmol.scriptext." + type + "Ext", vwr,
"script");
}
Modified: trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java 2015-03-09
01:37:22 UTC (rev 20369)
+++ trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java 2015-03-09
01:38:45 UTC (rev 20370)
@@ -841,7 +841,7 @@
// just exit; otherwise we add a new TRUE to xStack
if (!chk)
- return getMathExt().evaluate(this, op, args, tok);
+ return eval.getMathExt().evaluate(this, op, args, tok);
if (op.tok == T.propselector)
xPt--; // pop x in "x.func(...)"
return addXBool(true);
@@ -1660,7 +1660,7 @@
case T.stddev:
case T.sum:
case T.sum2:
- return addXObj(getMathExt().getMinMax(x2.getList(), op.intValue));
+ return addXObj(eval.getMathExt().getMinMax(x2.getList(), op.intValue));
case T.pop:
return addX(x2.pushPop(null, null));
case T.sort:
@@ -1755,10 +1755,6 @@
return false;
}
- private JmolMathExtension getMathExt() {
- return ((ScriptEval) eval).getMathExt();
- }
-
public SV evalOp(T token) throws ScriptException {
if (!addOp(token) || !operate())
return null;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
