Skip to content

Commit a73eee7

Browse files
committed
Removing RemoteScopInstallation and all downstream usages
1 parent a35adcf commit a73eee7

File tree

6 files changed

+5
-625
lines changed

6 files changed

+5
-625
lines changed

biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/scop/RemoteScopInstallationTest.java

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

biojava-integrationtest/src/test/java/org/biojava/nbio/structure/test/scop/ScopFactoryTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
package org.biojava.nbio.structure.test.scop;
2222

2323
import org.biojava.nbio.structure.scop.BerkeleyScopInstallation;
24-
import org.biojava.nbio.structure.scop.RemoteScopInstallation;
2524
import org.biojava.nbio.structure.scop.ScopDatabase;
2625
import org.biojava.nbio.structure.scop.ScopFactory;
2726
import org.junit.Before;
@@ -76,11 +75,6 @@ public void testVersions() {
7675
scop = ScopFactory.getSCOP(ScopFactory.VERSION_1_75);
7776
assertEquals(ScopFactory.VERSION_1_75, scop.getScopVersion());
7877

79-
ScopFactory.setScopDatabase(ScopFactory.VERSION_1_75, false);
80-
scop = ScopFactory.getSCOP();
81-
assertEquals(ScopFactory.VERSION_1_75, scop.getScopVersion());
82-
assertSame( RemoteScopInstallation.class,scop.getClass());
83-
8478
ScopFactory.setScopDatabase(ScopFactory.VERSION_1_75, true);
8579
scop = ScopFactory.getSCOP();
8680
assertEquals(ScopFactory.VERSION_1_75, scop.getScopVersion());

biojava-structure/src/main/java/org/biojava/nbio/structure/align/util/AtomCache.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.biojava.nbio.core.util.FileDownloadUtils;
4343
import org.biojava.nbio.structure.quaternary.BiologicalAssemblyBuilder;
4444
import org.biojava.nbio.structure.quaternary.BiologicalAssemblyTransformation;
45-
import org.biojava.nbio.structure.scop.CachedRemoteScopInstallation;
4645
import org.biojava.nbio.structure.scop.ScopDatabase;
4746
import org.biojava.nbio.structure.scop.ScopDescription;
4847
import org.biojava.nbio.structure.scop.ScopDomain;
@@ -653,23 +652,6 @@ public Structure getStructureForDomain(String scopId, ScopDatabase scopDatabase)
653652
return getStructureForDomain(domain, scopDatabase);
654653
}
655654

656-
/**
657-
* Send a signal to the cache that the system is shutting down. Notifies underlying SerializableCache instances to
658-
* flush themselves...
659-
*/
660-
public void notifyShutdown() {
661-
662-
// todo: use a SCOP implementation that is backed by SerializableCache
663-
ScopDatabase scopInstallation = ScopFactory.getSCOP();
664-
if (scopInstallation != null) {
665-
if (scopInstallation instanceof CachedRemoteScopInstallation) {
666-
CachedRemoteScopInstallation cacheScop = (CachedRemoteScopInstallation) scopInstallation;
667-
cacheScop.flushCache();
668-
}
669-
}
670-
671-
}
672-
673655
/**
674656
* set the location at which utility data should be cached.
675657
*

biojava-structure/src/main/java/org/biojava/nbio/structure/scop/CachedRemoteScopInstallation.java

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

0 commit comments

Comments
 (0)