refactor options

src/itdelatrisu/opsu/db/BeatmapDB.java

@@ -18,7 +18,6 @@
 
 package itdelatrisu.opsu.db;
 
-import itdelatrisu.opsu.Options;
 import itdelatrisu.opsu.beatmap.Beatmap;
 import itdelatrisu.opsu.beatmap.BeatmapParser;
 
@@ -35,11 +34,13 @@ import java.util.Map;
 
 import org.newdawn.slick.util.Log;
 import yugecin.opsudance.core.errorhandling.ErrorHandler;
+import yugecin.opsudance.options.Configuration;
 
 /**
  * Handles connections and queries with the cached beatmap database.
  */
 public class BeatmapDB {
+
 	/**
 	 * Current database version.
 	 * This value should be changed whenever the database format changes.
@@ -91,12 +92,16 @@ public class BeatmapDB {
 	// This class should not be instantiated.
 	private BeatmapDB() {}
 
+	private static Configuration config; // TODO
+
 	/**
 	 * Initializes the database connection.
 	 */
-	public static void init() {
+	public static void init(Configuration config) {
+		BeatmapDB.config = config;
+
 		// create a database connection
-		connection = DBController.createConnection(Options.BEATMAP_DB.getPath());
+		connection = DBController.createConnection(config.BEATMAP_DB.getPath());
 		if (connection == null)
 			return;
 

src/itdelatrisu/opsu/db/DBController.java

@@ -19,6 +19,7 @@
 package itdelatrisu.opsu.db;
 
 import yugecin.opsudance.core.errorhandling.ErrorHandler;
+import yugecin.opsudance.options.Configuration;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -34,7 +35,7 @@ public class DBController {
 	/**
 	 * Initializes all databases.
 	 */
-	public static void init() {
+	public static void init(Configuration config) {
 		// load the sqlite-JDBC driver using the current class loader
 		try {
 			Class.forName("org.sqlite.JDBC");
@@ -43,8 +44,8 @@ public class DBController {
 		}
 
 		// initialize the databases
-		BeatmapDB.init();
-		ScoreDB.init();
+		BeatmapDB.init(config);
+		ScoreDB.init(config);
 	}
 
 	/**

src/itdelatrisu/opsu/db/ScoreDB.java

@@ -18,10 +18,10 @@
 
 package itdelatrisu.opsu.db;
 
-import itdelatrisu.opsu.Options;
 import itdelatrisu.opsu.ScoreData;
 import itdelatrisu.opsu.beatmap.Beatmap;
 import yugecin.opsudance.core.errorhandling.ErrorHandler;
+import yugecin.opsudance.options.Configuration;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -83,9 +83,9 @@ public class ScoreDB {
 	/**
 	 * Initializes the database connection.
 	 */
-	public static void init() {
+	public static void init(Configuration config) {
 		// create a database connection
-		connection = DBController.createConnection(Options.SCORE_DB.getPath());
+		connection = DBController.createConnection(config.SCORE_DB.getPath());
 		if (connection == null)
 			return;