From 1f14ffa470aa0f5ee18e1fe4851270370d51a8af Mon Sep 17 00:00:00 2001
From: egonw <egonw@eb4e18e3-b210-0410-a6ab-dec725e4b171>
Date: Mon, 26 Jan 2004 11:56:30 +0000
Subject: [PATCH] More @cdkPackage completed: dist-test now also works with
 kaffe

git-svn-id: https://cdk.svn.sourceforge.net/svnroot/cdk/trunk/cdk@2333 eb4e18e3-b210-0410-a6ab-dec725e4b171
---
 build.xml                                     | 112 +++++++-----------
 src/org/openscience/cdk/test/CDKTests.java    |   1 +
 .../HueckelAromaticityDetectorTest.java       |   1 +
 .../cdk/test/controller/ControllerTest.java   |   1 +
 .../cdk/test/database/DatabaseReaderTest.java |   1 +
 .../cdk/test/database/DatabaseTest.java       |   1 +
 .../test/fingerprint/FingerprinterTest.java   |   1 +
 .../cdk/test/internet/DADMLTest.java          |   1 +
 .../cdk/test/io/FileReaderTest.java           |   1 +
 src/org/openscience/cdk/test/io/IOTests.java  |   2 +-
 .../cdk/test/io/ZMatrixReaderTest.java        |   5 +-
 .../cdk/test/layout/HydrogenPlacerTest.java   |   1 +
 .../cdk/test/layout/OverlapResolverTest.java  |   1 +
 .../layout/StructureDiagramGeneratorTest.java |   1 +
 .../cdk/test/layout/TemplateHandlerTest.java  |   1 +
 .../cdk/test/libio/jmol/JmolLibIOTest.java    |   2 +-
 .../cdk/test/libio/joelib/JOELibIOTest.java   |   4 +-
 .../renderer/AcceleratedRenderer3DTest.java   |   3 +-
 .../cdk/test/renderer/DrawPolygonTest.java    |   1 +
 .../test/renderer/OrbitalsRenderer3DTest.java |   3 +-
 .../cdk/test/renderer/TableTest.java          |   1 +
 .../test/ringsearch/AllRingsFinderTest.java   |   1 +
 .../cdk/test/smiles/SmilesGeneratorTest.java  |   1 +
 .../cdk/test/smiles/SmilesParserTest.java     |   1 +
 .../RandomStructureGeneratorTest.java         |   1 +
 .../SingleStructureRandomGeneratorTest.java   |   1 +
 .../test/structgen/VicinitySamplerTest.java   |   1 +
 ...lentClassesDeterministicGeneratorTest.java |   1 +
 .../cdk/test/tools/HydrogenAdderTest.java     |   1 +
 29 files changed, 79 insertions(+), 74 deletions(-)

diff --git a/build.xml b/build.xml
index 115d371531d..9ad31f5b4af 100755
--- a/build.xml
+++ b/build.xml
@@ -207,11 +207,10 @@
             description="Compiles the CDK."
             depends="init, info, src.star.javafiles, 
                      compile-core, compile-standard, compile-extra, compile-io, 
-                     compile-render, compile-render-with-java3d, compile-libio,
-                     compile-apps">
+                     compile-render, compile-render-with-java3d, compile-libio">
         </target>
 
-        <target id="compile-all" name="compile-all" depends="compile, compile-experimental"
+        <target id="compile-all" name="compile-all" depends="compile, compile-experimental, compile-apps"
             description="Compiles the CDK, including experimental classes.">
         </target>
 
@@ -247,22 +246,33 @@
         </target>
         
         <target id="compile-apps" name="compile-apps" 
