Skip to content

Commit 3d69fcb

Browse files
committed
Eliminate 4 interfaces/ subdirectories, flatten into parent packages
Removed reactionblast/interfaces/, fingerprints/interfaces/, mapping/interfaces/, mechanism/interfaces/ — moved 15 interfaces to parent packages, deleted 3 unused interfaces (IMolContainer, IFingerPrintContainer, IStandardizer inlined into StandardizeReaction). 142 → 139 files, 33 → 28 packages. All 135 tests pass. Co-Authored-By: Syed Asad Rahman <asad.rahman@bioinceptionlabs.com>
1 parent 85b738d commit 3d69fcb

59 files changed

Lines changed: 103 additions & 380 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/main/java/com/bioinceptionlabs/aamtool/Annotator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.w3c.dom.Element;
4646
import com.bioinceptionlabs.reactionblast.fingerprints.PatternFingerprinter;
4747
import com.bioinceptionlabs.reactionblast.fingerprints.ReactionFingerprinter;
48-
import com.bioinceptionlabs.reactionblast.fingerprints.interfaces.IPatternFingerprinter;
48+
import com.bioinceptionlabs.reactionblast.fingerprints.IPatternFingerprinter;
4949
import com.bioinceptionlabs.reactionblast.mechanism.BondChangeCalculator;
5050
import com.bioinceptionlabs.reactionblast.mechanism.MappingSolution;
5151
import com.bioinceptionlabs.reactionblast.mechanism.ReactionMechanismTool;

src/main/java/com/bioinceptionlabs/reactionblast/fingerprints/Feature.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.text.DecimalFormat;
2323
import java.util.Comparator;
2424

25-
import com.bioinceptionlabs.reactionblast.fingerprints.interfaces.IFeature;
25+
import com.bioinceptionlabs.reactionblast.fingerprints.IFeature;
2626

2727
/**
2828
* @contact Syed Asad Rahman, BioInception.

src/main/java/com/bioinceptionlabs/reactionblast/fingerprints/FingerprintGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.openscience.cdk.layout.StructureDiagramGenerator;
2929
import org.openscience.cdk.tools.ILoggingTool;
3030
import static org.openscience.cdk.tools.LoggingToolFactory.createLoggingTool;
31-
import com.bioinceptionlabs.reactionblast.fingerprints.interfaces.IFingerprintGenerator;
31+
import com.bioinceptionlabs.reactionblast.fingerprints.IFingerprintGenerator;
3232

3333
/**
3434
* @contact Syed Asad Rahman, BioInception.

src/main/java/com/bioinceptionlabs/reactionblast/fingerprints/interfaces/IFeature.java renamed to src/main/java/com/bioinceptionlabs/reactionblast/fingerprints/IFeature.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* MA 02110-1301 USA
1818
*/
1919

20-
package com.bioinceptionlabs.reactionblast.fingerprints.interfaces;
20+
package com.bioinceptionlabs.reactionblast.fingerprints;
2121

2222
/**
2323
* @contact Syed Asad Rahman, BioInception.

src/main/java/com/bioinceptionlabs/reactionblast/fingerprints/interfaces/IFingerprintGenerator.java renamed to src/main/java/com/bioinceptionlabs/reactionblast/fingerprints/IFingerprintGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
1717
* MA 02110-1301 USA
1818
*/
19-
package com.bioinceptionlabs.reactionblast.fingerprints.interfaces;
19+
package com.bioinceptionlabs.reactionblast.fingerprints;
2020

2121
import java.util.BitSet;
2222
import org.openscience.cdk.exception.CDKException;

src/main/java/com/bioinceptionlabs/reactionblast/fingerprints/interfaces/IPatternFingerprinter.java renamed to src/main/java/com/bioinceptionlabs/reactionblast/fingerprints/IPatternFingerprinter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* MA 02110-1301 USA
1818
*/
1919

20-
package com.bioinceptionlabs.reactionblast.fingerprints.interfaces;
20+
package com.bioinceptionlabs.reactionblast.fingerprints;
2121

2222
import java.util.BitSet;
2323
import java.util.Collection;

src/main/java/com/bioinceptionlabs/reactionblast/fingerprints/PatternComparators.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.openscience.cdk.exception.CDKException;
2727
import org.openscience.cdk.tools.ILoggingTool;
2828
import org.openscience.cdk.tools.LoggingToolFactory;
29-
import com.bioinceptionlabs.reactionblast.fingerprints.interfaces.IPatternFingerprinter;
29+
import com.bioinceptionlabs.reactionblast.fingerprints.IPatternFingerprinter;
3030

3131
/**
3232
* @contact Syed Asad Rahman, BioInception.

src/main/java/com/bioinceptionlabs/reactionblast/fingerprints/PatternFingerprinter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
import org.openscience.cdk.tools.LoggingToolFactory;
3939
import static com.bioinceptionlabs.reactionblast.fingerprints.FingerprintGenerator.getFingerprinterSize;
4040
import static com.bioinceptionlabs.reactionblast.fingerprints.PatternComparators.overallComparator;
41-
import com.bioinceptionlabs.reactionblast.fingerprints.interfaces.IFeature;
42-
import com.bioinceptionlabs.reactionblast.fingerprints.interfaces.IPatternFingerprinter;
41+
import com.bioinceptionlabs.reactionblast.fingerprints.IFeature;
42+
import com.bioinceptionlabs.reactionblast.fingerprints.IPatternFingerprinter;
4343

4444
/**
4545
* @contact Syed Asad Rahman, BioInception.

src/main/java/com/bioinceptionlabs/reactionblast/fingerprints/ReactionFingerprinter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import static org.openscience.smsd.MoleculeInitializer.initializeMolecule;
3535
import static org.openscience.smsd.tools.ExtAtomContainerManipulator.removeHydrogensExceptSingleAndPreserveAtomID;
3636
import static com.bioinceptionlabs.reactionblast.fingerprints.FingerprintGenerator.getFingerprinterSize;
37-
import com.bioinceptionlabs.reactionblast.fingerprints.interfaces.IPatternFingerprinter;
37+
import com.bioinceptionlabs.reactionblast.fingerprints.IPatternFingerprinter;
3838

3939
/**
4040
* @contact Syed Asad Rahman, BioInception.

src/main/java/com/bioinceptionlabs/reactionblast/interfaces/IFingerPrintContainer.java

Lines changed: 0 additions & 111 deletions
This file was deleted.

0 commit comments

Comments
 (0)