[Jmol-commits] CVS: Jmol/src/org/openscience/jmol Atom.java,1.52,1.53 ChemFile.java,1.16,1.17

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

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

Modified Files:
	Atom.java ChemFile.java 
Log Message:
Avoid method name clash with current CDK

Index: Atom.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/Atom.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- Atom.java	28 Feb 2003 09:18:38 -0000	1.52
+++ Atom.java	24 Mar 2003 20:09:48 -0000	1.53
@@ -154,7 +154,7 @@
    *
    * @return a Vector of <code>PhysicalProperty</code>
    */
-  public Vector getProperties() {
+  public Vector getAtomicProperties() {
     return properties;
   }
 

Index: ChemFile.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/ChemFile.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChemFile.java	14 Jan 2003 17:54:34 -0000	1.16
+++ ChemFile.java	24 Mar 2003 20:09:49 -0000	1.17
@@ -121,7 +121,7 @@
       ChemFrame frame = frames[iframe];
       if (frame.getNumberOfAtoms() > 0) {
         Enumeration properties =
-          frame.getJmolAtomAt(0).getProperties().elements();
+          frame.getJmolAtomAt(0).getAtomicProperties().elements();
         while (properties.hasMoreElements()) {
           PhysicalProperty property =
             (PhysicalProperty) properties.nextElement();