-                depends="dist-extra, dist-libio, dist-render, 
-                      dist-render-with-java3d, patch-viewer-for-no-jmol">        
-                <!-- Task to build the applications classes. Some require extra
-                     jars, like those in ${lib}/libio -->
-                <echo message="Compiling classes defined in ${src}/applications.javafiles." />
+                depends="dist-libio, dist-experimental,
+                        dist-render-with-java3d, patch-viewer-for-no-jmol">        
+            <!-- Task to build the applications classes. Some require extra
+                 jars, like those in ${lib}/libio -->
+            <echo message="Compiling classes defined in ${src}/applications.javafiles." />
 
-                <javac srcdir="${build.src}" destdir="${build}" optimize="${optimization}" 
-                       debug="${debug}" deprecation="${deprecation}"
-                       includesfile="${src}/applications.javafiles">
-                        <classpath refid="project.class.path" />
-                        <classpath>
-                            <fileset dir="${lib}/libio">
-                                <include name="*.jar" />
-                            </fileset>
-                        </classpath>
-                </javac>
+            <javac srcdir="${build.src}" destdir="${build}" optimize="${optimization}" 
+                   debug="${debug}" deprecation="${deprecation}"
+                   includesfile="${src}/applications.javafiles">
+                <classpath refid="project.class.path" />
+                <classpath>
+                    <fileset dir="${dist}/jar">
+                        <include name="cdk-core.jar" />
+                        <include name="cdk-standard.jar" />
+                        <include name="cdk-render.jar" />
+                        <include name="cdk-io.jar" />
+                        <include name="cdk-extra.jar" />
+                        <include name="cdk-libio.jar" />
+                        <include name="cdk-experimental.jar" />
+                    </fileset>
+                </classpath>
+                <classpath>
+                    <fileset dir="${lib}/libio">
+                        <include name="*.jar" />
+                    </fileset>
+                </classpath>
+            </javac>
         </target>
 
         <target id="patch-core" name="patch-core" 
@@ -407,7 +417,8 @@
             </javac>
         </target>
 
-        <target id="compile-test" name="compile-test" depends="dist-all, dist-libio, dist-experimental">
+        <target id="compile-test" name="compile-test" 
+                depends="dist-all">
             <!-- Task to build the test classes. -->
             <javac srcdir="${build.src}"
                    destdir="${build}" optimize="${optimization}" 
@@ -424,6 +435,7 @@
                         <include name="cdk-extra.jar" />
                         <include name="cdk-libio.jar" />
                         <include name="cdk-experimental.jar" />
+                        <include name="cdk-apps.jar" />
                     </fileset>
                 </classpath>
             </javac>
@@ -520,36 +532,15 @@
                 <jar jarfile="${dist}/jar/cdk-core-debug.jar">
                     <fileset dir="${build}/core-debug">
                         <includesfile name="${src}/core.classes" />
-                   </fileset>
+                    </fileset>
                 </jar>
         </target>
 
         <target id="dist-extra" name="dist-extra" depends="dist-core, compile-extra">
                 <jar jarfile="${dist}/jar/cdk-extra.jar">
                     <fileset dir="${build}">
-                        <include name="org/openscience/cdk/**/**" />
-                        <!-- Exclude core classes -->
-                        <excludesfile name="${src}/core.classes" />
-                        <!-- Exclude classes in cdk-io module -->
-                        <exclude name="org/openscience/cdk/io/**" />
-                        <exclude name="org/openscience/cdk/ChemFile.class" />
-                        <!-- Exclude classes in cdk-render module -->
-                        <exclude name="org/openscience/cdk/renderer/**" />
-                        <exclude name="org/openscience/cdk/controller/**" />
-                        <exclude name="org/openscience/cdk/editor/**" />
-                        <exclude name="org/openscience/cdk/event/**" />
-                        <!-- Exclude libio classes -->
-                        <exclude name="org/openscience/cdk/libio/**" />
-                        <exclude name="org/openscience/cdk/test/libio/**" />
-                        <!-- Exclude application classes -->
-                        <excludesfile name="${src}/applications.classes" />
-                        <!-- Exclude test classes -->
-                        <exclude name="org/openscience/cdk/test/**" />
-                        <!-- Exclude classes in cdk-standard module -->
-                        <excludesfile name="${src}/standard.classes" />
-                        <!-- Exclude classes in cdk-experimental module -->
-                        <excludesfile name="${src}/experimental.classes" />
-                   </fileset>
+                        <includesfile name="${src}/extra.classes" />
+                    </fileset>
                 </jar>
         </target>
 
