Fixed junior issue 1816529: Missing Java5 generics for atomContainers…

…() Iterator
egonw · Nov 16, 2009 · 484619e · 484619e
1 parent 12bec4f
commit 484619e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/org/openscience/cdk/layout/StructureDiagramGenerator.java b/src/main/org/openscience/cdk/layout/StructureDiagramGenerator.java
@@ -495,10 +495,10 @@ private void layoutRingSet(Vector2d firstBondVector, IRingSet rs) throws Excepti
 			/*
 			 * Find mapped substructures
 			 */
-			for (Iterator substructureIterator = mappedSubstructures.atomContainers().iterator(); substructureIterator.hasNext(); ) {
+			for (Iterator<IAtomContainer> substructureIterator = mappedSubstructures.atomContainers().iterator(); substructureIterator.hasNext(); ) {
 				IAtomContainer substructure = (IAtomContainer) substructureIterator.next();
 				boolean substructureMapped = false;
-				for (Iterator ringSetIterator = rs.atomContainers().iterator(); ringSetIterator.hasNext() && !substructureMapped; ) {
+				for (Iterator<IAtomContainer> ringSetIterator = rs.atomContainers().iterator(); ringSetIterator.hasNext() && !substructureMapped; ) {
 					IRing ring = (IRing) ringSetIterator.next();
 					for (Iterator atomIterator = ring.atoms().iterator(); atomIterator.hasNext() && !substructureMapped; ) {
 						IAtom atom = (IAtom) atomIterator.next();

diff --git a/...n/org/openscience/cdk/qsar/descriptors/atomic/IsProtonInConjugatedPiSystemDescriptor.java b/...n/org/openscience/cdk/qsar/descriptors/atomic/IsProtonInConjugatedPiSystemDescriptor.java
@@ -169,7 +169,7 @@ public DescriptorValue calculate(IAtom atom, IAtomContainer atomContainer) {
                 acold=clonedAtomContainer;
                 acSet = ConjugatedPiSystemsDetector.detect(mol);
             }
-            java.util.Iterator detected = acSet.atomContainers().iterator();
+            java.util.Iterator<IAtomContainer> detected = acSet.atomContainers().iterator();
             java.util.List neighboors = mol.getConnectedAtomsList(clonedAtom);
             for (Object neighboor : neighboors) {
                 while (detected.hasNext()) {

diff --git a/src/main/org/openscience/cdk/tools/IDCreator.java b/src/main/org/openscience/cdk/tools/IDCreator.java
@@ -232,7 +232,7 @@ private static void createIDsForAtomContainerSet(IAtomContainerSet containerSet,
 			BOND_COUNT = 0;
         }
 
-        Iterator acs = containerSet.atomContainers().iterator();
+        Iterator<IAtomContainer> acs = containerSet.atomContainers().iterator();
         while (acs.hasNext()) {
 			createIDsForAtomContainer((IAtomContainer)acs.next(), tabuList);
         }
@@ -262,7 +262,7 @@ private static void createIDsForReaction(IReaction reaction, List<String> tabuLi
         for (IAtomContainer product : reaction.getReactants().atomContainers()) {
             createIDsForAtomContainer(product, tabuList);
         }
-		Iterator agents = reaction.getAgents().atomContainers().iterator();
+		Iterator<IAtomContainer> agents = reaction.getAgents().atomContainers().iterator();
 		while (agents.hasNext()) {
 			createIDsForAtomContainer((IAtomContainer)agents.next(), tabuList);
 		}