From: Egon W. <eg...@us...> - 2002-12-21 20:55:19
|
Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/controller In directory sc8-pr-cvs1:/tmp/cvs-serv27153/src/org/openscience/cdk/controller Modified Files: JCPController2D.java Log Message: Big step in implementing RFC #5. Not fully checked for complete implementation. Index: JCPController2D.java =================================================================== RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/controller/JCPController2D.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** JCPController2D.java 22 Nov 2002 15:28:08 -0000 1.8 --- JCPController2D.java 21 Dec 2002 20:54:46 -0000 1.9 *************** *** 331,335 **** for (int i = 0; i < conBonds.length; i++) { ! atomCon.removeBond(conBonds[i]); } } --- 331,335 ---- for (int i = 0; i < conBonds.length; i++) { ! atomCon.removeElectronContainer(conBonds[i]); } } *************** *** 341,345 **** else if (highlightedBond != null) { ! atomCon.removeBond(highlightedBond); } r2dm.fireChange(); --- 341,345 ---- else if (highlightedBond != null) { ! atomCon.removeElectronContainer(highlightedBond); } r2dm.fireChange(); *************** *** 689,695 **** ringAtoms[i] = new Atom(symbol); } ! for (int i = 0; i < sharedAtoms.getBondCount(); i++) ! { ! newRing.setBondAt(i, sharedAtoms.getBondAt(i)); } for (int i = sharedAtoms.getBondCount(); i < ringSize - 1; i++) --- 689,695 ---- ringAtoms[i] = new Atom(symbol); } ! Bond[] bonds = sharedAtoms.getBonds(); ! for (int i = 0; i < bonds.length; i++) { ! newRing.setBondAt(i, bonds[i]); } for (int i = sharedAtoms.getBondCount(); i < ringSize - 1; i++) *************** *** 750,758 **** } } ! for (int i = 0; i < atomCon.getBondCount(); i++) { ! currentBond = atomCon.getBondAt(i); ! for (int j = 0; j < selectedPart.getAtomCount(); j++) ! { currentAtom = selectedPart.getAtomAt(j); if (selectedPart.contains(currentBond.getConnectedAtom(currentAtom))) --- 750,758 ---- } } ! Bond[] bonds = atomCon.getBonds(); ! for (int i = 0; i < bonds.length; i++) { ! currentBond = bonds[i]; ! for (int j = 0; j < selectedPart.getAtomCount(); j++) { currentAtom = selectedPart.getAtomAt(j); if (selectedPart.contains(currentBond.getConnectedAtom(currentAtom))) *************** *** 765,768 **** return selectedPart; } ! } --- 765,768 ---- return selectedPart; } ! } |