Skip to content

Commit 4e1a359

Browse files
committed
Organize symmetry packages and classes
Split core package into axis, cluster and core. Axis contains the classes that calculate axes properties, cluster contains the classes related to clustering chains into subunits, and core contains the algorithms and classes to detect symmetry
1 parent ad910d5 commit 4e1a359

39 files changed

+90
-31
lines changed

biojava-structure-gui/src/main/java/demo/DemoOrientBioAssembly.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.biojava.nbio.structure.align.util.AtomCache;
2828
import org.biojava.nbio.structure.io.FileParsingParameters;
2929
import org.biojava.nbio.structure.symmetry.analysis.CalcBioAssemblySymmetry;
30-
import org.biojava.nbio.structure.symmetry.core.AxisAligner;
30+
import org.biojava.nbio.structure.symmetry.axis.AxisAligner;
3131
import org.biojava.nbio.structure.symmetry.core.QuatSymmetryDetector;
3232
import org.biojava.nbio.structure.symmetry.core.QuatSymmetryParameters;
3333
import org.biojava.nbio.structure.symmetry.core.QuatSymmetryResults;

biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/analysis/CalcBioAssemblySymmetry.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727

2828
import org.biojava.nbio.structure.Structure;
2929
import org.biojava.nbio.structure.align.util.ResourceManager;
30+
import org.biojava.nbio.structure.cluster.Subunits;
31+
import org.biojava.nbio.structure.symmetry.axis.AxisAligner;
3032
import org.biojava.nbio.structure.symmetry.core.*;
3133
import org.biojava.nbio.structure.symmetry.jmolScript.JmolSymmetryScriptGenerator;
3234

biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/gui/SymmetryDisplay.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.ArrayList;
2525
import java.util.Arrays;
2626
import java.util.List;
27+
2728
import javax.swing.JMenu;
2829
import javax.swing.JMenuBar;
2930
import javax.swing.JMenuItem;
@@ -38,7 +39,7 @@
3839
import org.biojava.nbio.structure.align.gui.jmol.MultipleAlignmentJmol;
3940
import org.biojava.nbio.structure.align.multiple.MultipleAlignment;
4041
import org.biojava.nbio.structure.align.util.RotationAxis;
41-
import org.biojava.nbio.structure.symmetry.core.AxisAligner;
42+
import org.biojava.nbio.structure.symmetry.axis.AxisAligner;
4243
import org.biojava.nbio.structure.symmetry.core.QuatSymmetryResults;
4344
import org.biojava.nbio.structure.symmetry.internal.CeSymmResult;
4445
import org.biojava.nbio.structure.symmetry.internal.SymmetryAxes;

biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGenerator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
*/
2121
package org.biojava.nbio.structure.symmetry.jmolScript;
2222

23-
import org.biojava.nbio.structure.symmetry.core.AxisAligner;
24-
import org.biojava.nbio.structure.symmetry.core.HelixAxisAligner;
25-
import org.biojava.nbio.structure.symmetry.core.RotationAxisAligner;
23+
import org.biojava.nbio.structure.symmetry.axis.AxisAligner;
24+
import org.biojava.nbio.structure.symmetry.axis.HelixAxisAligner;
25+
import org.biojava.nbio.structure.symmetry.axis.RotationAxisAligner;
2626

2727
import javax.vecmath.Color4f;
2828
import javax.vecmath.Matrix4d;

biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorC1.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
package org.biojava.nbio.structure.symmetry.jmolScript;
2525

26-
import org.biojava.nbio.structure.symmetry.core.RotationAxisAligner;
26+
import org.biojava.nbio.structure.symmetry.axis.RotationAxisAligner;
2727
import org.biojava.nbio.structure.symmetry.geometry.RectangularPrism;
2828

2929

biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorCn.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
package org.biojava.nbio.structure.symmetry.jmolScript;
2525

26-
import org.biojava.nbio.structure.symmetry.core.RotationAxisAligner;
26+
import org.biojava.nbio.structure.symmetry.axis.RotationAxisAligner;
2727
import org.biojava.nbio.structure.symmetry.geometry.Prism;
2828
import org.biojava.nbio.structure.symmetry.geometry.RectangularPrism;
2929

biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorDn.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
package org.biojava.nbio.structure.symmetry.jmolScript;
2525

26-
import org.biojava.nbio.structure.symmetry.core.RotationAxisAligner;
26+
import org.biojava.nbio.structure.symmetry.axis.RotationAxisAligner;
2727
import org.biojava.nbio.structure.symmetry.geometry.Prism;
2828

2929

biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorH.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*/
2424
package org.biojava.nbio.structure.symmetry.jmolScript;
2525

26-
import org.biojava.nbio.structure.symmetry.core.HelixAxisAligner;
27-
import org.biojava.nbio.structure.symmetry.core.Subunits;
26+
import org.biojava.nbio.structure.cluster.Subunits;
27+
import org.biojava.nbio.structure.symmetry.axis.HelixAxisAligner;
2828
import org.jcolorbrewer.ColorBrewer;
2929

3030
import javax.vecmath.*;

biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
package org.biojava.nbio.structure.symmetry.jmolScript;
2525

26-
import org.biojava.nbio.structure.symmetry.core.RotationAxisAligner;
26+
import org.biojava.nbio.structure.symmetry.axis.RotationAxisAligner;
2727
import org.biojava.nbio.structure.symmetry.geometry.Icosahedron;
2828

2929

biojava-structure-gui/src/main/java/org/biojava/nbio/structure/symmetry/jmolScript/JmolSymmetryScriptGeneratorO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
package org.biojava.nbio.structure.symmetry.jmolScript;
2525

26-
import org.biojava.nbio.structure.symmetry.core.RotationAxisAligner;
26+
import org.biojava.nbio.structure.symmetry.axis.RotationAxisAligner;
2727
import org.biojava.nbio.structure.symmetry.geometry.Octahedron;
2828

2929

0 commit comments

Comments
 (0)