[Cdk-commits] CVS: cdk/src/org/openscience/cdk/test/structgen RandomStructureGeneratorTest.java,1.14,1.15 VicinitySamplerTest.java,1.13,1.14

[Christoph S. <ste...@us...>]

Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/test/structgen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26983/src/org/openscience/cdk/test/structgen

Modified Files:
	RandomStructureGeneratorTest.java VicinitySamplerTest.java 
Log Message:
Further cleanup of code, fixing warnings thrown by Ecplipse

Index: RandomStructureGeneratorTest.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/test/structgen/RandomStructureGeneratorTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- RandomStructureGeneratorTest.java	28 Feb 2005 13:18:29 -0000	1.14
+++ RandomStructureGeneratorTest.java	5 Aug 2005 13:52:13 -0000	1.15
@@ -28,17 +28,16 @@
 import javax.vecmath.Vector2d;
 
 import junit.framework.Test;
-import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import org.openscience.cdk.Bond;
 import org.openscience.cdk.Molecule;
-import org.openscience.cdk.test.CDKTestCase;
 import org.openscience.cdk.applications.swing.MoleculeListViewer;
 import org.openscience.cdk.applications.swing.MoleculeViewer2D;
 import org.openscience.cdk.layout.StructureDiagramGenerator;
 import org.openscience.cdk.structgen.RandomGenerator;
 import org.openscience.cdk.templates.MoleculeFactory;
+import org.openscience.cdk.test.CDKTestCase;
 
 /**
  * @cdk.module test

Index: VicinitySamplerTest.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/test/structgen/VicinitySamplerTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- VicinitySamplerTest.java	28 Feb 2005 13:18:29 -0000	1.13
+++ VicinitySamplerTest.java	5 Aug 2005 13:52:13 -0000	1.14
@@ -31,21 +31,22 @@
 
 import java.util.Vector;
 
+import javax.swing.JFrame;
+
 import junit.framework.Test;
-import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import org.openscience.cdk.Atom;
 import org.openscience.cdk.AtomContainer;
 import org.openscience.cdk.Molecule;
-import org.openscience.cdk.test.CDKTestCase;
 import org.openscience.cdk.applications.swing.MoleculeListViewer;
 import org.openscience.cdk.applications.swing.MoleculeViewer2D;
+import org.openscience.cdk.config.IsotopeFactory;
 import org.openscience.cdk.layout.StructureDiagramGenerator;
 import org.openscience.cdk.smiles.SmilesGenerator;
 import org.openscience.cdk.structgen.VicinitySampler;
 import org.openscience.cdk.templates.MoleculeFactory;
-import org.openscience.cdk.config.IsotopeFactory;
+import org.openscience.cdk.test.CDKTestCase;
 
 
 /**
@@ -122,7 +123,7 @@
 	private void display(Vector structures)
 	{
 		MoleculeListViewer moleculeListViewer = new MoleculeListViewer();
-		moleculeListViewer.setDefaultCloseOperation(moleculeListViewer.EXIT_ON_CLOSE);
+		moleculeListViewer.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		StructureDiagramGenerator sdg = null;
 		MoleculeViewer2D mv = null;
 		Molecule mol = null;