Revision: 5207
Author: hansonr
Date: 2006-06-07 12:38:55 -0700 (Wed, 07 Jun 2006)
ViewCVS: http://svn.sourceforge.net/jmol/?rev=5207&view=rev
Log Message:
-----------
bob200603 fix for inappropriate use of "static"; compiler debug comment removed
Modified Paths:
--------------
branches/bob200603/Jmol/src/org/jmol/viewer/Compiler.java
branches/bob200603/Jmol/src/org/jmol/viewer/Isosurface.java
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/Compiler.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/Compiler.java 2006-06-06
22:57:31 UTC (rev 5206)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/Compiler.java 2006-06-07
19:38:55 UTC (rev 5207)
@@ -1061,7 +1061,7 @@
}
boolean drawObjectOrCoordinate() {
- System.out.println("drawObjectOrCoord" + tokPeek());
+ //System.out.println("drawObjectOrCoord" + tokPeek());
Point3f pt = new Point3f();
Token token = tokenNext();
if (token.tok != Token.leftsquare)
@@ -1606,7 +1606,7 @@
boolean compileColorParam() {
for (int i = 1; i < atokenCommand.length; ++i) {
Token token = atokenCommand[i];
- System.out.println(token + " atokenCommand: " + atokenCommand.length);
+ //System.out.println(token + " atokenCommand: " + atokenCommand.length);
if (token.tok == Token.leftsquare) {
if (! compileRGB(i))
return false;
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/Isosurface.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/Isosurface.java 2006-06-06
22:57:31 UTC (rev 5206)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/Isosurface.java 2006-06-07
19:38:55 UTC (rev 5207)
@@ -1825,7 +1825,7 @@
new Vector3f(0, 1, 0), new Vector3f(1, 1, 0), new Vector3f(1, 1, 1),
new Vector3f(0, 1, 1) };
- static Vector3f[] voxelVertexVectors = new Vector3f[8];
+ /*static*/ Vector3f[] voxelVertexVectors = new Vector3f[8];
void calcVoxelVertexVectors() {
for (int i = 8; --i >= 0;)
@@ -2109,7 +2109,7 @@
final Vector3f[] planarVectors = new Vector3f[3];
final Vector3f[] unitPlanarVectors = new Vector3f[3];
final float[] planarVectorLengths = new float[2];
- final static Matrix3f matXyzToPlane = new Matrix3f();
+ final /*static*/ Matrix3f matXyzToPlane = new Matrix3f();
{
planarVectors[0] = new Vector3f();
planarVectors[1] = new Vector3f();
@@ -2574,7 +2574,7 @@
return fraction;
}
- static Vector3f[] pixelVertexVectors = new Vector3f[4];
+ /*static*/ Vector3f[] pixelVertexVectors = new Vector3f[4];
void calcPixelVertexVectors() {
for (int i = 4; --i >= 0;)
@@ -2796,9 +2796,9 @@
return n * factorial(n - 1);
}
- static float[] fact = new float[20];
- static double[] rfactor = new double[10];
- static double[] pfactor = new double[10];
+ /*static*/ float[] fact = new float[20];
+ /*static*/ double[] rfactor = new double[10];
+ /*static*/ double[] pfactor = new double[10];
int lastFactorial = -1;
void calcFactors(int n, int el, int m) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Jmol-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jmol-commits
