[Jmol-commits] CVS: Jmol/src/org/jmol/bspt Node.java,1.2,1.3 Leaf.java,1.2,1.3

[Nicolas <ni...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/jmol/bspt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9911/src/org/jmol/bspt

Modified Files:
	Node.java Leaf.java 
Log Message:
Fixed warnings

Index: Node.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/bspt/Node.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Node.java	9 Jan 2005 03:14:56 -0000	1.2
+++ Node.java	9 Jan 2005 08:39:06 -0000	1.3
@@ -40,17 +40,17 @@
     this.bspt = bspt;
     if (level == bspt.treeDepth) {
       bspt.treeDepth = level + 1;
-      if (bspt.treeDepth >= bspt.MAX_TREE_DEPTH)
+      if (bspt.treeDepth >= Bspt.MAX_TREE_DEPTH)
         System.out.println("BSPT tree depth too great:" + bspt.treeDepth);
     }
-    if (leafLE.count != bspt.leafCountMax)
+    if (leafLE.count != Bspt.leafCountMax)
       throw new NullPointerException();
     eleLE = leafLE;
     dim = level % bspt.dimMax;
     leafLE.sort(dim);
-    splitValue = leafLE.tuples[bspt.leafCountMax/2 - 1].getDimensionValue(dim);
-    eleGE = new Leaf(bspt, leafLE, bspt.leafCountMax/2);
-    count = bspt.leafCountMax;
+    splitValue = leafLE.tuples[Bspt.leafCountMax/2 - 1].getDimensionValue(dim);
+    eleGE = new Leaf(bspt, leafLE, Bspt.leafCountMax/2);
+    count = Bspt.leafCountMax;
   }
   
   Element addTuple(int level, Tuple tuple) {

Index: Leaf.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/bspt/Leaf.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Leaf.java	9 Jan 2005 03:14:56 -0000	1.2
+++ Leaf.java	9 Jan 2005 08:39:06 -0000	1.3
@@ -34,12 +34,12 @@
   Leaf(Bspt bspt) {
     this.bspt = bspt;
     count = 0;
-    tuples = new Tuple[bspt.leafCountMax];
+    tuples = new Tuple[Bspt.leafCountMax];
   }
     
   Leaf(Bspt bspt, Leaf leaf, int countToKeep) {
     this(bspt);
-    for (int i = countToKeep; i < bspt.leafCountMax; ++i) {
+    for (int i = countToKeep; i < Bspt.leafCountMax; ++i) {
       tuples[count++] = leaf.tuples[i];
       leaf.tuples[i] = null;
     }
@@ -64,7 +64,7 @@
   }
 
   Element addTuple(int level, Tuple tuple) {
-    if (count < bspt.leafCountMax) {
+    if (count < Bspt.leafCountMax) {
       tuples[count++] = tuple;
       return this;
     }