@@ -557,8 +548,7 @@
                 <jar jarfile="${dist}/jar/cdk-experimental.jar">
                     <fileset dir="${build}">
                         <includesfile name="${src}/experimental.classes" />
-                        <include name="org/openscience/cdk/iupac/generator/data/**" />
-                   </fileset>
+                    </fileset>
                 </jar>
         </target>
 
@@ -573,7 +563,7 @@
         <target id="dist-test" name="dist-test" depends="compile-test">
                 <jar jarfile="${dist}/jar/cdk-test.jar">
                     <fileset dir="${build}">
-                        <include name="org/openscience/cdk/test/**" />
+                        <includesfile name="${src}/test.classes" />
                     </fileset>
                     <fileset dir=".">
                         <include name="data/**" />
@@ -584,8 +574,7 @@
         <target id="dist-libio" name="dist-libio" depends="compile-libio" unless="libio.present">
                 <jar jarfile="${dist}/jar/cdk-libio.jar">
                     <fileset dir="${build}">
-                        <include name="org/openscience/cdk/libio/**" />
-                        <include name="org/openscience/cdk/test/libio/**" />
+                        <includesfile name="${src}/libio.classes" />
                     </fileset>
                     <fileset dir="${build}">
                         <include name="org/openscience/jmol/**" />
@@ -596,9 +585,7 @@
         <target id="dist-io" name="dist-io" depends="compile-io">
                 <jar jarfile="${dist}/jar/cdk-io.jar">
                     <fileset dir="${build}">
-                        <include name="org/openscience/cdk/io/**/*" />
-                        <include name="org/openscience/cdk/ChemFile.class" />
-                        <excludesfile name="${src}/experimental.classes" />
+                        <includesfile name="${src}/io.classes" />
                     </fileset>
                 </jar>
         </target>
@@ -606,23 +593,17 @@
         <target id="dist-render" name="dist-render" depends="compile-render">
                 <jar jarfile="${dist}/jar/cdk-render.jar">
                     <fileset dir="${build}">
-                        <include name="org/openscience/cdk/renderer/**/*" />
-                        <include name="org/openscience/cdk/controller/**/*" />
-                        <include name="org/openscience/cdk/editor/**/*" />
-                        <include name="org/openscience/cdk/event/**/*" />
-                        <excludesfile name="${src}/java3d.classes" />
+                        <includesfile name="${src}/render.classes" />
                     </fileset>
                 </jar>
         </target>
 
-        <target name="dist-render-with-java3d" depends="compile-render-with-java3d"
+        <target id="dist-render-with-java3d" name="dist-render-with-java3d" depends="compile-render-with-java3d"
                 if="java3D.present">
                 <jar jarfile="${dist}/jar/cdk-render.jar">
                     <fileset dir="${build}">
-                        <include name="org/openscience/cdk/renderer/**/*" />
-                        <include name="org/openscience/cdk/controller/**/*" />
-                        <include name="org/openscience/cdk/editor/**/*" />
-                        <include name="org/openscience/cdk/event/**/*" />
+                        <includesfile name="${src}/render.classes" />
+                        <includesfile name="${src}/java3d.classes" />
                     </fileset>
                 </jar>
         </target>
@@ -656,14 +637,13 @@
                 </jar>
         </target>
 
-        <target id="dist-all" name="dist-all" depends="dist, dist-experimental"
+        <target id="dist-all" name="dist-all" depends="dist, dist-experimental, dist-apps"
                 description="Builds the jar files for the CDK, including experimental classes."/>
 
         <target id="dist" name="dist" depends="dist-core, dist-standard, 
                                          dist-io, dist-render,
                                          dist-extra, dist-libio,
