Clean up

biojava · May 4, 2018 · 3c6d882 · 3c6d882
1 parent 11c58d0
commit 3c6d882
Showing 1 changed file with 16 additions and 20 deletions.
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/scop/ScopInstallation.java
@@ -38,7 +38,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 
-/** This class provides access to the SCOP protein structure classification.
+/**
+ * This class provides access to the SCOP protein structure classification.
  *
  * For more information about SCOP see here:
  *  <ul>
@@ -61,7 +62,7 @@ public class ScopInstallation implements LocalScopDatabase {
 
 	private static final Logger logger = LoggerFactory.getLogger(ScopInstallation.class);
 
-	protected String scopVersion;
+	private String scopVersion;
 
 	// Stores URLs for cla, des, hie, and com files
 	private final List<ScopMirror> mirrors;
@@ -76,29 +77,24 @@ public class ScopInstallation implements LocalScopDatabase {
 	public static final String SCOP_DOWNLOAD = "http://scop.berkeley.edu/downloads/parse/";
 	public static final String SCOP_DOWNLOAD_ALTERNATE = "http://scop.berkeley.edu/downloads/parse/";
 
-	public static final String NEWLINE;
-	public static final String FILESPLIT ;
-
-	static {
+	//public static final String NEWLINE = System.getProperty("line.separator");
+	public static final String FILESPLIT = System.getProperty("file.separator");
 
-		NEWLINE     = System.getProperty("line.separator");
-		FILESPLIT   = System.getProperty("file.separator");
-	}
+	private String cacheLocation ;
 
-	String cacheLocation ;
+	private AtomicBoolean installedCla;
+	private AtomicBoolean installedDes;
+	private AtomicBoolean installedHie;
+	private AtomicBoolean installedCom;
 
-	AtomicBoolean installedCla;
-	AtomicBoolean installedDes;
-	AtomicBoolean installedHie;
-	AtomicBoolean installedCom;
+	private Map<Integer, List<String>> commentsMap;
+	private Map<String, List<ScopDomain>> domainMap;
+	private Map<Integer, ScopDescription> sunidMap;
+	private Map<Integer, ScopNode> scopTree;
 
-	Map<Integer, List<String>> commentsMap;
-	Map<String, List<ScopDomain>> domainMap;
-	Map<Integer, ScopDescription> sunidMap;
-	Map<Integer, ScopNode> scopTree;
 
-
-	/** Create a new SCOP installation.
+	/**
+	 * Create a new SCOP installation.
 	 *
 	 * @param cacheLocation where the SCOP files are stored. If they can't be found at that location they will get automatically downloaded and installed there.
 	 */