[Cdk-commits] CVS: cdk/src/org/openscience/cdk AtomContainer.java,1.10,1.11

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

Update of /cvsroot/cdk/cdk/src/org/openscience/cdk
In directory usw-pr-cvs1:/tmp/cvs-serv31113/org/openscience/cdk

Modified Files:
	AtomContainer.java 
Log Message:
Resolved getDegree() vs. getBondCOunt() issue. The latter is
chosen as there were more instances of those. (fixes bug #594515).


Index: AtomContainer.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/AtomContainer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** AtomContainer.java	23 Aug 2002 08:59:50 -0000	1.10
--- AtomContainer.java	24 Aug 2002 15:03:54 -0000	1.11
***************
*** 380,413 ****
  	 * @since
  	 */
! 	public int getDegree(int atomnumber)
  	{
! 		return getDegree(getAtomAt(atomnumber));
  	}
  
  
! 	/**
! 	 *  Returns the number of connected atoms (degree) to the given atom
! 	 *
! 	 * @param  atom  The atom the degree is searched of
! 	 * @return       The number of connected atoms (degree)
! 	 * @since
! 	 */
! 	public int getDegree(Atom atom)
! 	{
! 		int degree = 0;
! 		Bond bond;
! 		for (int i = 0; i < bondCount; i++)
! 		{
! 			bond = bonds[i];
! 			if (bond.contains(atom))
! 			{
! 				degree++;
! 			}
! 		}
! 		return degree;
! 	}
! 
! 
! 	/**
  	 *  Returns the number of Atoms in this Container
  	 *
--- 380,390 ----
  	 * @since
  	 */
! 	public int getBondCount(int atomnumber)
  	{
! 		return getBondCount(getAtomAt(atomnumber));
  	}
  
  
!         /**
  	 *  Returns the number of Atoms in this Container
  	 *