-                                         dist-render-with-java3d,
-                                         dist-apps" 
+                                         dist-render-with-java3d" 
                 description="Builds the jar files for the CDK."/>
 
         <target id="sourcedist" name="sourcedist" depends="init"
@@ -793,7 +773,7 @@
                                 <include name="*.jar" />
                         </fileset>
                     </classpath>
-                        <test name="org.openscience.cdk.test.ExperimentalClassesTests"
+                    <test name="org.openscience.cdk.test.ExperimentalClassesTests"
                         haltonfailure="no"
                         todir="${reports.tests}"
                         outfile="experimental">
@@ -821,7 +801,7 @@
                                 <include name="*.jar" />
                         </fileset>
                     </classpath>
-                        <test name="org.openscience.cdk.test.CDKTests"
+                    <test name="org.openscience.cdk.test.CDKTests"
                         haltonfailure="no"
                         todir="${reports.tests}"
                         outfile="result">
diff --git a/src/org/openscience/cdk/test/CDKTests.java b/src/org/openscience/cdk/test/CDKTests.java
index b1d92dde21a..986870c329b 100644
--- a/src/org/openscience/cdk/test/CDKTests.java
+++ b/src/org/openscience/cdk/test/CDKTests.java
@@ -26,6 +26,7 @@
 
 import junit.framework.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.test.fingerprint.*;
 import org.openscience.cdk.test.graph.invariant.*;
 import org.openscience.cdk.test.graph.rebond.*;
diff --git a/src/org/openscience/cdk/test/aromaticity/HueckelAromaticityDetectorTest.java b/src/org/openscience/cdk/test/aromaticity/HueckelAromaticityDetectorTest.java
index ce4c987a82f..e3d33a35c4d 100644
--- a/src/org/openscience/cdk/test/aromaticity/HueckelAromaticityDetectorTest.java
+++ b/src/org/openscience/cdk/test/aromaticity/HueckelAromaticityDetectorTest.java
@@ -29,6 +29,7 @@
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.tools.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.layout.*;
 import org.openscience.cdk.templates.*;
 import org.openscience.cdk.ringsearch.*;
diff --git a/src/org/openscience/cdk/test/controller/ControllerTest.java b/src/org/openscience/cdk/test/controller/ControllerTest.java
index dc198e30e50..cc1260dff70 100644
--- a/src/org/openscience/cdk/test/controller/ControllerTest.java
+++ b/src/org/openscience/cdk/test/controller/ControllerTest.java
@@ -29,6 +29,7 @@
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.layout.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import java.util.*;
 import java.io.*;
 import java.net.URL;
diff --git a/src/org/openscience/cdk/test/database/DatabaseReaderTest.java b/src/org/openscience/cdk/test/database/DatabaseReaderTest.java
index 259d3469f33..6009fa220bb 100644
--- a/src/org/openscience/cdk/test/database/DatabaseReaderTest.java
+++ b/src/org/openscience/cdk/test/database/DatabaseReaderTest.java
@@ -25,6 +25,7 @@
 package org.openscience.cdk.test.database;
 
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.*;
 import org.openscience.cdk.database.*;
 import java.sql.*;
diff --git a/src/org/openscience/cdk/test/database/DatabaseTest.java b/src/org/openscience/cdk/test/database/DatabaseTest.java
index bd71a7206cf..00328b1f0a9 100644
--- a/src/org/openscience/cdk/test/database/DatabaseTest.java
+++ b/src/org/openscience/cdk/test/database/DatabaseTest.java
@@ -26,6 +26,7 @@
 package org.openscience.cdk.test.database;
 
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.*;
 import org.openscience.cdk.database.*;
 import org.openscience.cdk.io.*;
