[Jmol-commits] CVS: Jmol/src/org/openscience/jmol ColorManager.java,1.13,1.14

[Egon W. <eg...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol
In directory sc8-pr-cvs1:/tmp/cvs-serv8997

Modified Files:
	ColorManager.java 
Log Message:
Use Vector that is easier to handle for MS VM's. (Or so it seems).
At least it now does the AtomColor instantiating in the constructor.

Index: ColorManager.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/ColorManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** ColorManager.java	24 Jan 2003 11:02:49 -0000	1.13
--- ColorManager.java	29 Jan 2003 17:09:19 -0000	1.14
***************
*** 34,37 ****
--- 34,38 ----
  import java.util.Hashtable;
  import java.util.BitSet;
+ import java.util.Vector;
  
  public class ColorManager {
***************
*** 41,49 ****
    ColorManager(DisplayControl control) {
      this.control = control;
    }
  
!   private final AtomColorer[] colorProfiles =
!   { AtomColors.getInstance(),
!     new PartialAtomicChargeColors()};
  
    public byte modeAtomColorProfile = DisplayControl.ATOMTYPE;
--- 42,50 ----
    ColorManager(DisplayControl control) {
      this.control = control;
+     colorProfiles.addElement(AtomColors.getInstance());
+     colorProfiles.addElement(new PartialAtomicChargeColors());
    }
  
!   private Vector colorProfiles = new Vector();;
  
    public byte modeAtomColorProfile = DisplayControl.ATOMTYPE;
***************
*** 139,143 ****
  
    public Color getColorAtom(byte mode, Atom atom) {
!     Color color = colorProfiles[mode].getAtomColor(atom);
      if (modeTransparentColors)
        color = getColorTransparent(color);
--- 140,147 ----
  
    public Color getColorAtom(byte mode, Atom atom) {
!     if (mode > colorProfiles.size()) {
!         return Color.WHITE;
!     }
!     Color color = ((AtomColorer)colorProfiles.elementAt(mode)).getAtomColor(atom);
      if (modeTransparentColors)
        color = getColorTransparent(color);