diff --git a/src/org/openscience/cdk/test/fingerprint/FingerprinterTest.java b/src/org/openscience/cdk/test/fingerprint/FingerprinterTest.java
index f4c0a6ac730..7d0cca7c0dc 100644
--- a/src/org/openscience/cdk/test/fingerprint/FingerprinterTest.java
+++ b/src/org/openscience/cdk/test/fingerprint/FingerprinterTest.java
@@ -36,6 +36,7 @@
 import org.openscience.cdk.fingerprint.*;
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.templates.*;
 import org.openscience.cdk.layout.*;
 
diff --git a/src/org/openscience/cdk/test/internet/DADMLTest.java b/src/org/openscience/cdk/test/internet/DADMLTest.java
index 45b10c6dbde..1e0dfd09216 100644
--- a/src/org/openscience/cdk/test/internet/DADMLTest.java
+++ b/src/org/openscience/cdk/test/internet/DADMLTest.java
@@ -27,6 +27,7 @@
 import org.openscience.cdk.*;
 import org.openscience.cdk.io.ChemObjectReader;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.tools.*;
 import org.openscience.cdk.geometry.*;
 import org.openscience.cdk.internet.*;
diff --git a/src/org/openscience/cdk/test/io/FileReaderTest.java b/src/org/openscience/cdk/test/io/FileReaderTest.java
index b6b31226062..6ce624b5793 100644
--- a/src/org/openscience/cdk/test/io/FileReaderTest.java
+++ b/src/org/openscience/cdk/test/io/FileReaderTest.java
@@ -27,6 +27,7 @@
 import org.openscience.cdk.*;
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.tools.*;
 import org.openscience.cdk.geometry.*;
 import java.util.*;
diff --git a/src/org/openscience/cdk/test/io/IOTests.java b/src/org/openscience/cdk/test/io/IOTests.java
index 07bfb3ae9c5..5f88f0e022f 100644
--- a/src/org/openscience/cdk/test/io/IOTests.java
+++ b/src/org/openscience/cdk/test/io/IOTests.java
@@ -43,7 +43,7 @@ public static Test suite () {
         suite.addTest(MDLReaderTest.suite());
         suite.addTest(SMILESReaderTest.suite());
         suite.addTest(GhemicalReaderTest.suite());
-        /* suite.addTest(ZMatrixReaderTest.suite()); This is not a JUnit test uet! */
+        /* suite.addTest(ZMatrixReaderTest.suite()); This is not a JUnit test yet! */
         
         suite.addTest(ReaderFactoryTest.suite());
         return suite;
diff --git a/src/org/openscience/cdk/test/io/ZMatrixReaderTest.java b/src/org/openscience/cdk/test/io/ZMatrixReaderTest.java
index 2c593317e43..63fd951879d 100644
--- a/src/org/openscience/cdk/test/io/ZMatrixReaderTest.java
+++ b/src/org/openscience/cdk/test/io/ZMatrixReaderTest.java
@@ -27,6 +27,7 @@
 import org.openscience.cdk.*;
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.tools.*;
 import org.openscience.cdk.geometry.*;
 import java.util.*;
@@ -35,7 +36,7 @@
 import java.awt.*;
 
 /**
- * @cdkPackage test
+ * @cdkPackage test-java3d
  */
 public class ZMatrixReaderTest
 {
@@ -52,7 +53,7 @@ public ZMatrixReaderTest(String inFile)
 
 			ChemSequence[] chemSequence = chemFile.getChemSequences();
 			ChemModel[] chemModels = chemSequence[0].getChemModels();
-			AtomContainer atomContainer = chemModels[0].getAllInOneContainer();
+			AtomContainer atomContainer = ChemModelManipulator.getAllInOneContainer(chemModels[0]);
       atomContainer.addBonds(1.5); // new!!!
 
 			JFrame frame = new JFrame("ZMatrixReaderTest");
diff --git a/src/org/openscience/cdk/test/layout/HydrogenPlacerTest.java b/src/org/openscience/cdk/test/layout/HydrogenPlacerTest.java
index df7601b25bd..ec7d5de64a5 100644
--- a/src/org/openscience/cdk/test/layout/HydrogenPlacerTest.java
+++ b/src/org/openscience/cdk/test/layout/HydrogenPlacerTest.java
@@ -28,6 +28,7 @@
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.layout.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.smiles.*;
 import org.openscience.cdk.templates.*;
 import org.openscience.cdk.tools.*;
diff --git a/src/org/openscience/cdk/test/layout/OverlapResolverTest.java b/src/org/openscience/cdk/test/layout/OverlapResolverTest.java
index 1972aaf12bf..5671f007e45 100644
--- a/src/org/openscience/cdk/test/layout/OverlapResolverTest.java
+++ b/src/org/openscience/cdk/test/layout/OverlapResolverTest.java
@@ -30,6 +30,7 @@
 import org.openscience.cdk.smiles.*;
 import org.openscience.cdk.layout.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.tools.*;
 import java.util.*;
 import java.io.*;
diff --git a/src/org/openscience/cdk/test/layout/StructureDiagramGeneratorTest.java b/src/org/openscience/cdk/test/layout/StructureDiagramGeneratorTest.java
index 1dd5f7e9700..48bc9491ed7 100644
--- a/src/org/openscience/cdk/test/layout/StructureDiagramGeneratorTest.java
+++ b/src/org/openscience/cdk/test/layout/StructureDiagramGeneratorTest.java
@@ -29,6 +29,7 @@
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.layout.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.smiles.*;
 import org.openscience.cdk.templates.*;
 import org.openscience.cdk.tools.*;
diff --git a/src/org/openscience/cdk/test/layout/TemplateHandlerTest.java b/src/org/openscience/cdk/test/layout/TemplateHandlerTest.java
index ee221cdf83a..e478701d862 100644
--- a/src/org/openscience/cdk/test/layout/TemplateHandlerTest.java
+++ b/src/org/openscience/cdk/test/layout/TemplateHandlerTest.java
@@ -30,6 +30,7 @@
 import org.openscience.cdk.smiles.*;
 import org.openscience.cdk.layout.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.tools.LoggingTool;
 import java.util.*;
 import java.io.*;
diff --git a/src/org/openscience/cdk/test/libio/jmol/JmolLibIOTest.java b/src/org/openscience/cdk/test/libio/jmol/JmolLibIOTest.java
index d42a7e17434..6bd644cdd5a 100644
--- a/src/org/openscience/cdk/test/libio/jmol/JmolLibIOTest.java
+++ b/src/org/openscience/cdk/test/libio/jmol/JmolLibIOTest.java
@@ -31,7 +31,7 @@
 import org.openscience.cdk.isomorphism.IsomorphismTester;
 
 /**
- * @cdkPackage test
+ * @cdkPackage test-libio
  */
 public class JmolLibIOTest extends TestCase {
 
diff --git a/src/org/openscience/cdk/test/libio/joelib/JOELibIOTest.java b/src/org/openscience/cdk/test/libio/joelib/JOELibIOTest.java
index 4294046041e..df923eace3c 100644
--- a/src/org/openscience/cdk/test/libio/joelib/JOELibIOTest.java
+++ b/src/org/openscience/cdk/test/libio/joelib/JOELibIOTest.java
@@ -3,7 +3,7 @@
  * $Date$
  * $Revision$
  *
- * Copyright (C) 2002  The Chemistry Development Kit (CDK) project
+ * Copyright (C) 2002-2004  The Chemistry Development Kit (CDK) project
  *
  * Contact: cdk-devel@lists.sourceforge.net
  *
@@ -35,7 +35,7 @@
 import org.openscience.cdk.isomorphism.IsomorphismTester;
 
 /**
- * @cdkPackage test
+ * @cdkPackage test-libio
  */
 public class JOELibIOTest extends TestCase {
 
diff --git a/src/org/openscience/cdk/test/renderer/AcceleratedRenderer3DTest.java b/src/org/openscience/cdk/test/renderer/AcceleratedRenderer3DTest.java
index 4041c8648dd..fed419969d6 100644
--- a/src/org/openscience/cdk/test/renderer/AcceleratedRenderer3DTest.java
+++ b/src/org/openscience/cdk/test/renderer/AcceleratedRenderer3DTest.java
@@ -29,6 +29,7 @@
 import org.openscience.cdk.*;
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.tools.*;
 import org.openscience.cdk.geometry.*;
 import java.util.*;
@@ -37,7 +38,7 @@
 import java.awt.*;
 
 /**
- * @cdkPackage test
+ * @cdkPackage test-java3d
  */
 public class AcceleratedRenderer3DTest
 {
diff --git a/src/org/openscience/cdk/test/renderer/DrawPolygonTest.java b/src/org/openscience/cdk/test/renderer/DrawPolygonTest.java
index 6052d5e36d6..efd54c41ece 100644
--- a/src/org/openscience/cdk/test/renderer/DrawPolygonTest.java
+++ b/src/org/openscience/cdk/test/renderer/DrawPolygonTest.java
@@ -27,6 +27,7 @@
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.layout.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import java.util.*;
 import java.io.*;
 import javax.vecmath.*;
diff --git a/src/org/openscience/cdk/test/renderer/OrbitalsRenderer3DTest.java b/src/org/openscience/cdk/test/renderer/OrbitalsRenderer3DTest.java
index edd36d1b208..ed5d78b8c10 100644
--- a/src/org/openscience/cdk/test/renderer/OrbitalsRenderer3DTest.java
+++ b/src/org/openscience/cdk/test/renderer/OrbitalsRenderer3DTest.java
@@ -34,6 +34,7 @@
 import org.openscience.cdk.math.*;
 import org.openscience.cdk.math.qm.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
@@ -41,7 +42,7 @@
 /**
  * This class test the OrbitalRenderer3D
  *
- * @cdkPackage test
+ * @cdkPackage test-java3d
  *
  * @author     benedikta
  */
diff --git a/src/org/openscience/cdk/test/renderer/TableTest.java b/src/org/openscience/cdk/test/renderer/TableTest.java
index 51de6404bca..cd535bef950 100644
--- a/src/org/openscience/cdk/test/renderer/TableTest.java
+++ b/src/org/openscience/cdk/test/renderer/TableTest.java
@@ -27,6 +27,7 @@
 import org.openscience.cdk.*;
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.tools.*;
 import org.openscience.cdk.geometry.*;
 import java.util.*;
diff --git a/src/org/openscience/cdk/test/ringsearch/AllRingsFinderTest.java b/src/org/openscience/cdk/test/ringsearch/AllRingsFinderTest.java
index 880bdfe6a9e..524548a17ca 100644
--- a/src/org/openscience/cdk/test/ringsearch/AllRingsFinderTest.java
+++ b/src/org/openscience/cdk/test/ringsearch/AllRingsFinderTest.java
@@ -30,6 +30,7 @@
 import org.openscience.cdk.tools.*;
 import org.openscience.cdk.templates.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.layout.*;
 import javax.vecmath.*;
 
diff --git a/src/org/openscience/cdk/test/smiles/SmilesGeneratorTest.java b/src/org/openscience/cdk/test/smiles/SmilesGeneratorTest.java
index 7cb8233a7fd..d860eecdc19 100644
--- a/src/org/openscience/cdk/test/smiles/SmilesGeneratorTest.java
+++ b/src/org/openscience/cdk/test/smiles/SmilesGeneratorTest.java
@@ -34,6 +34,7 @@
 import org.openscience.cdk.ringsearch.SSSRFinder;
 import org.openscience.cdk.templates.MoleculeFactory;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.layout.*;
 import org.openscience.cdk.test.*;
 import javax.vecmath.*;
diff --git a/src/org/openscience/cdk/test/smiles/SmilesParserTest.java b/src/org/openscience/cdk/test/smiles/SmilesParserTest.java
index 8f2303831b9..f92735039a2 100644
--- a/src/org/openscience/cdk/test/smiles/SmilesParserTest.java
+++ b/src/org/openscience/cdk/test/smiles/SmilesParserTest.java
@@ -28,6 +28,7 @@
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.tools.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.layout.*;
 import org.openscience.cdk.isomorphism.*;
 import javax.vecmath.*;
diff --git a/src/org/openscience/cdk/test/structgen/RandomStructureGeneratorTest.java b/src/org/openscience/cdk/test/structgen/RandomStructureGeneratorTest.java
index 5f7838070b5..f9e0694b889 100644
--- a/src/org/openscience/cdk/test/structgen/RandomStructureGeneratorTest.java
+++ b/src/org/openscience/cdk/test/structgen/RandomStructureGeneratorTest.java
@@ -28,6 +28,7 @@
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.layout.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.structgen.*;
 import org.openscience.cdk.templates.*;
 import java.util.*;
diff --git a/src/org/openscience/cdk/test/structgen/SingleStructureRandomGeneratorTest.java b/src/org/openscience/cdk/test/structgen/SingleStructureRandomGeneratorTest.java
index a91a350cd4a..a726fca7b4e 100644
--- a/src/org/openscience/cdk/test/structgen/SingleStructureRandomGeneratorTest.java
+++ b/src/org/openscience/cdk/test/structgen/SingleStructureRandomGeneratorTest.java
@@ -30,6 +30,7 @@
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.layout.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.structgen.*;
 import org.openscience.cdk.tools.*;
 import org.openscience.cdk.templates.*;
diff --git a/src/org/openscience/cdk/test/structgen/VicinitySamplerTest.java b/src/org/openscience/cdk/test/structgen/VicinitySamplerTest.java
index a96c46cdf7a..b186ebe94c4 100644
--- a/src/org/openscience/cdk/test/structgen/VicinitySamplerTest.java
+++ b/src/org/openscience/cdk/test/structgen/VicinitySamplerTest.java
@@ -34,6 +34,7 @@
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.layout.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.structgen.*;
 import org.openscience.cdk.templates.*;
 import org.openscience.cdk.tools.*;
diff --git a/src/org/openscience/cdk/test/structgen/deterministic/EquivalentClassesDeterministicGeneratorTest.java b/src/org/openscience/cdk/test/structgen/deterministic/EquivalentClassesDeterministicGeneratorTest.java
index ea94a9472cb..a78facb6640 100644
--- a/src/org/openscience/cdk/test/structgen/deterministic/EquivalentClassesDeterministicGeneratorTest.java
+++ b/src/org/openscience/cdk/test/structgen/deterministic/EquivalentClassesDeterministicGeneratorTest.java
@@ -29,6 +29,7 @@
 import org.openscience.cdk.tools.*;
 import org.openscience.cdk.templates.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.layout.*;
 import org.openscience.cdk.structgen.deterministic.*;
 
diff --git a/src/org/openscience/cdk/test/tools/HydrogenAdderTest.java b/src/org/openscience/cdk/test/tools/HydrogenAdderTest.java
index f360d78d4dd..273276ea253 100644
--- a/src/org/openscience/cdk/test/tools/HydrogenAdderTest.java
+++ b/src/org/openscience/cdk/test/tools/HydrogenAdderTest.java
@@ -27,6 +27,7 @@
 import org.openscience.cdk.tools.*;
 import org.openscience.cdk.io.*;
 import org.openscience.cdk.renderer.*;
+import org.openscience.cdk.applications.swing.*;
 import org.openscience.cdk.layout.*;
 import org.openscience.cdk.templates.*;
 import org.openscience.cdk.geometry.*;